summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/eisa/aha1742.c18
-rw-r--r--sys/dev/eisa/uha_eisa.c12
-rw-r--r--sys/dev/ic/adv.c10
-rw-r--r--sys/dev/ic/adw.c9
-rw-r--r--sys/dev/ic/bha.c18
-rw-r--r--sys/dev/ic/uha.c9
6 files changed, 19 insertions, 57 deletions
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 940c17c3110..9bff0f9178f 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha1742.c,v 1.32 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: aha1742.c,v 1.33 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/*
@@ -69,10 +69,6 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
-#ifndef DDB
-#define Debugger() panic("should call debugger here (aha1742.c)")
-#endif /* ! DDB */
-
typedef u_long physaddr;
typedef u_long physlen;
@@ -351,10 +347,8 @@ ahb_send_mbox(sc, opcode, ecb)
break;
delay(10);
}
- if (!wait) {
- printf("%s: board not responding\n", sc->sc_dev.dv_xname);
- Debugger();
- }
+ if (!wait)
+ panic("%s: board not responding\n", sc->sc_dev.dv_xname);
/* don't know this will work */
bus_space_write_4(iot, ioh, MBOXOUT0, KVTOPHYS(ecb));
@@ -411,10 +405,8 @@ ahb_send_immed(sc, target, cmd)
break;
delay(10);
}
- if (!wait) {
- printf("%s: board not responding\n", sc->sc_dev.dv_xname);
- Debugger();
- }
+ if (!wait)
+ panic("%s: board not responding\n", sc->sc_dev.dv_xname);
/* don't know this will work */
bus_space_write_4(iot, ioh, MBOXOUT0, cmd);
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 6724bb6fe87..eea7ba32fd6 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_eisa.c,v 1.9 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: uha_eisa.c,v 1.10 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@@ -53,10 +53,6 @@
#define UHA_EISA_SLOT_OFFSET 0xc80
#define UHA_EISA_IOSIZE 0x020
-#ifndef DDB
-#define Debugger() panic("should call debugger here (uha_eisa.c)")
-#endif
-
int uha_eisa_match(struct device *, void *, void *);
void uha_eisa_attach(struct device *, struct device *, void *);
@@ -233,11 +229,9 @@ u24_start_mbox(sc, mscp)
break;
delay(100);
}
- if (!spincount) {
- printf("%s: uha_start_mbox, board not responding\n",
+ if (!spincount)
+ panic("%s: uha_start_mbox, board not responding\n",
sc->sc_dev.dv_xname);
- Debugger();
- }
bus_space_write_4(iot, ioh, U24_OGMPTR, KVTOPHYS(mscp));
if (mscp->flags & MSCP_ABORT)
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index c8659877da8..394d75e4191 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.24 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: adv.c,v 1.25 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -52,11 +52,6 @@
#include <dev/ic/adv.h>
#include <dev/ic/advlib.h>
-#ifndef DDB
-#define Debugger() panic("should call debugger here (adv.c)")
-#endif /* ! DDB */
-
-
/* #define ASC_DEBUG */
/******************************************************************************/
@@ -866,8 +861,7 @@ adv_narrow_isr_callback(sc, qdonep)
bus_dmamap_unload(dmat, ccb->dmamap_xfer);
}
if ((ccb->flags & CCB_ALLOC) == 0) {
- printf("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
- Debugger();
+ panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
return;
}
/*
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 14a429db7b8..f90c3ac6aba 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.38 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: adw.c,v 1.39 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -54,10 +54,6 @@
#include <dev/microcode/adw/adwmcode.h>
#include <dev/ic/adw.h>
-#ifndef DDB
-#define Debugger() panic("should call debugger here (adw.c)")
-#endif /* ! DDB */
-
/******************************************************************************/
@@ -1058,9 +1054,8 @@ adw_isr_callback(sc, scsiq)
TAILQ_REMOVE(&sc->sc_pending_ccb, ccb, chain);
if ((ccb->flags & CCB_ALLOC) == 0) {
- printf("%s: unallocated ccb found on pending list!\n",
+ panic("%s: unallocated ccb found on pending list!\n",
sc->sc_dev.dv_xname);
- Debugger();
adw_free_ccb(sc, ccb);
return;
}
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index 64f2428ca18..c90acf743e5 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bha.c,v 1.17 2009/02/16 21:19:06 miod Exp $ */
+/* $OpenBSD: bha.c,v 1.18 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */
#undef BHADEBUG
@@ -74,10 +74,6 @@
#include <dev/ic/bhareg.h>
#include <dev/ic/bhavar.h>
-#ifndef DDB
-#define Debugger() panic("should call debugger here (bha.c)")
-#endif /* ! DDB */
-
#define BHA_MAXXFER ((BHA_NSEG - 1) << PGSHIFT)
#define ISWIDE(sc) ((sc)->sc_iswide)
@@ -754,16 +750,14 @@ bha_done(sc, ccb)
*/
#ifdef BHADIAG
if (ccb->flags & CCB_SENDING) {
- printf("%s: exiting ccb still in transit!\n",
+ panic("%s: exiting ccb still in transit!\n",
sc->sc_dev.dv_xname);
- Debugger();
return;
}
#endif
if ((ccb->flags & CCB_ALLOC) == 0) {
- printf("%s: exiting ccb not allocated!\n",
+ panic("%s: exiting ccb not allocated!\n",
sc->sc_dev.dv_xname);
- Debugger();
return;
}
if (xs->error == XS_NOERROR) {
@@ -1468,10 +1462,8 @@ bha_timeout(arg)
* If the ccb's mbx is not free, then the board has gone Far East?
*/
bha_collect_mbo(sc);
- if (ccb->flags & CCB_SENDING) {
- printf("%s: not taking commands!\n", sc->sc_dev.dv_xname);
- Debugger();
- }
+ if (ccb->flags & CCB_SENDING)
+ panic("%s: not taking commands!\n", sc->sc_dev.dv_xname);
#endif
/*
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 1cbad497019..dc966d7de58 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.12 2009/02/16 21:19:07 miod Exp $ */
+/* $OpenBSD: uha.c,v 1.13 2009/08/29 13:58:51 jasper Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -80,10 +80,6 @@
#include <dev/ic/uhareg.h>
#include <dev/ic/uhavar.h>
-#ifndef DDB
-#define Debugger() panic("should call debugger here (ultra14f.c)")
-#endif /* ! DDB */
-
#define KVTOPHYS(x) vtophys((vaddr_t)x)
integrate void uha_reset_mscp(struct uha_softc *, struct uha_mscp *);
@@ -299,8 +295,7 @@ uha_done(sc, mscp)
* into the xfer and call whoever started it
*/
if ((mscp->flags & MSCP_ALLOC) == 0) {
- printf("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
- Debugger();
+ panic("%s: exiting ccb not allocated!\n", sc->sc_dev.dv_xname);
return;
}
if (xs->error == XS_NOERROR) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 03:04:53 +0000