diff options
| author | dg <dg@FreeBSD.org> | 1994-08-20 03:49:02 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1994-08-20 03:49:02 +0000 |
| commit | c97639b9230d9c3f9032d935d7892c5b513c8814 (patch) | |
| tree | f43f29ef28a2342dd7be499cf286557b75ae9f56 /sys/i386/eisa | |
| parent | 255b8baf81cdff10b66cd0893b98779e34305ff1 (diff) | |
| download | FreeBSD-src-c97639b9230d9c3f9032d935d7892c5b513c8814.zip FreeBSD-src-c97639b9230d9c3f9032d935d7892c5b513c8814.tar.gz | |
1) cleaned up after Garrett - fixed more redundant declarations, changed
use of timeout_t -> timeout_func_t in aha1542 and aha1742 drivers.
2) fix a bug in the portalfs that was uncovered by better prototyping -
specifically, the time must be converted from timeval to timespec
before storing in va_atime.
3) fixed/added some miscellaneous prototypes
Diffstat (limited to 'sys/i386/eisa')
| -rw-r--r-- | sys/i386/eisa/aha1742.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 5ac65b8..ac201f8 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $ + * $Id: aha1742.c,v 1.17 1994/08/13 03:49:54 wollman Exp $ */ #include <sys/types.h> @@ -51,10 +51,6 @@ int Debugger(); #define NAHB 1 #endif /* kernel */ -#ifndef NetBSD -typedef timeout_func_t timeout_t; -#endif - typedef unsigned long int physaddr; #include <sys/kernel.h> @@ -274,7 +270,7 @@ int ahb_attach(); int ahb_init __P((int unit)); int ahbintr(); int32 ahb_scsi_cmd(); -void ahb_timeout(caddr_t); +void ahb_timeout __P((caddr_t)); void ahb_done(); struct ecb *cheat; void ahb_free_ecb(); @@ -628,7 +624,7 @@ ahbintr(unit) if ((ahb_debug & AHB_SHOWECBS) && ecb) printf("<int ecb(%x)>", ecb); #endif /*AHBDEBUG */ - untimeout((timeout_t)ahb_timeout, (caddr_t)ecb); + untimeout((timeout_func_t)ahb_timeout, (caddr_t)ecb); ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL)); } } @@ -993,7 +989,7 @@ ahb_scsi_cmd(xs) if (!(flags & SCSI_NOMASK)) { s = splbio(); ahb_send_immed(unit, xs->sc_link->target, AHB_TARG_RESET); - timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); + timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); splx(s); return (SUCCESSFULLY_QUEUED); } else { @@ -1122,7 +1118,7 @@ ahb_scsi_cmd(xs) if (!(flags & SCSI_NOMASK)) { s = splbio(); ahb_send_mbox(unit, OP_START_ECB, xs->sc_link->target, ecb); - timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); + timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000); splx(s); SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n")); return (SUCCESSFULLY_QUEUED); @@ -1199,7 +1195,7 @@ ahb_timeout(caddr_t arg1) printf("\n"); ahb_send_mbox(unit, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb); /* 2 secs for the abort */ - timeout((timeout_t)ahb_timeout, (caddr_t)ecb, 2 * hz); + timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, 2 * hz); ecb->flags = ECB_ABORTED; } splx(s); |
