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

Don't print line numbers in most of the diagnostics.

Browse Source
This commit is contained in:
mycroft 1995-01-07 06:49:35 +00:00
parent 81b3059a98
commit 37e16c5747
3 changed files with 108 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.24 1995/01/07 01:51:07 mycroft Exp $ */ /* $NetBSD: aic6360.c,v 1.25 1995/01/07 06:49:35 mycroft Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -567,7 +567,7 @@ struct aic_softc {
int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/
#define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0) #define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0)
#define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0) #define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0)
#define AIC_ASSERT(x) do {if (x) {} else {printf("aic at line %d: assertion failed\n", __LINE__); Debugger();}} while (0) #define AIC_ASSERT(x) do {if (x) {} else {printf("%s at line %d: assertion failed\n", sc->sc_dev.dv_xname, __LINE__); Debugger();}} while (0)
#else #else
#define AIC_PRINT(b, s) #define AIC_PRINT(b, s)
#define AIC_BREAK() #define AIC_BREAK()
@ -1469,14 +1469,16 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE EXTENDED; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reject; goto reject;
} }
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reject: reject:
aic_sched_msgout(SEND_REJECT); aic_sched_msgout(SEND_REJECT);
@ -1486,7 +1488,8 @@ nextbyte:
case AIC_RESELECTED: case AIC_RESELECTED:
if (!MSG_ISIDENTIFY(sc->sc_imess[0])) { if (!MSG_ISIDENTIFY(sc->sc_imess[0])) {
printf("aic at line %d: reselect without IDENTIFY; sending DEVICE RESET\n", __LINE__); printf("%s: reselect without IDENTIFY; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1498,7 +1501,8 @@ nextbyte:
*/ */
selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID); selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID);
if (selid & (selid - 1)) { if (selid & (selid - 1)) {
printf("aic at line %d: reselect with invalid selid %02x; sending DEVICE RESET\n", __LINE__, selid); printf("%s: reselect with invalid selid %02x; sending DEVICE RESET\n",
sc->sc_dev.dv_xname, selid);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1517,7 +1521,8 @@ nextbyte:
break; break;
} }
if (acb == NULL) { if (acb == NULL) {
printf("aic at line %d: reselect from target %d lun %d with no nexus; sending ABORT\n", __LINE__, target, lun); printf("%s: reselect from target %d lun %d with no nexus; sending ABORT\n",
sc->sc_dev.dv_xname, target, lun);
AIC_BREAK(); AIC_BREAK();
goto abort; goto abort;
} }
@ -1538,7 +1543,8 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unexpected MESSAGE IN; sending DEVICE RESET\n", __LINE__); printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
sc->sc_flags |= AIC_ABORTING; sc->sc_flags |= AIC_ABORTING;
@ -1637,7 +1643,8 @@ nextmsg:
switch (sc->sc_msgout) { switch (sc->sc_msgout) {
case SEND_IDENTIFY: case SEND_IDENTIFY:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_IDENTIFY while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_IDENTIFY while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1650,7 +1657,8 @@ nextmsg:
case SEND_SDTR: case SEND_SDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_SDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_SDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1666,7 +1674,8 @@ nextmsg:
case SEND_WDTR: case SEND_WDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_WDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_WDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1705,7 +1714,8 @@ nextmsg:
break; break;
case 0: case 0:
printf("aic at line %d: unexpected MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: unexpected MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
noop: noop:
sc->sc_omess[0] = MSG_NOOP; sc->sc_omess[0] = MSG_NOOP;
@ -1713,7 +1723,8 @@ nextmsg:
break; break;
default: default:
printf("aic at line %d: weird MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: weird MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -2068,8 +2079,8 @@ aicintr(sc)
/* /*
* We don't currently support target mode. * We don't currently support target mode.
*/ */
printf("aic at line %d: target mode selected; going to bus free\n", printf("%s: target mode selected; going to bus free\n",
__LINE__); sc->sc_dev.dv_xname);
outb(SCSISIG, 0); outb(SCSISIG, 0);
sc->sc_state = AIC_IDLE; sc->sc_state = AIC_IDLE;
@ -2100,7 +2111,8 @@ aicintr(sc)
* c) Mark device as busy. * c) Mark device as busy.
*/ */
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection out while not selecting; resetting\n", __LINE__); printf("%s: selection out while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2136,7 +2148,8 @@ aicintr(sc)
AIC_MISC(("selection timeout ")); AIC_MISC(("selection timeout "));
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection timeout while not selecting; resetting\n", __LINE__); printf("%s: selection timeout while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2154,7 +2167,8 @@ aicintr(sc)
goto out; goto out;
} else { } else {
if (sc->sc_state != AIC_IDLE) { if (sc->sc_state != AIC_IDLE) {
printf("aic at line %d: BUS FREE while not idle; state=%d\n", __LINE__, sc->sc_state); printf("%s: BUS FREE while not idle; state=%d\n",
sc->sc_dev.dv_xname, sc->sc_state);
AIC_BREAK(); AIC_BREAK();
goto out; goto out;
} }
@ -2193,7 +2207,8 @@ aicintr(sc)
case AIC_CONNECTED: case AIC_CONNECTED:
if ((sc->sc_flags & AIC_ABORTING) == 0) { if ((sc->sc_flags & AIC_ABORTING) == 0) {
printf("aic at line %d: unexpected BUS FREE; aborting\n", __LINE__); printf("%s: unexpected BUS FREE; aborting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
} }
AIC_ASSERT(sc->sc_nexus != NULL); AIC_ASSERT(sc->sc_nexus != NULL);
@ -2296,7 +2311,8 @@ dophase:
goto nextphase; goto nextphase;
} }
printf("aic at line %d: unexpected bus phase; resetting\n", __LINE__); printf("%s: unexpected bus phase; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
aic_init(sc); aic_init(sc);

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

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.24 1995/01/07 01:51:07 mycroft Exp $ */ /* $NetBSD: aic6360.c,v 1.25 1995/01/07 06:49:35 mycroft Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -567,7 +567,7 @@ struct aic_softc {
int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/
#define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0) #define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0)
#define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0) #define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0)
#define AIC_ASSERT(x) do {if (x) {} else {printf("aic at line %d: assertion failed\n", __LINE__); Debugger();}} while (0) #define AIC_ASSERT(x) do {if (x) {} else {printf("%s at line %d: assertion failed\n", sc->sc_dev.dv_xname, __LINE__); Debugger();}} while (0)
#else #else
#define AIC_PRINT(b, s) #define AIC_PRINT(b, s)
#define AIC_BREAK() #define AIC_BREAK()
@ -1469,14 +1469,16 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE EXTENDED; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reject; goto reject;
} }
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reject: reject:
aic_sched_msgout(SEND_REJECT); aic_sched_msgout(SEND_REJECT);
@ -1486,7 +1488,8 @@ nextbyte:
case AIC_RESELECTED: case AIC_RESELECTED:
if (!MSG_ISIDENTIFY(sc->sc_imess[0])) { if (!MSG_ISIDENTIFY(sc->sc_imess[0])) {
printf("aic at line %d: reselect without IDENTIFY; sending DEVICE RESET\n", __LINE__); printf("%s: reselect without IDENTIFY; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1498,7 +1501,8 @@ nextbyte:
*/ */
selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID); selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID);
if (selid & (selid - 1)) { if (selid & (selid - 1)) {
printf("aic at line %d: reselect with invalid selid %02x; sending DEVICE RESET\n", __LINE__, selid); printf("%s: reselect with invalid selid %02x; sending DEVICE RESET\n",
sc->sc_dev.dv_xname, selid);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1517,7 +1521,8 @@ nextbyte:
break; break;
} }
if (acb == NULL) { if (acb == NULL) {
printf("aic at line %d: reselect from target %d lun %d with no nexus; sending ABORT\n", __LINE__, target, lun); printf("%s: reselect from target %d lun %d with no nexus; sending ABORT\n",
sc->sc_dev.dv_xname, target, lun);
AIC_BREAK(); AIC_BREAK();
goto abort; goto abort;
} }
@ -1538,7 +1543,8 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unexpected MESSAGE IN; sending DEVICE RESET\n", __LINE__); printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
sc->sc_flags |= AIC_ABORTING; sc->sc_flags |= AIC_ABORTING;
@ -1637,7 +1643,8 @@ nextmsg:
switch (sc->sc_msgout) { switch (sc->sc_msgout) {
case SEND_IDENTIFY: case SEND_IDENTIFY:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_IDENTIFY while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_IDENTIFY while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1650,7 +1657,8 @@ nextmsg:
case SEND_SDTR: case SEND_SDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_SDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_SDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1666,7 +1674,8 @@ nextmsg:
case SEND_WDTR: case SEND_WDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_WDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_WDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1705,7 +1714,8 @@ nextmsg:
break; break;
case 0: case 0:
printf("aic at line %d: unexpected MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: unexpected MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
noop: noop:
sc->sc_omess[0] = MSG_NOOP; sc->sc_omess[0] = MSG_NOOP;
@ -1713,7 +1723,8 @@ nextmsg:
break; break;
default: default:
printf("aic at line %d: weird MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: weird MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -2068,8 +2079,8 @@ aicintr(sc)
/* /*
* We don't currently support target mode. * We don't currently support target mode.
*/ */
printf("aic at line %d: target mode selected; going to bus free\n", printf("%s: target mode selected; going to bus free\n",
__LINE__); sc->sc_dev.dv_xname);
outb(SCSISIG, 0); outb(SCSISIG, 0);
sc->sc_state = AIC_IDLE; sc->sc_state = AIC_IDLE;
@ -2100,7 +2111,8 @@ aicintr(sc)
* c) Mark device as busy. * c) Mark device as busy.
*/ */
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection out while not selecting; resetting\n", __LINE__); printf("%s: selection out while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2136,7 +2148,8 @@ aicintr(sc)
AIC_MISC(("selection timeout ")); AIC_MISC(("selection timeout "));
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection timeout while not selecting; resetting\n", __LINE__); printf("%s: selection timeout while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2154,7 +2167,8 @@ aicintr(sc)
goto out; goto out;
} else { } else {
if (sc->sc_state != AIC_IDLE) { if (sc->sc_state != AIC_IDLE) {
printf("aic at line %d: BUS FREE while not idle; state=%d\n", __LINE__, sc->sc_state); printf("%s: BUS FREE while not idle; state=%d\n",
sc->sc_dev.dv_xname, sc->sc_state);
AIC_BREAK(); AIC_BREAK();
goto out; goto out;
} }
@ -2193,7 +2207,8 @@ aicintr(sc)
case AIC_CONNECTED: case AIC_CONNECTED:
if ((sc->sc_flags & AIC_ABORTING) == 0) { if ((sc->sc_flags & AIC_ABORTING) == 0) {
printf("aic at line %d: unexpected BUS FREE; aborting\n", __LINE__); printf("%s: unexpected BUS FREE; aborting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
} }
AIC_ASSERT(sc->sc_nexus != NULL); AIC_ASSERT(sc->sc_nexus != NULL);
@ -2296,7 +2311,8 @@ dophase:
goto nextphase; goto nextphase;
} }
printf("aic at line %d: unexpected bus phase; resetting\n", __LINE__); printf("%s: unexpected bus phase; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
aic_init(sc); aic_init(sc);

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

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.24 1995/01/07 01:51:07 mycroft Exp $ */ /* $NetBSD: aic6360.c,v 1.25 1995/01/07 06:49:35 mycroft Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -567,7 +567,7 @@ struct aic_softc {
int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; /**/
#define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0) #define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;} while (0)
#define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0) #define AIC_BREAK() do {if ((aic_debug & AIC_DOBREAK) != 0) Debugger();} while (0)
#define AIC_ASSERT(x) do {if (x) {} else {printf("aic at line %d: assertion failed\n", __LINE__); Debugger();}} while (0) #define AIC_ASSERT(x) do {if (x) {} else {printf("%s at line %d: assertion failed\n", sc->sc_dev.dv_xname, __LINE__); Debugger();}} while (0)
#else #else
#define AIC_PRINT(b, s) #define AIC_PRINT(b, s)
#define AIC_BREAK() #define AIC_BREAK()
@ -1469,14 +1469,16 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE EXTENDED; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reject; goto reject;
} }
break; break;
default: default:
printf("aic at line %d: unrecognized MESSAGE IN; sending REJECT\n", __LINE__); printf("%s: unrecognized MESSAGE; sending REJECT\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reject: reject:
aic_sched_msgout(SEND_REJECT); aic_sched_msgout(SEND_REJECT);
@ -1486,7 +1488,8 @@ nextbyte:
case AIC_RESELECTED: case AIC_RESELECTED:
if (!MSG_ISIDENTIFY(sc->sc_imess[0])) { if (!MSG_ISIDENTIFY(sc->sc_imess[0])) {
printf("aic at line %d: reselect without IDENTIFY; sending DEVICE RESET\n", __LINE__); printf("%s: reselect without IDENTIFY; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1498,7 +1501,8 @@ nextbyte:
*/ */
selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID); selid = inb(SELID) & ~(1<<AIC_SCSI_HOSTID);
if (selid & (selid - 1)) { if (selid & (selid - 1)) {
printf("aic at line %d: reselect with invalid selid %02x; sending DEVICE RESET\n", __LINE__, selid); printf("%s: reselect with invalid selid %02x; sending DEVICE RESET\n",
sc->sc_dev.dv_xname, selid);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -1517,7 +1521,8 @@ nextbyte:
break; break;
} }
if (acb == NULL) { if (acb == NULL) {
printf("aic at line %d: reselect from target %d lun %d with no nexus; sending ABORT\n", __LINE__, target, lun); printf("%s: reselect from target %d lun %d with no nexus; sending ABORT\n",
sc->sc_dev.dv_xname, target, lun);
AIC_BREAK(); AIC_BREAK();
goto abort; goto abort;
} }
@ -1538,7 +1543,8 @@ nextbyte:
break; break;
default: default:
printf("aic at line %d: unexpected MESSAGE IN; sending DEVICE RESET\n", __LINE__); printf("%s: unexpected MESSAGE IN; sending DEVICE RESET\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
sc->sc_flags |= AIC_ABORTING; sc->sc_flags |= AIC_ABORTING;
@ -1637,7 +1643,8 @@ nextmsg:
switch (sc->sc_msgout) { switch (sc->sc_msgout) {
case SEND_IDENTIFY: case SEND_IDENTIFY:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_IDENTIFY while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_IDENTIFY while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1650,7 +1657,8 @@ nextmsg:
case SEND_SDTR: case SEND_SDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_SDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_SDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1666,7 +1674,8 @@ nextmsg:
case SEND_WDTR: case SEND_WDTR:
if (sc->sc_state != AIC_CONNECTED) { if (sc->sc_state != AIC_CONNECTED) {
printf("aic at line %d: SEND_WDTR while not connected; sending NOOP\n", __LINE__); printf("%s: SEND_WDTR while not connected; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -1705,7 +1714,8 @@ nextmsg:
break; break;
case 0: case 0:
printf("aic at line %d: unexpected MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: unexpected MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
noop: noop:
sc->sc_omess[0] = MSG_NOOP; sc->sc_omess[0] = MSG_NOOP;
@ -1713,7 +1723,8 @@ nextmsg:
break; break;
default: default:
printf("aic at line %d: weird MESSAGE OUT; sending NOOP\n", __LINE__); printf("%s: weird MESSAGE OUT; sending NOOP\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto noop; goto noop;
} }
@ -2068,8 +2079,8 @@ aicintr(sc)
/* /*
* We don't currently support target mode. * We don't currently support target mode.
*/ */
printf("aic at line %d: target mode selected; going to bus free\n", printf("%s: target mode selected; going to bus free\n",
__LINE__); sc->sc_dev.dv_xname);
outb(SCSISIG, 0); outb(SCSISIG, 0);
sc->sc_state = AIC_IDLE; sc->sc_state = AIC_IDLE;
@ -2100,7 +2111,8 @@ aicintr(sc)
* c) Mark device as busy. * c) Mark device as busy.
*/ */
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection out while not selecting; resetting\n", __LINE__); printf("%s: selection out while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2136,7 +2148,8 @@ aicintr(sc)
AIC_MISC(("selection timeout ")); AIC_MISC(("selection timeout "));
if (sc->sc_state != AIC_SELECTING) { if (sc->sc_state != AIC_SELECTING) {
printf("aic at line %d: selection timeout while not selecting; resetting\n", __LINE__); printf("%s: selection timeout while not selecting; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
goto reset; goto reset;
} }
@ -2154,7 +2167,8 @@ aicintr(sc)
goto out; goto out;
} else { } else {
if (sc->sc_state != AIC_IDLE) { if (sc->sc_state != AIC_IDLE) {
printf("aic at line %d: BUS FREE while not idle; state=%d\n", __LINE__, sc->sc_state); printf("%s: BUS FREE while not idle; state=%d\n",
sc->sc_dev.dv_xname, sc->sc_state);
AIC_BREAK(); AIC_BREAK();
goto out; goto out;
} }
@ -2193,7 +2207,8 @@ aicintr(sc)
case AIC_CONNECTED: case AIC_CONNECTED:
if ((sc->sc_flags & AIC_ABORTING) == 0) { if ((sc->sc_flags & AIC_ABORTING) == 0) {
printf("aic at line %d: unexpected BUS FREE; aborting\n", __LINE__); printf("%s: unexpected BUS FREE; aborting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
} }
AIC_ASSERT(sc->sc_nexus != NULL); AIC_ASSERT(sc->sc_nexus != NULL);
@ -2296,7 +2311,8 @@ dophase:
goto nextphase; goto nextphase;
} }
printf("aic at line %d: unexpected bus phase; resetting\n", __LINE__); printf("%s: unexpected bus phase; resetting\n",
sc->sc_dev.dv_xname);
AIC_BREAK(); AIC_BREAK();
reset: reset:
aic_init(sc); aic_init(sc);