diff options
| author | deraadt <deraadt@NetBSD.org> | 1993-07-06 06:06:26 +0000 |
|---|---|---|
| committer | deraadt <deraadt@NetBSD.org> | 1993-07-06 06:06:26 +0000 |
| commit | ceec40c98f1865eeddf40b8de3570ed778e7c663 (patch) | |
| tree | b0993a3e0cb695232a5788d25db06746ec02cd8e /sys/dev | |
| parent | 21e01d6cd22d950687d32ab919b93125ac7129fe (diff) | |
clean up code for timeout/untimeout/wakeup prototypes.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aha1542.c | 19 | ||||
| -rw-r--r-- | sys/dev/isa/isa.c | 15 |
2 files changed, 19 insertions, 15 deletions
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c index 1f5064e77be..207b71b8d81 100644 --- a/sys/dev/isa/aha1542.c +++ b/sys/dev/isa/aha1542.c @@ -12,13 +12,16 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.11 1993/06/14 04:16:03 andrew Exp $ + * $Id: aha1542.c,v 1.12 1993/07/06 06:06:26 deraadt Exp $ */ /* * HISTORY * $Log: aha1542.c,v $ - * Revision 1.11 1993/06/14 04:16:03 andrew + * Revision 1.12 1993/07/06 06:06:26 deraadt + * clean up code for timeout/untimeout/wakeup prototypes. + * + * Revision 1.11 1993/06/14 04:16:03 andrew * Reduced bus-on time from the default of 11ms -> 9ms, to prevent floppy from * becoming data-starved during simultaneous fd & scsi activity. * @@ -666,7 +669,7 @@ aha_free_ccb(int unit, struct aha_ccb *ccb, int flags) * one to come free, starting with queued entries* */ if (!ccb->next) - wakeup(&aha_ccb_free[unit]); + wakeup( (caddr_t)&aha_ccb_free[unit]); if (!(flags & SCSI_NOMASK)) splx(opri); } @@ -689,7 +692,7 @@ aha_get_ccb(int unit, int flags) * to come free */ while ((!(rc = aha_ccb_free[unit])) && (!(flags & SCSI_NOSLEEP))) - sleep(&aha_ccb_free[unit], PRIBIO); + sleep((caddr_t)&aha_ccb_free[unit], PRIBIO); if (rc) { aha_ccb_free[unit] = aha_ccb_free[unit]->next; rc->flags = CCB_ACTIVE; @@ -1255,8 +1258,8 @@ aha_bus_speed_check(int unit, int speed) * put the test data into the buffer and calculate * it's address. Read it onto the board */ - strcpy(aha_scratch_buf,aha_test_string); - lto3b(KVTOPHYS(aha_scratch_buf),ad); + strcpy((char *)aha_scratch_buf, (char *)aha_test_string); + lto3b(KVTOPHYS(aha_scratch_buf), ad); aha_cmd(unit,3, 0, 0, (u_char *)0, AHA_WRITE_FIFO, ad[0], ad[1], ad[2]); @@ -1275,7 +1278,7 @@ aha_bus_speed_check(int unit, int speed) * return the correct value depending upon the result * if copy fails.. assume too fast */ - if(strcmp(aha_test_string,aha_scratch_buf)) + if(strcmp(aha_test_string, (char *)aha_scratch_buf)) return(0); return(aha_bus_speeds[speed].nsecs); } @@ -1415,5 +1418,5 @@ aha_timeout(int arg) } } splx(s); - timeout(aha_timeout, arg, SLEEPTIME); + timeout((timeout_t)aha_timeout, (caddr_t)arg, SLEEPTIME); } diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 31e9f9464cd..38d1f7fa0e9 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.23 1993/07/06 00:31:52 cgd Exp $ + * $Id: isa.c,v 1.24 1993/07/06 06:06:31 deraadt Exp $ */ /* @@ -55,6 +55,7 @@ #include "uio.h" #include "syslog.h" #include "malloc.h" +#include "rlist.h" #include "machine/segments.h" #include "machine/cpufunc.h" #include "vm/vm.h" @@ -467,7 +468,7 @@ isa_allocphysmem(caddr_t va, unsigned length, void (*func)()) { isaphysmemunblock = func; while (isaphysmemflag & B_BUSY) { isaphysmemflag |= B_WANTED; - sleep(&isaphysmemflag, PRIBIO); + sleep((caddr_t)&isaphysmemflag, PRIBIO); } isaphysmemflag |= B_BUSY; @@ -484,7 +485,7 @@ isa_freephysmem(caddr_t va, unsigned length) { isaphysmemflag &= ~B_BUSY; if (isaphysmemflag & B_WANTED) { isaphysmemflag &= B_WANTED; - wakeup(&isaphysmemflag); + wakeup((caddr_t)&isaphysmemflag); if (isaphysmemunblock) (*isaphysmemunblock)(); } @@ -634,7 +635,7 @@ sysbeepstop(int f) outb(0x61, inb(0x61) & 0xFC); enable_intr(); if (f) - timeout(sysbeepstop, 0, f); + timeout((timeout_t)sysbeepstop, (caddr_t)0, f); else beeping = 0; @@ -648,8 +649,8 @@ sysbeep(int pitch, int period) static int last_pitch, last_period; if (beeping) { - untimeout(sysbeepstop, last_period/2); - untimeout(sysbeepstop, 0); + untimeout((timeout_t)sysbeepstop, (caddr_t)(last_period/2)); + untimeout((timeout_t)sysbeepstop, (caddr_t)0); } if (!beeping || last_pitch != pitch) { /* @@ -664,7 +665,7 @@ sysbeep(int pitch, int period) } last_pitch = pitch; beeping = last_period = period; - timeout(sysbeepstop, period/2, period); + timeout((timeout_t)sysbeepstop, (caddr_t)(period/2), period); splx(s); } |
