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

- printf -> kprintf, sprintf -> ksprintf

Browse Source 
- ifdef an unused variable.
This commit is contained in:
christos 1996-10-10 21:21:52 +00:00
parent 3b23328ae6
commit 245e10b406
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
sys/dev/isa/wds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wds.c,v 1.10 1996/08/28 19:01:25 cgd Exp $ */
/* $NetBSD: wds.c,v 1.11 1996/10/10 21:21:52 christos Exp $ */
#undef WDSDIAG
#ifdef DDB
@ -311,14 +311,14 @@ wds_finish_scbs(sc)
if (wmbi->stat == WDS_MBI_FREE) {
for (i = 0; i < WDS_MBX_SIZE; i++) {
if (wmbi->stat != WDS_MBI_FREE) {
printf("%s: mbi not in round-robin order\n",
kprintf("%s: mbi not in round-robin order\n",
sc->sc_dev.dv_xname);
goto AGAIN;
}
wds_nextmbx(wmbi, wmbx, mbi);
}
#ifdef WDSDIAGnot
printf("%s: mbi interrupt with no full mailboxes\n",
kprintf("%s: mbi interrupt with no full mailboxes\n",
sc->sc_dev.dv_xname);
#endif
return;
@ -328,7 +328,7 @@ AGAIN:
do {
scb = wds_scb_phys_kv(sc, phystol(wmbi->scb_addr));
if (!scb) {
printf("%s: bad mbi scb pointer; skipping\n",
kprintf("%s: bad mbi scb pointer; skipping\n",
sc->sc_dev.dv_xname);
goto next;
}
@ -336,11 +336,11 @@ AGAIN:
#ifdef WDSDEBUG
if (wds_debug) {
u_char *cp = &scb->scsi_cmd;
printf("op=%x %x %x %x %x %x\n",
kprintf("op=%x %x %x %x %x %x\n",
cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
printf("stat %x for mbi addr = 0x%08x, ",
kprintf("stat %x for mbi addr = 0x%08x, ",
wmbi->stat, wmbi);
printf("scb addr = 0x%x\n", scb);
kprintf("scb addr = 0x%x\n", scb);
}
#endif /* WDSDEBUG */
@ -386,7 +386,7 @@ wdsintr(arg)
break;
default:
printf("%s: unrecognized interrupt type %02x",
kprintf("%s: unrecognized interrupt type %02x",
sc->sc_dev.dv_xname, c);
break;
}
@ -505,7 +505,7 @@ wds_get_scb(sc, flags, needbuffer)
scb = (struct wds_scb *) malloc(sizeof(struct wds_scb),
M_TEMP, M_NOWAIT);
if (!scb) {
printf("%s: can't malloc scb\n",
kprintf("%s: can't malloc scb\n",
sc->sc_dev.dv_xname);
goto out;
}
@ -600,7 +600,9 @@ wds_collect_mbo(sc)
struct wds_softc *sc;
{
struct wds_mbx_out *wmbo; /* Mail Box Out pointer */
#ifdef WDSDIAG
struct wds_scb *scb;
#endif
wmbo = wmbx->cmbo;
@ -706,11 +708,11 @@ wds_done(sc, scb, stat)
/* SCSI error recorded in scb, counts as WDS_MBI_OK */
switch (scb->cmd.venderr) {
case 0x00:
printf("%s: Is this an error?\n", sc->sc_dev.dv_xname);
kprintf("%s: Is this an error?\n", sc->sc_dev.dv_xname);
xs->error = XS_DRIVER_STUFFUP; /* Experiment */
break;
case 0x01:
/*printf("%s: OK, see SCSI error field.\n", sc->sc_dev.dv_xname);*/
/*kprintf("%s: OK, see SCSI error field.\n", sc->sc_dev.dv_xname);*/
if (scb->cmd.stat == SCSI_CHECK) {
/* Do sense. */
wds_sense (sc, scb);
@ -720,13 +722,13 @@ wds_done(sc, scb, stat)
}
break;
case 0x40:
/*printf("%s: DMA underrun!\n", sc->sc_dev.dv_xname);*/
/*kprintf("%s: DMA underrun!\n", sc->sc_dev.dv_xname);*/
/* Hits this if the target returns fewer that datalen bytes (eg my CD-ROM,
which returns a short version string, or if DMA is turned off etc. */
xs->resid = 0;
break;
default:
printf("%s: VENDOR ERROR %02x, scsi %02x\n", sc->sc_dev.dv_xname, scb->cmd.venderr, scb->cmd.stat);
kprintf("%s: VENDOR ERROR %02x, scsi %02x\n", sc->sc_dev.dv_xname, scb->cmd.venderr, scb->cmd.stat);
xs->error = XS_DRIVER_STUFFUP; /* Experiment */
break;
}
@ -798,21 +800,21 @@ ready:
wds_wait(iobase + WDS_STAT, WDSS_RDY, WDSS_RDY);
if (inb(iobase + WDS_IRQSTAT) != 1)
if (inb(iobase + WDS_IRQSTAT) != 7)
printf("%s: failed reset!!! %2x\n", sc->sc_dev.dv_xname, inb(iobase + WDS_IRQSTAT));
kprintf("%s: failed reset!!! %2x\n", sc->sc_dev.dv_xname, inb(iobase + WDS_IRQSTAT));
if ((inb(iobase + WDS_STAT) & (WDSS_RDY)) != WDSS_RDY) {
printf("%s: waiting for controller to become ready.", sc->sc_dev.dv_xname);
kprintf("%s: waiting for controller to become ready.", sc->sc_dev.dv_xname);
for (i = 0; i < 20; i++) {
if ((inb(iobase + WDS_STAT) & (WDSS_RDY)) == WDSS_RDY)
break;
printf(".");
kprintf(".");
delay(10000);
}
if ((inb(iobase + WDS_STAT) & (WDSS_RDY)) != WDSS_RDY) {
printf(" failed\n");
kprintf(" failed\n");
return 1;
}
printf("\n");
kprintf("\n");
}
if (sc != NULL) {
@ -892,7 +894,7 @@ wds_inquire_setup_information(sc)
iobase = sc->sc_iobase;
if ((scb = wds_get_scb(sc, SCSI_NOSLEEP, 0)) == NULL) {
printf("%s: no request slot available in getvers()!\n", sc->sc_dev.dv_xname);
kprintf("%s: no request slot available in getvers()!\n", sc->sc_dev.dv_xname);
return;
}
scb->xs = NULL;
@ -914,17 +916,17 @@ wds_inquire_setup_information(sc)
goto out;
/* Print the version number. */
printf(": version %x.%02x ", scb->cmd.targ, scb->cmd.scb.opcode);
kprintf(": version %x.%02x ", scb->cmd.targ, scb->cmd.scb.opcode);
sc->sc_revision = (scb->cmd.targ << 8) | scb->cmd.scb.opcode;
/* Print out the version string. */
j = 2 + &(scb->cmd.targ);
while ((*j >= 32) && (*j < 128)) {
printf("%c", *j);
kprintf("%c", *j);
j++;
}
out:
printf("\n");
kprintf("\n");
wds_free_scb(sc, scb);
}
@ -963,7 +965,7 @@ wds_scsi_cmd(xs)
if (xs->flags & SCSI_RESET) {
/* XXX Fix me! */
printf("%s: reset!\n", sc->sc_dev.dv_xname);
kprintf("%s: reset!\n", sc->sc_dev.dv_xname);
wds_init(sc);
return COMPLETE;
}
@ -980,7 +982,7 @@ wds_scsi_cmd(xs)
/* XXX Fix me! */
/* Let's not worry about UIO. There isn't any code for the *
* non-SG boards anyway! */
printf("%s: UIO is untested and disabled!\n", sc->sc_dev.dv_xname);
kprintf("%s: UIO is untested and disabled!\n", sc->sc_dev.dv_xname);
goto bad;
}
@ -1046,7 +1048,7 @@ wds_scsi_cmd(xs)
*/
/* check it fits on the ISA bus */
if (thisphys > 0xFFFFFF) {
printf("%s: DMA beyond"
kprintf("%s: DMA beyond"
" end of ISA\n",
sc->sc_dev.dv_xname);
goto bad;
@ -1081,7 +1083,7 @@ wds_scsi_cmd(xs)
/*
* there's still data, must have run out of segs!
*/
printf("%s: wds_scsi_cmd, more than %d dma segs\n",
kprintf("%s: wds_scsi_cmd, more than %d dma segs\n",
sc->sc_dev.dv_xname, WDS_NSEG);
goto bad;
}
@ -1091,7 +1093,7 @@ wds_scsi_cmd(xs)
} else if (xs->datalen > 0) {
/* The board is an ASC or ASE. Do not use scatter/gather. */
if (xs->datalen > BUFLEN) {
printf("%s: wds_scsi_cmd, I/O too large for bounce buffer\n",
kprintf("%s: wds_scsi_cmd, I/O too large for bounce buffer\n",
sc->sc_dev.dv_xname);
goto bad;
}
@ -1257,7 +1259,7 @@ wds_timeout(arg)
int s;
sc_print_addr(sc_link);
printf("timed out");
kprintf("timed out");
s = splbio();
@ -1267,7 +1269,7 @@ wds_timeout(arg)
*/
wds_collect_mbo(sc);
if (scb->flags & SCB_SENDING) {
printf("%s: not taking commands!\n", sc->sc_dev.dv_xname);
kprintf("%s: not taking commands!\n", sc->sc_dev.dv_xname);
Debugger();
}
#endif
@ -1279,11 +1281,11 @@ wds_timeout(arg)
*/
if (scb->flags & SCB_ABORT) {
/* abort timed out */
printf(" AGAIN\n");
kprintf(" AGAIN\n");
/* XXX Must reset! */
} else {
/* abort the operation that has timed out */
printf("\n");
kprintf("\n");
scb->xs->error = XS_TIMEOUT;
scb->timeout = WDS_ABORT_TIMEOUT;
scb->flags |= SCB_ABORT;