38c38
< * $Id: fd.c,v 1.5 1993/09/15 23:27:45 rgrimes Exp $
---
> * $Id: fd.c,v 1.6 1993/09/23 15:22:57 rgrimes Exp $
47a48
> #include "kernel.h"
178c179
< #else DEBUG
---
> #else /* DEBUG */
181c182
< #endif DEBUG
---
> #endif /* DEBUG */
183,184c184,186
< extern int hz;
< /* state needed for current transfer */
---
> static void fdstart(fdcu_t);
> void fdintr(fdcu_t);
> static void fd_turnoff(caddr_t, int);
189c191,192
< int fdprobe(), fdattach(), fd_turnoff();
---
> static int fdprobe(struct isa_device *);
> static int fdattach(struct isa_device *);
197a201
> int
199c203
< struct isa_device *dev;
---
> struct isa_device *dev;
222a227
> int
224c229
< struct isa_device *dev;
---
> struct isa_device *dev;
288c293
< fd_turnoff(fdu);
---
> fd_turnoff((caddr_t)fdu, 0);
293a299
> return 1;
298c304
< dev_t dev;
---
> dev_t dev;
306,307c312
< fdstrategy(bp)
< register struct buf *bp; /* IO operation to perform */
---
> void fdstrategy(struct buf *bp)
361a367
> void
392,393c398,399
< fd_turnoff(fdu)
< fdu_t fdu;
---
> static void
> fd_turnoff(caddr_t arg1, int arg2)
394a401
> fdu_t fdu = (fdu_t)arg1;
404,405c411,412
< fd_motor_on(fdu)
< fdu_t fdu;
---
> void
> fd_motor_on(caddr_t arg1, int arg2)
406a414
> fdu_t fdu = (fdu_t)arg1;
418a427,429
> static void fd_turnon1(fdu_t);
>
> void
427c438
< timeout(fd_motor_on,fdu,hz); /* in 1 sec its ok */
---
> timeout(fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
431,432c442,443
< fd_turnon1(fdu)
< fdu_t fdu;
---
> static void
> fd_turnon1(fdu_t fdu)
461a473
> int
487a500
> int
503a517
> int
505a520
> int flags;
521a537
> static void
537,538c553,554
< fd_timeout(fdcu)
< fdcu_t fdcu;
---
> static void
> fd_timeout(caddr_t arg1, int arg2)
539a556
> fdcu_t fdcu = (fdcu_t)arg1;
583,584c600,601
< fd_pseudointr(fdcu)
< fdcu_t fdcu;
---
> static void
> fd_pseudointr(caddr_t arg1, int arg2)
585a603
> fdcu_t fdcu = (fdcu_t)arg1;
597,598c615,616
< fdintr(fdcu)
< fdcu_t fdcu;
---
> void
> fdintr(fdcu_t fdcu)
601c619,620
< while(fdstate(fdcu, fdc));
---
> while(fdstate(fdcu, fdc))
> ;
608c627,628
< int fdstate(fdcu, fdc)
---
> int
> fdstate(fdcu, fdc)
612c632
< int read,head,trac,sec,i,s,sectrac,cyl,st0;
---
> int read, head, trac, sec = 0, i = 0, s, sectrac, cyl, st0;
648c668
< timeout(fd_turnoff,fdu,4 * hz);
---
> timeout(fd_turnoff, (caddr_t)fdu, 4 * hz);
692c712
< timeout(fd_timeout,fdcu,2 * hz);
---
> timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
697c717
< timeout(fd_pseudointr,fdcu,hz/50);
---
> timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50);
746c766
< timeout(fd_timeout,fdcu,2 * hz);
---
> timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
803c823
< timeout(fd_pseudointr,fdcu,hz/30);
---
> timeout(fd_pseudointr, (caddr_t)fdcu, hz / 30);
850a871
> int