diff options
author | bde <bde@FreeBSD.org> | 1994-11-15 14:53:09 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1994-11-15 14:53:09 +0000 |
commit | b8a97a385af82880309cb842141717b82e31e1cc (patch) | |
tree | 90bef67067246408a8ae2eba9954699f0febe167 /sys | |
parent | e4106fb3adad2615c5dfb690cd31095ca74c783a (diff) | |
download | FreeBSD-src-b8a97a385af82880309cb842141717b82e31e1cc.zip FreeBSD-src-b8a97a385af82880309cb842141717b82e31e1cc.tar.gz |
Remove bogus declaration of Debugger(). Call Debugger() even if DDB is
not defined, but still call panic() after Debugger() returns, although
most other SCSI drivers just call Debugger().
Diffstat (limited to 'sys')
-rw-r--r-- | sys/i386/eisa/aha1742.c | 18 | ||||
-rw-r--r-- | sys/i386/isa/aha1742.c | 18 |
2 files changed, 16 insertions, 20 deletions
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index dff406b..8ae9b1de 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.23 1994/10/19 01:58:51 wollman Exp $ + * $Id: aha1742.c,v 1.24 1994/10/23 21:27:05 wollman Exp $ */ #include <sys/types.h> @@ -30,6 +30,8 @@ #include <sys/proc.h> #include <sys/user.h> #include <i386/isa/isa_device.h> +#else +#define NAHB 1 #endif /*KERNEL */ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> @@ -37,15 +39,9 @@ /* */ -#ifdef KERNEL -# ifdef DDB -int Debugger(); -# else /* DDB */ -#define Debugger(x) panic("should call debugger here (adaptec.c)") -# endif /* DDB */ -#else /* KERNEL */ -#define NAHB 1 -#endif /* kernel */ +#if defined(KERNEL) && !defined(DDB) +#define fatal_if_no_DDB() panic("panic for historical reasons") +#endif typedef unsigned long int physaddr; #include <sys/kernel.h> @@ -368,6 +364,7 @@ ahb_send_mbox(int unit, int opcode, int target, struct ecb *ecb) if (wait == 0) { printf("ahb%d: board not responding\n", unit); Debugger("aha1742"); + fatal_if_no_DDB(); } outl(port + MBOXOUT0, KVTOPHYS(ecb)); /* don't know this will work */ outb(port + ATTN, opcode | target); @@ -424,6 +421,7 @@ ahb_send_immed(int unit, int target, u_long cmd) } if (wait == 0) { printf("ahb%d: board not responding\n", unit); Debugger("aha1742"); + fatal_if_no_DDB(); } outl(port + MBOXOUT0, cmd); /* don't know this will work */ outb(port + G2CNTRL, G2CNTRL_SET_HOST_READY); diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index dff406b..8ae9b1de 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.23 1994/10/19 01:58:51 wollman Exp $ + * $Id: aha1742.c,v 1.24 1994/10/23 21:27:05 wollman Exp $ */ #include <sys/types.h> @@ -30,6 +30,8 @@ #include <sys/proc.h> #include <sys/user.h> #include <i386/isa/isa_device.h> +#else +#define NAHB 1 #endif /*KERNEL */ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> @@ -37,15 +39,9 @@ /* */ -#ifdef KERNEL -# ifdef DDB -int Debugger(); -# else /* DDB */ -#define Debugger(x) panic("should call debugger here (adaptec.c)") -# endif /* DDB */ -#else /* KERNEL */ -#define NAHB 1 -#endif /* kernel */ +#if defined(KERNEL) && !defined(DDB) +#define fatal_if_no_DDB() panic("panic for historical reasons") +#endif typedef unsigned long int physaddr; #include <sys/kernel.h> @@ -368,6 +364,7 @@ ahb_send_mbox(int unit, int opcode, int target, struct ecb *ecb) if (wait == 0) { printf("ahb%d: board not responding\n", unit); Debugger("aha1742"); + fatal_if_no_DDB(); } outl(port + MBOXOUT0, KVTOPHYS(ecb)); /* don't know this will work */ outb(port + ATTN, opcode | target); @@ -424,6 +421,7 @@ ahb_send_immed(int unit, int target, u_long cmd) } if (wait == 0) { printf("ahb%d: board not responding\n", unit); Debugger("aha1742"); + fatal_if_no_DDB(); } outl(port + MBOXOUT0, cmd); /* don't know this will work */ outb(port + G2CNTRL, G2CNTRL_SET_HOST_READY); |