Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change timeout/untimeout/wakeup/sleep/tsleep args to void *

This commit is contained in:
cgd 1994-04-29 23:15:51 +00:00
parent e3926c6721
commit e0db92993a
20 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/i386/eisa/aha1742.c
View File

@ -26,7 +26,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: aha1742.c,v 1.29 1994/04/20 22:39:33 mycroft Exp $
* $Id: aha1742.c,v 1.30 1994/04/29 23:15:54 cgd Exp $
*/
/*
@ -1028,7 +1028,8 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_immed(ahb, sc_link->target, AHB_TARG_RESET);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb,
(xs->timeout * hz) / 1000);
splx(s);
return SUCCESSFULLY_QUEUED;
} else {
@ -1164,7 +1165,7 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_mbox(ahb, OP_START_ECB, sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb, (xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
return SUCCESSFULLY_QUEUED;
@ -1234,7 +1235,7 @@ ahb_timeout(arg)
} else { /* abort the operation that has timed out */
printf("\n");
ahb_send_mbox(ahb, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
timeout((timeout_t)ahb_timeout, ecb, 2 * hz);
ecb->flags = ECB_ABORTED;
}
splx(s);

10
sys/arch/i386/isa/aha1542.c
View File

@ -26,7 +26,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: aha1542.c,v 1.27 1994/04/21 03:37:19 mycroft Exp $
* $Id: aha1542.c,v 1.28 1994/04/29 23:15:51 cgd Exp $
*/
/*
@ -701,7 +701,7 @@ ahaintr(aha)
#endif /*AHADEBUG */
}
if (ccb) {
untimeout(aha_timeout, (caddr_t)ccb);
untimeout((timeout_t)aha_timeout, ccb);
aha_done(aha, ccb);
}
aha->aha_mbx.mbi[i].stat = AHA_MBI_FREE;
@ -1192,7 +1192,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(aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
timeout((timeout_t)aha_timeout, ccb, (xs->timeout * hz) / 1000);
aha_startmbx(ccb->mbx);
/*
* Usually return SUCCESSFULLY QUEUED
@ -1249,7 +1249,7 @@ aha_poll(aha, xs, ccb)
* because we are polling, take out the timeout entry
* aha_timeout made
*/
untimeout(aha_timeout, (caddr_t)ccb);
untimeout((timeout_t)aha_timeout, ccb);
count = 2000;
while (count) {
/*
@ -1424,7 +1424,7 @@ aha_timeout(arg)
printf("\n");
aha_abortmbx(ccb->mbx);
/* 4 secs for the abort */
timeout(aha_timeout, (caddr_t)ccb, 2 * hz);
timeout((timeout_t)aha_timeout, ccb, 2 * hz);
ccb->flags = CCB_ABORTED;
}
splx(s);

9
sys/arch/i386/isa/aha1742.c
View File

@ -26,7 +26,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: aha1742.c,v 1.29 1994/04/20 22:39:33 mycroft Exp $
* $Id: aha1742.c,v 1.30 1994/04/29 23:15:54 cgd Exp $
*/
/*
@ -1028,7 +1028,8 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_immed(ahb, sc_link->target, AHB_TARG_RESET);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb,
(xs->timeout * hz) / 1000);
splx(s);
return SUCCESSFULLY_QUEUED;
} else {
@ -1164,7 +1165,7 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_mbox(ahb, OP_START_ECB, sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb, (xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
return SUCCESSFULLY_QUEUED;
@ -1234,7 +1235,7 @@ ahb_timeout(arg)
} else { /* abort the operation that has timed out */
printf("\n");
ahb_send_mbox(ahb, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
timeout((timeout_t)ahb_timeout, ecb, 2 * hz);
ecb->flags = ECB_ABORTED;
}
splx(s);

18
sys/arch/i386/isa/aic6360.c
View File

@ -30,7 +30,7 @@
*/
/*
* $Id: aic6360.c,v 1.2 1994/04/26 03:43:26 mycroft Exp $
* $Id: aic6360.c,v 1.3 1994/04/29 23:15:57 cgd Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -902,13 +902,13 @@ aic_init(aic)
aic->state = AIC_CLEANING;
if (aic->nexus != NULL) {
aic->nexus->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)aic->nexus);
untimeout((timeout_t)aic_timeout, aic->nexus);
aic_done(aic->nexus);
}
aic->nexus = NULL;
while (acb = aic->nexus_list.tqh_first) {
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
}
@ -1006,7 +1006,7 @@ aic_scsi_cmd(xs)
s = splbio();
TAILQ_INSERT_TAIL(&aic->ready_list, acb, chain);
timeout(aic_timeout, (caddr_t)acb, (xs->timeout*hz)/1000);
timeout((timeout_t)aic_timeout, acb, (xs->timeout*hz)/1000);
if (aic->state == AIC_IDLE)
aic_sched(aic);
@ -1429,7 +1429,7 @@ aic_msgin(aic)
}
acb->xs->resid = acb->dleft = aic->dleft;
aic->flags |= AIC_BUSFREE_OK;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
break;
case MSG_MESSAGE_REJECT:
@ -2084,7 +2084,7 @@ aicintr(aic)
*/
printf("aic: unexpected busfree\n");
xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
LOGLINE(aic);
@ -2105,7 +2105,7 @@ aicintr(aic)
outb(CLRSINT1, CLRSELTIMO);
aic->state = AIC_IDLE;
acb->xs->error = XS_TIMEOUT;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
@ -2183,7 +2183,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;
@ -2200,7 +2200,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;

10
sys/arch/i386/isa/bt742a.c
View File

@ -26,7 +26,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: bt742a.c,v 1.24 1994/04/08 18:22:20 mycroft Exp $
* $Id: bt742a.c,v 1.25 1994/04/29 23:16:00 cgd Exp $
*/
/*
@ -746,7 +746,7 @@ btintr(bt)
}
wmbi->stat = BT_MBI_FREE;
if (ccb) {
untimeout(bt_timeout, (caddr_t)ccb);
untimeout((timeout_t)bt_timeout, ccb);
bt_done(bt, ccb);
}
/* Set the IN mail Box pointer for next */ bt_nextmbx(wmbi, wmbx, mbi);
@ -1363,7 +1363,7 @@ bt_scsi_cmd(xs)
*/
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
if (!(flags & SCSI_NOMASK)) {
timeout(bt_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
timeout((timeout_t)bt_timeout, ccb, (xs->timeout * hz) / 1000);
return SUCCESSFULLY_QUEUED;
}
@ -1412,7 +1412,7 @@ bt_poll(bt, xs, ccb)
* because we are polling, take out the timeout entry
* bt_timeout made
*/
untimeout(bt_timeout, (caddr_t)ccb);
untimeout((timeout_t)bt_timeout, ccb);
count = 2000;
while (count) {
/*
@ -1479,7 +1479,7 @@ bt_timeout(arg)
printf("\n");
bt_send_mbo(bt, ~SCSI_NOMASK, BT_MBO_ABORT, ccb);
/* 2 secs for the abort */
timeout(bt_timeout, (caddr_t)ccb, 2 * hz);
timeout((timeout_t)bt_timeout, ccb, 2 * hz);
ccb->flags = CCB_ABORTED;
}
splx(s);

9
sys/arch/i386/isa/ultra14f.c
View File

@ -26,7 +26,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: ultra14f.c,v 1.26 1994/04/07 06:51:13 mycroft Exp $
* $Id: ultra14f.c,v 1.27 1994/04/29 23:16:02 cgd Exp $
*/
/*
@ -559,7 +559,7 @@ uhaintr(uha)
printf("uha: BAD MSCP RETURNED\n");
return 0; /* whatever it was, it'll timeout */
}
untimeout(uha_timeout, (caddr_t)mscp);
untimeout((timeout_t)uha_timeout, mscp);
uha_done(uha, mscp);
} while (inb(iobase + UHA_SINT) & UHA_SINTP);
@ -1057,7 +1057,8 @@ uha_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
uha_send_mbox(uha, mscp);
timeout(uha_timeout, (caddr_t)mscp, (xs->timeout * hz) / 1000);
timeout((timeout_t)uha_timeout, mscp,
(xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
return SUCCESSFULLY_QUEUED;
@ -1107,7 +1108,7 @@ uha_timeout(arg)
uha_done(uha, mscp);
} else { /* abort the operation that has timed out */
printf("\n");
timeout(uha_timeout, (caddr_t)mscp, 2 * hz);
timeout((timeout_t)uha_timeout, mscp, 2 * hz);
mscp->flags = MSCP_ABORTED;
}
splx(s);

9
sys/dev/eisa/aha1742.c
View File

@ -26,7 +26,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: aha1742.c,v 1.29 1994/04/20 22:39:33 mycroft Exp $
* $Id: aha1742.c,v 1.30 1994/04/29 23:15:54 cgd Exp $
*/
/*
@ -1028,7 +1028,8 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_immed(ahb, sc_link->target, AHB_TARG_RESET);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb,
(xs->timeout * hz) / 1000);
splx(s);
return SUCCESSFULLY_QUEUED;
} else {
@ -1164,7 +1165,7 @@ ahb_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
ahb_send_mbox(ahb, OP_START_ECB, sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
timeout((timeout_t)ahb_timeout, ecb, (xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
return SUCCESSFULLY_QUEUED;
@ -1234,7 +1235,7 @@ ahb_timeout(arg)
} else { /* abort the operation that has timed out */
printf("\n");
ahb_send_mbox(ahb, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
timeout(ahb_timeout, (caddr_t)ecb, 2 * hz);
timeout((timeout_t)ahb_timeout, ecb, 2 * hz);
ecb->flags = ECB_ABORTED;
}
splx(s);

18
sys/dev/ic/aic6360.c
View File

@ -30,7 +30,7 @@
*/
/*
* $Id: aic6360.c,v 1.2 1994/04/26 03:43:26 mycroft Exp $
* $Id: aic6360.c,v 1.3 1994/04/29 23:15:57 cgd Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -902,13 +902,13 @@ aic_init(aic)
aic->state = AIC_CLEANING;
if (aic->nexus != NULL) {
aic->nexus->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)aic->nexus);
untimeout((timeout_t)aic_timeout, aic->nexus);
aic_done(aic->nexus);
}
aic->nexus = NULL;
while (acb = aic->nexus_list.tqh_first) {
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
}
@ -1006,7 +1006,7 @@ aic_scsi_cmd(xs)
s = splbio();
TAILQ_INSERT_TAIL(&aic->ready_list, acb, chain);
timeout(aic_timeout, (caddr_t)acb, (xs->timeout*hz)/1000);
timeout((timeout_t)aic_timeout, acb, (xs->timeout*hz)/1000);
if (aic->state == AIC_IDLE)
aic_sched(aic);
@ -1429,7 +1429,7 @@ aic_msgin(aic)
}
acb->xs->resid = acb->dleft = aic->dleft;
aic->flags |= AIC_BUSFREE_OK;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
break;
case MSG_MESSAGE_REJECT:
@ -2084,7 +2084,7 @@ aicintr(aic)
*/
printf("aic: unexpected busfree\n");
xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
LOGLINE(aic);
@ -2105,7 +2105,7 @@ aicintr(aic)
outb(CLRSINT1, CLRSELTIMO);
aic->state = AIC_IDLE;
acb->xs->error = XS_TIMEOUT;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
@ -2183,7 +2183,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;
@ -2200,7 +2200,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;

10
sys/dev/isa/aha1542.c
View File

@ -26,7 +26,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: aha1542.c,v 1.27 1994/04/21 03:37:19 mycroft Exp $
* $Id: aha1542.c,v 1.28 1994/04/29 23:15:51 cgd Exp $
*/
/*
@ -701,7 +701,7 @@ ahaintr(aha)
#endif /*AHADEBUG */
}
if (ccb) {
untimeout(aha_timeout, (caddr_t)ccb);
untimeout((timeout_t)aha_timeout, ccb);
aha_done(aha, ccb);
}
aha->aha_mbx.mbi[i].stat = AHA_MBI_FREE;
@ -1192,7 +1192,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(aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
timeout((timeout_t)aha_timeout, ccb, (xs->timeout * hz) / 1000);
aha_startmbx(ccb->mbx);
/*
* Usually return SUCCESSFULLY QUEUED
@ -1249,7 +1249,7 @@ aha_poll(aha, xs, ccb)
* because we are polling, take out the timeout entry
* aha_timeout made
*/
untimeout(aha_timeout, (caddr_t)ccb);
untimeout((timeout_t)aha_timeout, ccb);
count = 2000;
while (count) {
/*
@ -1424,7 +1424,7 @@ aha_timeout(arg)
printf("\n");
aha_abortmbx(ccb->mbx);
/* 4 secs for the abort */
timeout(aha_timeout, (caddr_t)ccb, 2 * hz);
timeout((timeout_t)aha_timeout, ccb, 2 * hz);
ccb->flags = CCB_ABORTED;
}
splx(s);

18
sys/dev/isa/aic6360.c
View File

@ -30,7 +30,7 @@
*/
/*
* $Id: aic6360.c,v 1.2 1994/04/26 03:43:26 mycroft Exp $
* $Id: aic6360.c,v 1.3 1994/04/29 23:15:57 cgd Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -902,13 +902,13 @@ aic_init(aic)
aic->state = AIC_CLEANING;
if (aic->nexus != NULL) {
aic->nexus->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)aic->nexus);
untimeout((timeout_t)aic_timeout, aic->nexus);
aic_done(aic->nexus);
}
aic->nexus = NULL;
while (acb = aic->nexus_list.tqh_first) {
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
}
@ -1006,7 +1006,7 @@ aic_scsi_cmd(xs)
s = splbio();
TAILQ_INSERT_TAIL(&aic->ready_list, acb, chain);
timeout(aic_timeout, (caddr_t)acb, (xs->timeout*hz)/1000);
timeout((timeout_t)aic_timeout, acb, (xs->timeout*hz)/1000);
if (aic->state == AIC_IDLE)
aic_sched(aic);
@ -1429,7 +1429,7 @@ aic_msgin(aic)
}
acb->xs->resid = acb->dleft = aic->dleft;
aic->flags |= AIC_BUSFREE_OK;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
break;
case MSG_MESSAGE_REJECT:
@ -2084,7 +2084,7 @@ aicintr(aic)
*/
printf("aic: unexpected busfree\n");
xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
}
LOGLINE(aic);
@ -2105,7 +2105,7 @@ aicintr(aic)
outb(CLRSINT1, CLRSELTIMO);
aic->state = AIC_IDLE;
acb->xs->error = XS_TIMEOUT;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
@ -2183,7 +2183,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;
@ -2200,7 +2200,7 @@ aicintr(aic)
__LINE__);
Debugger();
acb->xs->error = XS_DRIVER_STUFFUP;
untimeout(aic_timeout, (caddr_t)acb);
untimeout((timeout_t)aic_timeout, acb);
aic_done(acb);
aic_init(aic);
return 1;

