diff options
| -rw-r--r-- | sys/i386/isa/aha1542.c | 40 | ||||
| -rw-r--r-- | sys/i386/isa/ultra14f.c | 32 |
2 files changed, 49 insertions, 23 deletions
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index 9f79dd6cdc8f..2991c59530fe 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.51 1995/12/06 23:50:45 bde Exp $ + * $Id: aha1542.c,v 1.52 1995/12/07 12:45:53 davidg Exp $ */ /* @@ -322,14 +322,33 @@ static struct aha_data { struct scsi_link sc_link; /* prototype for subdevs */ } *ahadata[NAHA]; -static struct aha_ccb *aha_get_ccb(); -static int ahaprobe(); -static void aha_done(); -static int ahaattach(); -static int32 aha_scsi_cmd(); -static timeout_t aha_timeout; -static void ahaminphys(); -static u_int32 aha_adapter_info(); +static u_int32 aha_adapter_info __P((int unit)); +static int ahaattach __P((struct isa_device *dev)); +static int aha_bus_speed_check __P((int unit, int speed)); +#ifdef notyet +static int aha_cmd __P((int unit, int icnt, int ocnt, int wait, + u_char *retval, unsigned opcode, ...)); +#else +static int aha_cmd(); +#endif +static void aha_done __P((int unit, struct aha_ccb *ccb)); +static int aha_escape __P((struct scsi_xfer *xs, struct aha_ccb *ccb)); +static void aha_free_ccb __P((int unit, struct aha_ccb *ccb, int flags)); +static struct aha_ccb * + aha_get_ccb __P((int unit, int flags)); +static int aha_init __P((int unit)); +static void ahaminphys __P((struct buf *bp)); +static int aha_poll __P((int unit, struct scsi_xfer *xs, + struct aha_ccb *ccb)); +static int ahaprobe __P((struct isa_device *dev)); +static void aha_registerdev __P((struct isa_device *id)); +static int32 aha_scsi_cmd __P((struct scsi_xfer *xs)); +static int aha_set_bus_speed __P((int unit)); +static timeout_t + aha_timeout; +static char *board_rev __P((int unit, int type)); +static int physcontig __P((int kv, int len)); +static void put_host_stat __P((int host_stat)); #ifdef KERNEL static struct scsi_adapter aha_switch = @@ -396,9 +415,6 @@ static int ahaunit = 0; #define AHA_RESET_TIMEOUT 2000 /* time to wait for reset (mSec) */ -static int aha_poll __P((int, struct scsi_xfer *, struct aha_ccb *)); -static int aha_init __P((int)); - #ifndef KERNEL main() { diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 2b65f247e662..7131cfae1052 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.41 1995/12/07 12:46:10 davidg Exp $ + * $Id: ultra14f.c,v 1.42 1995/12/10 13:39:22 phk Exp $ */ #include <sys/types.h> @@ -265,18 +265,28 @@ static struct uha_data { struct scsi_link sc_link; } *uhadata[NUHA]; -static int uhaprobe(); -static int uha_attach(); -static int32 uha_scsi_cmd(); -static timeout_t uha_timeout; -static void uha_free_mscp(); -static int uha_abort(); -static void uhaminphys(); -static void uha_done(); -static u_int32 uha_adapter_info(); -static struct mscp *uha_mscp_phys_kv(); +static int uha_abort __P((int unit, struct mscp *mscp)); +static u_int32 uha_adapter_info __P((int unit)); +static int uha_attach __P((struct isa_device *dev)); +static void uha_done __P((int unit, struct mscp *mscp)); +static void uha_free_mscp __P((int unit, struct mscp *mscp, int flags)); +static struct mscp * + uha_get_mscp __P((int unit, int flags)); static int uha_init __P((int unit)); static int uha24_init __P((int unit)); +static void uhaminphys __P((struct buf *bp)); +static struct mscp * + uha_mscp_phys_kv __P((struct uha_data *uha, long mscp_phys)); +static int uha_poll __P((int unit, int wait)); +#ifdef UHADEBUG +static void uha_print_active_mscp __P((int unit)); +static void uha_print_mscp __P((struct mscp *mscp)); +#endif +static int uhaprobe __P((struct isa_device *dev)); +static int32 uha_scsi_cmd __P((struct scsi_xfer *xs)); +static void uha_send_mbox __P((int unit, struct mscp *mscp)); +static timeout_t + uha_timeout; static struct mscp *cheat; static unsigned long int scratch; |