d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bogus declaration of Debugger(). Call Debugger() even if DDB is

Browse Source 
not defined, but still call panic() after Debugger() returns, although
most other SCSI drivers just call Debugger().
This commit is contained in:
Bruce Evans 1994-11-15 14:53:09 +00:00
parent baffceaddc
commit b1234dc0cd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=4512
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/i386/eisa/aha1742.c
View File

@ -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);

18
sys/i386/isa/aha1742.c
View File

@ -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);