10
sys/dev/isa/bt742a.c
View File

@ -26,7 +26,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: bt742a.c,v 1.24 1994/04/08 18:22:20 mycroft Exp $
* $Id: bt742a.c,v 1.25 1994/04/29 23:16:00 cgd Exp $
*/
/*
@ -746,7 +746,7 @@ btintr(bt)
}
wmbi->stat = BT_MBI_FREE;
if (ccb) {
untimeout(bt_timeout, (caddr_t)ccb);
untimeout((timeout_t)bt_timeout, ccb);
bt_done(bt, ccb);
}
/* Set the IN mail Box pointer for next */ bt_nextmbx(wmbi, wmbx, mbi);
@ -1363,7 +1363,7 @@ bt_scsi_cmd(xs)
*/
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
if (!(flags & SCSI_NOMASK)) {
timeout(bt_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
timeout((timeout_t)bt_timeout, ccb, (xs->timeout * hz) / 1000);
return SUCCESSFULLY_QUEUED;
}
@ -1412,7 +1412,7 @@ bt_poll(bt, xs, ccb)
* because we are polling, take out the timeout entry
* bt_timeout made
*/
untimeout(bt_timeout, (caddr_t)ccb);
untimeout((timeout_t)bt_timeout, ccb);
count = 2000;
while (count) {
/*
@ -1479,7 +1479,7 @@ bt_timeout(arg)
printf("\n");
bt_send_mbo(bt, ~SCSI_NOMASK, BT_MBO_ABORT, ccb);
/* 2 secs for the abort */
timeout(bt_timeout, (caddr_t)ccb, 2 * hz);
timeout((timeout_t)bt_timeout, ccb, 2 * hz);
ccb->flags = CCB_ABORTED;
}
splx(s);

9
sys/dev/isa/ultra14f.c
View File

@ -26,7 +26,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: ultra14f.c,v 1.26 1994/04/07 06:51:13 mycroft Exp $
* $Id: ultra14f.c,v 1.27 1994/04/29 23:16:02 cgd Exp $
*/
/*
@ -559,7 +559,7 @@ uhaintr(uha)
printf("uha: BAD MSCP RETURNED\n");
return 0; /* whatever it was, it'll timeout */
}
untimeout(uha_timeout, (caddr_t)mscp);
untimeout((timeout_t)uha_timeout, mscp);
uha_done(uha, mscp);
} while (inb(iobase + UHA_SINT) & UHA_SINTP);
@ -1057,7 +1057,8 @@ uha_scsi_cmd(xs)
if (!(flags & SCSI_NOMASK)) {
s = splbio();
uha_send_mbox(uha, mscp);
timeout(uha_timeout, (caddr_t)mscp, (xs->timeout * hz) / 1000);
timeout((timeout_t)uha_timeout, mscp,
(xs->timeout * hz) / 1000);
splx(s);
SC_DEBUG(sc_link, SDEV_DB3, ("cmd_sent\n"));
return SUCCESSFULLY_QUEUED;
@ -1107,7 +1108,7 @@ uha_timeout(arg)
uha_done(uha, mscp);
} else { /* abort the operation that has timed out */
printf("\n");
timeout(uha_timeout, (caddr_t)mscp, 2 * hz);
timeout((timeout_t)uha_timeout, mscp, 2 * hz);
mscp->flags = MSCP_ABORTED;
}
splx(s);

