Ran ft.c through ident.
Added a missing #ifdef INET wrapper in lpt.c Main change: Removed the timeout_func_t casts from timeout calls and correctly defined the timeout routines to conform to the new format. lpt.c doesn't have this change. Reviewed by: Submitted by:
This commit is contained in:
Paul Richards
parent
40eaff5d0f
commit
d091793974
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=2234
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
|
||||
* $Id: fd.c,v 1.27 1994/08/13 03:49:57 wollman Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -199,7 +199,7 @@ int fd_debug = 1;
|
||||
|
||||
static void fdstart(fdcu_t);
|
||||
void fdintr(fdcu_t);
|
||||
static void fd_turnoff(caddr_t);
|
||||
static timeout_t fd_turnoff;
|
||||
|
||||
/****************************************************************************/
|
||||
/* autoconfiguration stuff */
|
||||
@ -417,7 +417,7 @@ void fdstrategy(struct buf *bp)
|
||||
dp = &(fdc->head);
|
||||
s = splbio();
|
||||
disksort(dp, bp);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
fdstart(fdcu);
|
||||
splx(s);
|
||||
return;
|
||||
@ -463,7 +463,7 @@ set_motor(fdcu, fdu, reset)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_turnoff(caddr_t arg1)
|
||||
fd_turnoff(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -476,7 +476,7 @@ fd_turnoff(caddr_t arg1)
|
||||
}
|
||||
|
||||
void
|
||||
fd_motor_on(caddr_t arg1)
|
||||
fd_motor_on(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -502,7 +502,7 @@ fd_turnon(fdu)
|
||||
{
|
||||
fd_turnon1(fdu);
|
||||
fd->flags |= FD_MOTOR_WAIT;
|
||||
timeout((timeout_func_t)fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
timeout(fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
}
|
||||
}
|
||||
|
||||
@ -685,7 +685,7 @@ fdstart(fdcu)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_timeout(caddr_t arg1)
|
||||
fd_timeout(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
fdu_t fdu = fdc_data[fdcu].fdu;
|
||||
@ -732,7 +732,7 @@ fd_timeout(caddr_t arg1)
|
||||
|
||||
/* just ensure it has the right spl */
|
||||
static void
|
||||
fd_pseudointr(caddr_t arg1, int arg2)
|
||||
fd_pseudointr(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
int s;
|
||||
@ -809,8 +809,8 @@ fdstate(fdcu, fdc)
|
||||
TRACE1("fd%d",fdu);
|
||||
TRACE1("[%s]",fdstates[fdc->state]);
|
||||
TRACE1("(0x%x)",fd->flags);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu);
|
||||
timeout((timeout_func_t)fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
untimeout(fd_turnoff, (caddr_t)fdu);
|
||||
timeout(fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
switch (fdc->state)
|
||||
{
|
||||
case DEVIDLE:
|
||||
@ -855,12 +855,12 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,bp->b_cylin * fd->ft->steptrac);
|
||||
fd->track = -2;
|
||||
fdc->state = SEEKWAIT;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case SEEKWAIT:
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
fdc->state = SEEKCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
break;
|
||||
@ -925,10 +925,10 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,fd->ft->datalen); /* data length */
|
||||
}
|
||||
fdc->state = IOCOMPLETE;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case IOCOMPLETE: /* IO DONE, post-analyze */
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
for(i=0;i<7;i++)
|
||||
{
|
||||
fdc->status[i] = in_fdc(fdcu);
|
||||
@ -991,7 +991,7 @@ fdstate(fdcu, fdc)
|
||||
return(0); /* will return later */
|
||||
case RECALWAIT:
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
fdc->state = RECALCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
case RECALCOMPLETE:
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.48 1994/08/13 03:50:13 wollman Exp $
|
||||
* $Id: sio.c,v 1.49 1994/08/18 05:09:35 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -266,7 +266,7 @@ static void commctl __P((struct com_s *com, int bits, int how));
|
||||
static int comparam __P((struct tty *tp, struct termios *t));
|
||||
static int sioprobe __P((struct isa_device *dev));
|
||||
static void comstart __P((struct tty *tp));
|
||||
static void comwakeup __P((caddr_t chan, int ticks));
|
||||
static timeout_t comwakeup;
|
||||
static int tiocm_xxx2mcr __P((int tiocm_xxx));
|
||||
|
||||
/* table and macro for fast conversion from a unit number to its com struct */
|
||||
@ -570,7 +570,7 @@ determined_type: ;
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
if (!comwakeup_started) {
|
||||
comwakeup((caddr_t) NULL, 0);
|
||||
comwakeup((caddr_t) NULL);
|
||||
comwakeup_started = TRUE;
|
||||
}
|
||||
return (1);
|
||||
@ -1724,13 +1724,12 @@ commctl(com, bits, how)
|
||||
}
|
||||
|
||||
static void
|
||||
comwakeup(chan, ticks)
|
||||
caddr_t chan;
|
||||
int ticks;
|
||||
comwakeup(chan)
|
||||
void *chan;
|
||||
{
|
||||
int unit;
|
||||
|
||||
timeout((timeout_func_t)comwakeup, (caddr_t) NULL, hz / 100);
|
||||
timeout(comwakeup, (caddr_t) NULL, hz / 100);
|
||||
|
||||
if (com_events != 0) {
|
||||
#ifndef OLD_INTERRUPT_HANDLING
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.17 1994/08/13 03:49:54 wollman Exp $
|
||||
* $Id: aha1742.c,v 1.18 1994/08/20 03:48:38 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -270,7 +270,7 @@ int ahb_attach();
|
||||
int ahb_init __P((int unit));
|
||||
int ahbintr();
|
||||
int32 ahb_scsi_cmd();
|
||||
void ahb_timeout __P((caddr_t));
|
||||
timeout_t ahb_timeout;
|
||||
void ahb_done();
|
||||
struct ecb *cheat;
|
||||
void ahb_free_ecb();
|
||||
@ -624,7 +624,7 @@ ahbintr(unit)
|
||||
if ((ahb_debug & AHB_SHOWECBS) && ecb)
|
||||
printf("<int ecb(%x)>", ecb);
|
||||
#endif /*AHBDEBUG */
|
||||
untimeout((timeout_func_t)ahb_timeout, (caddr_t)ecb);
|
||||
untimeout(ahb_timeout, (caddr_t)ecb);
|
||||
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
|
||||
}
|
||||
}
|
||||
@ -989,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_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
} else {
|
||||
@ -1118,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_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
@ -1148,7 +1148,7 @@ ahb_scsi_cmd(xs)
|
||||
}
|
||||
|
||||
void
|
||||
ahb_timeout(caddr_t arg1)
|
||||
ahb_timeout(void *arg1)
|
||||
{
|
||||
struct ecb * ecb = (struct ecb *)arg1;
|
||||
int unit;
|
||||
@ -1195,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_func_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
ecb->flags = ECB_ABORTED;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* on the understanding that TFS is not responsible for the correct
|
||||
* functioning of this software in any circumstances.
|
||||
*
|
||||
* $Id: aha1542.c,v 1.31 1994/08/19 21:02:05 ats Exp $
|
||||
* $Id: aha1542.c,v 1.32 1994/08/20 03:48:37 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -310,7 +310,7 @@ void aha_done();
|
||||
int ahaattach();
|
||||
int ahaintr();
|
||||
int32 aha_scsi_cmd();
|
||||
void aha_timeout(caddr_t);
|
||||
timeout_t aha_timeout;
|
||||
void ahaminphys();
|
||||
u_int32 aha_adapter_info();
|
||||
|
||||
@ -684,7 +684,7 @@ ahaintr(unit)
|
||||
#endif /*AHADEBUG */
|
||||
}
|
||||
if (ccb) {
|
||||
untimeout((timeout_func_t)aha_timeout, (caddr_t)ccb);
|
||||
untimeout(aha_timeout, (caddr_t)ccb);
|
||||
aha_done(unit, ccb);
|
||||
}
|
||||
aha->aha_mbx.mbi[i].stat = AHA_MBI_FREE;
|
||||
@ -1216,7 +1216,7 @@ aha_scsi_cmd(xs)
|
||||
bcopy(xs->cmd, &ccb->scsi_cmd, ccb->scsi_cmd_length);
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio(); /* stop instant timeouts */
|
||||
timeout((timeout_func_t)aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
timeout(aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
aha_startmbx(ccb->mbx);
|
||||
/*
|
||||
* Usually return SUCCESSFULLY QUEUED
|
||||
@ -1277,7 +1277,7 @@ aha_poll(unit, xs, ccb)
|
||||
* because we are polling,
|
||||
* take out the timeout entry aha_timeout made
|
||||
*/
|
||||
untimeout((timeout_func_t)aha_timeout, (caddr_t)ccb);
|
||||
untimeout(aha_timeout, (caddr_t)ccb);
|
||||
count = 2000;
|
||||
while (count) {
|
||||
/*
|
||||
@ -1435,7 +1435,7 @@ aha_bus_speed_check(unit, speed)
|
||||
#endif /*TUNE_1542*/
|
||||
|
||||
void
|
||||
aha_timeout(caddr_t arg1)
|
||||
aha_timeout(void *arg1)
|
||||
{
|
||||
struct aha_ccb * ccb = (struct aha_ccb *)arg1;
|
||||
int unit;
|
||||
@ -1471,7 +1471,7 @@ aha_timeout(caddr_t arg1)
|
||||
printf("\n");
|
||||
aha_abortmbx(ccb->mbx);
|
||||
/* 4 secs for the abort */
|
||||
timeout((timeout_func_t)aha_timeout, (caddr_t)ccb, 4 * hz);
|
||||
timeout(aha_timeout, (caddr_t)ccb, 4 * hz);
|
||||
ccb->flags = CCB_ABORTED;
|
||||
} splx(s);
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.17 1994/08/13 03:49:54 wollman Exp $
|
||||
* $Id: aha1742.c,v 1.18 1994/08/20 03:48:38 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -270,7 +270,7 @@ int ahb_attach();
|
||||
int ahb_init __P((int unit));
|
||||
int ahbintr();
|
||||
int32 ahb_scsi_cmd();
|
||||
void ahb_timeout __P((caddr_t));
|
||||
timeout_t ahb_timeout;
|
||||
void ahb_done();
|
||||
struct ecb *cheat;
|
||||
void ahb_free_ecb();
|
||||
@ -624,7 +624,7 @@ ahbintr(unit)
|
||||
if ((ahb_debug & AHB_SHOWECBS) && ecb)
|
||||
printf("<int ecb(%x)>", ecb);
|
||||
#endif /*AHBDEBUG */
|
||||
untimeout((timeout_func_t)ahb_timeout, (caddr_t)ecb);
|
||||
untimeout(ahb_timeout, (caddr_t)ecb);
|
||||
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
|
||||
}
|
||||
}
|
||||
@ -989,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_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
} else {
|
||||
@ -1118,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_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
@ -1148,7 +1148,7 @@ ahb_scsi_cmd(xs)
|
||||
}
|
||||
|
||||
void
|
||||
ahb_timeout(caddr_t arg1)
|
||||
ahb_timeout(void *arg1)
|
||||
{
|
||||
struct ecb * ecb = (struct ecb *)arg1;
|
||||
int unit;
|
||||
@ -1195,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_func_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
ecb->flags = ECB_ABORTED;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* on the understanding that TFS is not responsible for the correct
|
||||
* functioning of this software in any circumstances.
|
||||
*
|
||||
* $Id: bt742a.c,v 1.19 1994/08/18 23:36:39 phk Exp $
|
||||
* $Id: bt742a.c,v 1.20 1994/08/21 20:16:13 paul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -342,7 +342,7 @@ int btprobe();
|
||||
int btattach();
|
||||
int btintr();
|
||||
int32 bt_scsi_cmd();
|
||||
void bt_timeout(caddr_t);
|
||||
timeout_t bt_timeout;
|
||||
void bt_inquire_setup_information();
|
||||
void bt_done();
|
||||
void btminphys();
|
||||
@ -717,7 +717,7 @@ btintr(unit)
|
||||
}
|
||||
wmbi->stat = BT_MBI_FREE;
|
||||
if (ccb) {
|
||||
untimeout((timeout_func_t)bt_timeout, (caddr_t)ccb);
|
||||
untimeout(bt_timeout, (caddr_t)ccb);
|
||||
bt_done(unit, ccb);
|
||||
}
|
||||
/* Set the IN mail Box pointer for next */ bt_nextmbx(wmbi, wmbx, mbi);
|
||||
@ -1359,7 +1359,7 @@ bt_scsi_cmd(xs)
|
||||
*/
|
||||
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
timeout((timeout_func_t)bt_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
timeout(bt_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
}
|
||||
/*
|
||||
@ -1410,7 +1410,7 @@ bt_poll(unit, xs, ccb)
|
||||
* because we are polling, take out the timeout entry
|
||||
* bt_timeout made
|
||||
*/
|
||||
untimeout((timeout_func_t)bt_timeout, (caddr_t)ccb);
|
||||
untimeout(bt_timeout, (caddr_t)ccb);
|
||||
count = 2000;
|
||||
while (count) {
|
||||
/*
|
||||
@ -1440,7 +1440,7 @@ bt_poll(unit, xs, ccb)
|
||||
}
|
||||
|
||||
void
|
||||
bt_timeout(caddr_t arg1)
|
||||
bt_timeout(void *arg1)
|
||||
{
|
||||
struct bt_ccb * ccb = (struct bt_ccb *)arg1;
|
||||
int unit;
|
||||
@ -1485,7 +1485,7 @@ bt_timeout(caddr_t arg1)
|
||||
bt_send_mbo(unit, ~SCSI_NOMASK,
|
||||
BT_MBO_ABORT, ccb);
|
||||
/* 2 secs for the abort */
|
||||
timeout((timeout_func_t)bt_timeout, (caddr_t)ccb, 2 * hz);
|
||||
timeout(bt_timeout, (caddr_t)ccb, 2 * hz);
|
||||
ccb->flags = CCB_ABORTED;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
|
||||
* $Id: fd.c,v 1.27 1994/08/13 03:49:57 wollman Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -199,7 +199,7 @@ int fd_debug = 1;
|
||||
|
||||
static void fdstart(fdcu_t);
|
||||
void fdintr(fdcu_t);
|
||||
static void fd_turnoff(caddr_t);
|
||||
static timeout_t fd_turnoff;
|
||||
|
||||
/****************************************************************************/
|
||||
/* autoconfiguration stuff */
|
||||
@ -417,7 +417,7 @@ void fdstrategy(struct buf *bp)
|
||||
dp = &(fdc->head);
|
||||
s = splbio();
|
||||
disksort(dp, bp);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
fdstart(fdcu);
|
||||
splx(s);
|
||||
return;
|
||||
@ -463,7 +463,7 @@ set_motor(fdcu, fdu, reset)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_turnoff(caddr_t arg1)
|
||||
fd_turnoff(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -476,7 +476,7 @@ fd_turnoff(caddr_t arg1)
|
||||
}
|
||||
|
||||
void
|
||||
fd_motor_on(caddr_t arg1)
|
||||
fd_motor_on(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -502,7 +502,7 @@ fd_turnon(fdu)
|
||||
{
|
||||
fd_turnon1(fdu);
|
||||
fd->flags |= FD_MOTOR_WAIT;
|
||||
timeout((timeout_func_t)fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
timeout(fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
}
|
||||
}
|
||||
|
||||
@ -685,7 +685,7 @@ fdstart(fdcu)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_timeout(caddr_t arg1)
|
||||
fd_timeout(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
fdu_t fdu = fdc_data[fdcu].fdu;
|
||||
@ -732,7 +732,7 @@ fd_timeout(caddr_t arg1)
|
||||
|
||||
/* just ensure it has the right spl */
|
||||
static void
|
||||
fd_pseudointr(caddr_t arg1, int arg2)
|
||||
fd_pseudointr(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
int s;
|
||||
@ -809,8 +809,8 @@ fdstate(fdcu, fdc)
|
||||
TRACE1("fd%d",fdu);
|
||||
TRACE1("[%s]",fdstates[fdc->state]);
|
||||
TRACE1("(0x%x)",fd->flags);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu);
|
||||
timeout((timeout_func_t)fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
untimeout(fd_turnoff, (caddr_t)fdu);
|
||||
timeout(fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
switch (fdc->state)
|
||||
{
|
||||
case DEVIDLE:
|
||||
@ -855,12 +855,12 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,bp->b_cylin * fd->ft->steptrac);
|
||||
fd->track = -2;
|
||||
fdc->state = SEEKWAIT;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case SEEKWAIT:
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
fdc->state = SEEKCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
break;
|
||||
@ -925,10 +925,10 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,fd->ft->datalen); /* data length */
|
||||
}
|
||||
fdc->state = IOCOMPLETE;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case IOCOMPLETE: /* IO DONE, post-analyze */
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
for(i=0;i<7;i++)
|
||||
{
|
||||
fdc->status[i] = in_fdc(fdcu);
|
||||
@ -991,7 +991,7 @@ fdstate(fdcu, fdc)
|
||||
return(0); /* will return later */
|
||||
case RECALWAIT:
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
fdc->state = RECALCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
case RECALCOMPLETE:
|
||||
|
||||
3677
sys/i386/isa/ft.c
3677
sys/i386/isa/ft.c
File diff suppressed because it is too large
Load Diff
@ -21,27 +21,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_le.c,v 1.2 1994/08/12 11:42:37 davidg Exp $
|
||||
*
|
||||
* $Log: if_le.c,v $
|
||||
* Revision 1.2 1994/08/12 11:42:37 davidg
|
||||
* Added conditionals to make this compile cleanly in FreeBSD 2.0.
|
||||
*
|
||||
* Revision 1.1 1994/08/12 06:51:10 davidg
|
||||
* New ethernet device driver from Matt Thomas:
|
||||
*
|
||||
* This driver supports all the DEC EtherWORKS III NICs (DE203, DE204,
|
||||
* and DE205) and the later DEC EtherWORKS II NICs (DE200, DE201, DE202,
|
||||
* DE422). DEPCA-style boards prior to the DE200 have not been tested
|
||||
* and may not work.
|
||||
*
|
||||
* Submitted by: Matt Thomas (thomas@lkg.dec.com)
|
||||
*
|
||||
* Revision 1.8 1994/08/05 20:20:54 thomas
|
||||
* Enable change log
|
||||
*
|
||||
* Revision 1.7 1994/08/05 20:20:14 thomas
|
||||
* *** empty log message ***
|
||||
* $Id: if_le.c,v 1.3 1994/08/20 03:48:39 davidg Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: unknown origin, 386BSD 0.1
|
||||
* $Id: lpt.c,v 1.14 1994/08/13 03:50:08 wollman Exp $
|
||||
* $Id: lpt.c,v 1.15 1994/08/14 01:46:28 phk Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -424,8 +424,10 @@ lptopen(dev_t dev, int flag)
|
||||
if ((unit >= NLPT) || (sc->sc_port == 0))
|
||||
return (ENXIO);
|
||||
|
||||
#ifdef INET
|
||||
if (sc->sc_if.if_flags & IFF_UP)
|
||||
return(EBUSY);
|
||||
#endif
|
||||
if (sc->sc_state) {
|
||||
lprintf("lp: still open\n") ;
|
||||
lprintf("still open %x\n", sc->sc_state);
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.48 1994/08/13 03:50:13 wollman Exp $
|
||||
* $Id: sio.c,v 1.49 1994/08/18 05:09:35 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -266,7 +266,7 @@ static void commctl __P((struct com_s *com, int bits, int how));
|
||||
static int comparam __P((struct tty *tp, struct termios *t));
|
||||
static int sioprobe __P((struct isa_device *dev));
|
||||
static void comstart __P((struct tty *tp));
|
||||
static void comwakeup __P((caddr_t chan, int ticks));
|
||||
static timeout_t comwakeup;
|
||||
static int tiocm_xxx2mcr __P((int tiocm_xxx));
|
||||
|
||||
/* table and macro for fast conversion from a unit number to its com struct */
|
||||
@ -570,7 +570,7 @@ determined_type: ;
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
if (!comwakeup_started) {
|
||||
comwakeup((caddr_t) NULL, 0);
|
||||
comwakeup((caddr_t) NULL);
|
||||
comwakeup_started = TRUE;
|
||||
}
|
||||
return (1);
|
||||
@ -1724,13 +1724,12 @@ commctl(com, bits, how)
|
||||
}
|
||||
|
||||
static void
|
||||
comwakeup(chan, ticks)
|
||||
caddr_t chan;
|
||||
int ticks;
|
||||
comwakeup(chan)
|
||||
void *chan;
|
||||
{
|
||||
int unit;
|
||||
|
||||
timeout((timeout_func_t)comwakeup, (caddr_t) NULL, hz / 100);
|
||||
timeout(comwakeup, (caddr_t) NULL, hz / 100);
|
||||
|
||||
if (com_events != 0) {
|
||||
#ifndef OLD_INTERRUPT_HANDLING
|
||||
|
||||
@ -37,7 +37,7 @@ static int wdtest = 0;
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: wd.c,v 1.41 1994/08/08 13:56:46 davidg Exp $
|
||||
* $Id: wd.c,v 1.42 1994/08/13 03:50:18 wollman Exp $
|
||||
*/
|
||||
|
||||
/* TODO:
|
||||
@ -178,7 +178,7 @@ static void wderror(struct buf *bp, struct disk *du, char *mesg);
|
||||
static void wdflushirq(struct disk *du, int old_ipl);
|
||||
static int wdreset(struct disk *du);
|
||||
static void wdsleep(int ctrlr, char *wmesg);
|
||||
static void wdtimeout(caddr_t cdu);
|
||||
static timeout_t wdtimeout;
|
||||
static int wdunwedge(struct disk *du);
|
||||
static int wdwait(struct disk *du, u_char bits_wanted, int timeout);
|
||||
|
||||
@ -1695,7 +1695,7 @@ wdsleep(int ctrlr, char *wmesg)
|
||||
}
|
||||
|
||||
static void
|
||||
wdtimeout(caddr_t cdu)
|
||||
wdtimeout(void *cdu)
|
||||
{
|
||||
struct disk *du;
|
||||
int x;
|
||||
@ -1710,7 +1710,7 @@ wdtimeout(caddr_t cdu)
|
||||
du->dk_flags |= DKFL_SINGLE;
|
||||
wdstart(du->dk_ctrlr);
|
||||
}
|
||||
timeout((timeout_func_t)wdtimeout, cdu, hz);
|
||||
timeout(wdtimeout, cdu, hz);
|
||||
splx(x);
|
||||
}
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
* the original CMU copyright notice.
|
||||
*
|
||||
* Version 1.3, Thu Nov 11 12:09:13 MSK 1993
|
||||
* $Id: wt.c,v 1.8 1994/08/13 03:50:20 wollman Exp $
|
||||
* $Id: wt.c,v 1.9 1994/08/20 03:48:43 davidg Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -156,7 +156,7 @@ static int wtwait (wtinfo_t *t, int catch, char *msg);
|
||||
static int wtcmd (wtinfo_t *t, int cmd);
|
||||
static int wtstart (wtinfo_t *t, unsigned mode, void *vaddr, unsigned len);
|
||||
static void wtdma (wtinfo_t *t);
|
||||
static void wtimer (caddr_t);
|
||||
static timeout_t wtimer;
|
||||
static void wtclock (wtinfo_t *t);
|
||||
static int wtreset (wtinfo_t *t);
|
||||
static int wtsense (wtinfo_t *t, int verb, int ignor);
|
||||
@ -770,7 +770,7 @@ static void wtclock (wtinfo_t *t)
|
||||
t->flags |= TPTIMER;
|
||||
/* Some controllers seem to lose dma interrupts too often.
|
||||
* To make the tape stream we need 1 tick timeout. */
|
||||
timeout ((timeout_func_t)wtimer, (caddr_t)t, (t->flags & TPACTIVE) ? 1 : hz);
|
||||
timeout (wtimer, (caddr_t)t, (t->flags & TPACTIVE) ? 1 : hz);
|
||||
}
|
||||
}
|
||||
|
||||
@ -779,7 +779,7 @@ static void wtclock (wtinfo_t *t)
|
||||
* This is necessary in case interrupts get eaten due to
|
||||
* multiple devices on a single IRQ line.
|
||||
*/
|
||||
static void wtimer (caddr_t xt)
|
||||
static void wtimer (void *xt)
|
||||
{
|
||||
wtinfo_t *t = (wtinfo_t *)xt;
|
||||
int s;
|
||||
|
||||
32
sys/isa/fd.c
32
sys/isa/fd.c
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
|
||||
* $Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
|
||||
* $Id: fd.c,v 1.27 1994/08/13 03:49:57 wollman Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -199,7 +199,7 @@ int fd_debug = 1;
|
||||
|
||||
static void fdstart(fdcu_t);
|
||||
void fdintr(fdcu_t);
|
||||
static void fd_turnoff(caddr_t);
|
||||
static timeout_t fd_turnoff;
|
||||
|
||||
/****************************************************************************/
|
||||
/* autoconfiguration stuff */
|
||||
@ -417,7 +417,7 @@ void fdstrategy(struct buf *bp)
|
||||
dp = &(fdc->head);
|
||||
s = splbio();
|
||||
disksort(dp, bp);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */
|
||||
fdstart(fdcu);
|
||||
splx(s);
|
||||
return;
|
||||
@ -463,7 +463,7 @@ set_motor(fdcu, fdu, reset)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_turnoff(caddr_t arg1)
|
||||
fd_turnoff(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -476,7 +476,7 @@ fd_turnoff(caddr_t arg1)
|
||||
}
|
||||
|
||||
void
|
||||
fd_motor_on(caddr_t arg1)
|
||||
fd_motor_on(void *arg1)
|
||||
{
|
||||
fdu_t fdu = (fdu_t)arg1;
|
||||
int s;
|
||||
@ -502,7 +502,7 @@ fd_turnon(fdu)
|
||||
{
|
||||
fd_turnon1(fdu);
|
||||
fd->flags |= FD_MOTOR_WAIT;
|
||||
timeout((timeout_func_t)fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
timeout(fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
|
||||
}
|
||||
}
|
||||
|
||||
@ -685,7 +685,7 @@ fdstart(fdcu)
|
||||
}
|
||||
|
||||
static void
|
||||
fd_timeout(caddr_t arg1)
|
||||
fd_timeout(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
fdu_t fdu = fdc_data[fdcu].fdu;
|
||||
@ -732,7 +732,7 @@ fd_timeout(caddr_t arg1)
|
||||
|
||||
/* just ensure it has the right spl */
|
||||
static void
|
||||
fd_pseudointr(caddr_t arg1, int arg2)
|
||||
fd_pseudointr(void *arg1)
|
||||
{
|
||||
fdcu_t fdcu = (fdcu_t)arg1;
|
||||
int s;
|
||||
@ -809,8 +809,8 @@ fdstate(fdcu, fdc)
|
||||
TRACE1("fd%d",fdu);
|
||||
TRACE1("[%s]",fdstates[fdc->state]);
|
||||
TRACE1("(0x%x)",fd->flags);
|
||||
untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu);
|
||||
timeout((timeout_func_t)fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
untimeout(fd_turnoff, (caddr_t)fdu);
|
||||
timeout(fd_turnoff, (caddr_t)fdu, 4 * hz);
|
||||
switch (fdc->state)
|
||||
{
|
||||
case DEVIDLE:
|
||||
@ -855,12 +855,12 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,bp->b_cylin * fd->ft->steptrac);
|
||||
fd->track = -2;
|
||||
fdc->state = SEEKWAIT;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case SEEKWAIT:
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50);
|
||||
fdc->state = SEEKCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
break;
|
||||
@ -925,10 +925,10 @@ fdstate(fdcu, fdc)
|
||||
out_fdc(fdcu,fd->ft->datalen); /* data length */
|
||||
}
|
||||
fdc->state = IOCOMPLETE;
|
||||
timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
|
||||
return(0); /* will return later */
|
||||
case IOCOMPLETE: /* IO DONE, post-analyze */
|
||||
untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
|
||||
untimeout(fd_timeout, (caddr_t)fdcu);
|
||||
for(i=0;i<7;i++)
|
||||
{
|
||||
fdc->status[i] = in_fdc(fdcu);
|
||||
@ -991,7 +991,7 @@ fdstate(fdcu, fdc)
|
||||
return(0); /* will return later */
|
||||
case RECALWAIT:
|
||||
/* allow heads to settle */
|
||||
timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
timeout(fd_pseudointr, (caddr_t)fdcu, hz / 30);
|
||||
fdc->state = RECALCOMPLETE;
|
||||
return(0); /* will return later */
|
||||
case RECALCOMPLETE:
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.48 1994/08/13 03:50:13 wollman Exp $
|
||||
* $Id: sio.c,v 1.49 1994/08/18 05:09:35 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -266,7 +266,7 @@ static void commctl __P((struct com_s *com, int bits, int how));
|
||||
static int comparam __P((struct tty *tp, struct termios *t));
|
||||
static int sioprobe __P((struct isa_device *dev));
|
||||
static void comstart __P((struct tty *tp));
|
||||
static void comwakeup __P((caddr_t chan, int ticks));
|
||||
static timeout_t comwakeup;
|
||||
static int tiocm_xxx2mcr __P((int tiocm_xxx));
|
||||
|
||||
/* table and macro for fast conversion from a unit number to its com struct */
|
||||
@ -570,7 +570,7 @@ determined_type: ;
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
if (!comwakeup_started) {
|
||||
comwakeup((caddr_t) NULL, 0);
|
||||
comwakeup((caddr_t) NULL);
|
||||
comwakeup_started = TRUE;
|
||||
}
|
||||
return (1);
|
||||
@ -1724,13 +1724,12 @@ commctl(com, bits, how)
|
||||
}
|
||||
|
||||
static void
|
||||
comwakeup(chan, ticks)
|
||||
caddr_t chan;
|
||||
int ticks;
|
||||
comwakeup(chan)
|
||||
void *chan;
|
||||
{
|
||||
int unit;
|
||||
|
||||
timeout((timeout_func_t)comwakeup, (caddr_t) NULL, hz / 100);
|
||||
timeout(comwakeup, (caddr_t) NULL, hz / 100);
|
||||
|
||||
if (com_events != 0) {
|
||||
#ifndef OLD_INTERRUPT_HANDLING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user