diff options
| author | wollman <wollman@FreeBSD.org> | 1993-12-19 00:55:01 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1993-12-19 00:55:01 +0000 |
| commit | 71b67e5a560e27117fd4ff9fe76b1e67f1423f1e (patch) | |
| tree | 62dff2aa17f4c31d27a9595b764f9cbc9810eb80 /sys/isa/fd.c | |
| parent | c7341bb860bd0d1789ca0b8bfce96c383fd7dbbc (diff) | |
| download | FreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.zip FreeBSD-src-71b67e5a560e27117fd4ff9fe76b1e67f1423f1e.tar.gz | |
Make everything compile with -Wtraditional. Make it easier to distribute
a binary link-kit. Make all non-optional options (pagers, procfs) standard,
and update LINT to reflect new symtab requirements.
NB: -Wtraditional will henceforth be forgotten. This editing pass was
primarily intended to detect any constructions where the old code might
have been relying on traditional C semantics or syntax. These were all
fixed, and the result of fixing some of them means that -Wall is now a
realistic possibility within a few weeks.
Diffstat (limited to 'sys/isa/fd.c')
| -rw-r--r-- | sys/isa/fd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 9dcc2cb..ef24eb0 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.14 1993/12/16 19:47:42 ache Exp $ + * $Id: fd.c,v 1.16 1993/12/19 00:40:49 ache Exp $ * */ @@ -165,6 +165,8 @@ typedef int fdsu_t; typedef struct fd_data *fd_p; typedef struct fdc_data *fdc_p; +static int retrier(fdcu_t); + #define DEVIDLE 0 #define FINDWORK 1 #define DOSEEK 2 @@ -391,7 +393,7 @@ void fdstrategy(struct buf *bp) dp = &(fdc->head); s = splbio(); disksort(dp, bp); - untimeout(fd_turnoff,fdu); /* a good idea */ + untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */ fdstart(fdcu); splx(s); return; @@ -762,7 +764,7 @@ fdstate(fdcu, fdc) TRACE1("fd%d",fdu); TRACE1("[%s]",fdstates[fdc->state]); TRACE1("(0x%x)",fd->flags); - untimeout(fd_turnoff, fdu); + untimeout(fd_turnoff, (caddr_t)fdu); timeout(fd_turnoff, (caddr_t)fdu, 4 * hz); switch (fdc->state) { @@ -810,7 +812,7 @@ fdstate(fdcu, fdc) timeout(fd_timeout, (caddr_t)fdcu, 2 * hz); return(0); /* will return later */ case SEEKWAIT: - untimeout(fd_timeout,fdcu); + untimeout(fd_timeout, (caddr_t)fdcu); /* allow heads to settle */ timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50); fdc->state = SEEKCOMPLETE; @@ -883,7 +885,7 @@ fdstate(fdcu, fdc) timeout(fd_timeout, (caddr_t)fdcu, 2 * hz); return(0); /* will return later */ case IOCOMPLETE: /* IO DONE, post-analyze */ - untimeout(fd_timeout,fdcu); + untimeout(fd_timeout, (caddr_t)fdcu); for(i=0;i<7;i++) { fdc->status[i] = in_fdc(fdcu); @@ -994,7 +996,7 @@ fdstate(fdcu, fdc) return(1); /* Come back immediatly to new state */ } -int +static int retrier(fdcu) fdcu_t fdcu; { |