2
sys/kern/kern_clock.c
View File

@ -1 +1 @@
revision 1.15 intentionally removed
revision 1.16 intentionally removed

2
sys/kern/kern_synch.c
View File

@ -1 +1 @@
revision 1.14 intentionally removed
revision 1.15 intentionally removed

10
sys/kern/uipc_domain.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)uipc_domain.c 7.9 (Berkeley) 3/4/91
* $Id: uipc_domain.c,v 1.6 1994/01/14 22:20:25 deraadt Exp $
* $Id: uipc_domain.c,v 1.7 1994/04/29 23:16:22 cgd Exp $
*/
#include <sys/cdefs.h>
@ -95,8 +95,8 @@ if (max_linkhdr < 16) /* XXX */
max_linkhdr = 16;
max_hdr = max_linkhdr + max_protohdr;
max_datalen = MHLEN - max_hdr;
timeout(pffasttimo, (caddr_t)0, 1);
timeout(pfslowtimo, (caddr_t)0, 1);
timeout((timeout_t)pffasttimo, (caddr_t)0, 1);
timeout((timeout_t)pfslowtimo, (caddr_t)0, 1);
}
struct protosw *
@ -169,7 +169,7 @@ pfslowtimo(arg)
for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
if (pr->pr_slowtimo)
(*pr->pr_slowtimo)();
timeout(pfslowtimo, (caddr_t)0, hz/2);
timeout((timeout_t)pfslowtimo, (caddr_t)0, hz/2);
}
/* ARGSUSED */
@ -184,5 +184,5 @@ pffasttimo(arg)
for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
if (pr->pr_fasttimo)
(*pr->pr_fasttimo)();
timeout(pffasttimo, (caddr_t)0, hz/5);
timeout((timeout_t)pffasttimo, (caddr_t)0, hz/5);
}

