diff options
Diffstat (limited to 'sys/pci/ncr.c')
-rw-r--r-- | sys/pci/ncr.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index e308f57..ee41ac4 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.63 1996/02/18 23:15:19 se Exp $ +** $Id: ncr.c,v 1.64 1996/02/19 00:03:50 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -402,12 +402,8 @@ */ #ifdef __NetBSD__ - #define INT32 int - #define U_INT32 u_int #define TIMEOUT (void*) #else /*__NetBSD__*/ - #define INT32 int32 - #define U_INT32 u_int32 #define TIMEOUT (timeout_func_t) #endif /*__NetBSD__*/ #define PRINT_ADDR(xp) sc_print_addr(xp->sc_link) @@ -1200,7 +1196,7 @@ static void ncr_exception (ncb_p np); static void ncr_free_ccb (ncb_p np, ccb_p cp, int flags); static void ncr_getclock (ncb_p np); static ccb_p ncr_get_ccb (ncb_p np, u_long flags, u_long t,u_long l); -static U_INT32 ncr_info (int unit); +static u_int32_t ncr_info (int unit); static void ncr_init (ncb_p np, char * msg, u_long code); static void ncr_intr (void *vnp); static void ncr_int_ma (ncb_p np); @@ -1223,7 +1219,7 @@ static void ncr_settags (tcb_p tp, lcb_p lp); static void ncr_setwide (ncb_p np, ccb_p cp, u_char wide); static int ncr_show_msg (u_char * msg); static int ncr_snooptest (ncb_p np); -static INT32 ncr_start (struct scsi_xfer *xp); +static int32_t ncr_start (struct scsi_xfer *xp); static void ncr_timeout (ncb_p np); static void ncr_usercmd (ncb_p np); static void ncr_wakeup (ncb_p np, u_long code); @@ -1249,7 +1245,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.63 1996/02/18 23:15:19 se Exp $\n"; + "\n$Id: ncr.c,v 1.64 1996/02/19 00:03:50 se Exp $\n"; static u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 @@ -3130,7 +3126,7 @@ void ncr_min_phys (struct buf *bp) **---------------------------------------------------------- */ -U_INT32 ncr_info (int unit) +u_int32_t ncr_info (int unit) { return (1); /* may be changed later */ } @@ -3537,7 +3533,7 @@ ncr_intr(vnp) **========================================================== */ -static INT32 ncr_start (struct scsi_xfer * xp) +static int32_t ncr_start (struct scsi_xfer * xp) { ncb_p np = (ncb_p) xp->sc_link->adapter_softc; |