4
sys/net/if.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)if.c 7.14 (Berkeley) 4/20/91
* $Id: if.c,v 1.11 1994/02/10 17:25:04 mycroft Exp $
* $Id: if.c,v 1.12 1994/04/29 23:16:33 cgd Exp $
*/
#include <sys/param.h>
@ -385,7 +385,7 @@ if_slowtimo(caddr_t arg)
(*ifp->if_watchdog)(ifp->if_unit);
}
splx(s);
timeout(if_slowtimo, (caddr_t)0, hz / IFNET_SLOWHZ);
timeout((timeout_t)if_slowtimo, (caddr_t)0, hz / IFNET_SLOWHZ);
}
/*

5
sys/netinet/if_arp.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)if_ether.c 7.13 (Berkeley) 10/31/90
* $Id: if_arp.c,v 1.10 1994/04/18 23:25:57 mycroft Exp $
* $Id: if_arp.c,v 1.11 1994/04/29 23:16:41 cgd Exp $
*/
/*
@ -109,7 +109,8 @@ extern struct ifnet loif;
*/
/* ARGSUSED */
void
arptimer(caddr_t arg)
arptimer(arg)
void *arg;
{
register struct arptab *at;
register i;

5
sys/netinet/if_ether.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)if_ether.c 7.13 (Berkeley) 10/31/90
* $Id: if_ether.c,v 1.10 1994/04/18 23:25:57 mycroft Exp $
* $Id: if_ether.c,v 1.11 1994/04/29 23:16:41 cgd Exp $
*/
/*
@ -109,7 +109,8 @@ extern struct ifnet loif;
*/
/* ARGSUSED */
void
arptimer(caddr_t arg)
arptimer(arg)
void *arg;
{
register struct arptab *at;
register i;

2
sys/sys/callout.h
View File

@ -1 +1 @@
revision 1.4 intentionally removed
revision 1.5 intentionally removed

2
sys/sys/systm.h
View File

@ -1 +1 @@
revision 1.25 intentionally removed
revision 1.26 intentionally removed