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

Replace DEBUG with NCR5380_DEBUG and do not define it by default.

Browse Source
This commit is contained in:
gwr 1996-03-01 01:42:04 +00:00
parent 6ea95846cb
commit 950eda2d54
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/ic/ncr5380sbc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr5380sbc.c,v 1.6 1996/02/28 01:44:17 gwr Exp $ */
/* $NetBSD: ncr5380sbc.c,v 1.7 1996/03/01 01:42:04 gwr Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@ -81,10 +81,6 @@
#include <scsi/scsi_message.h>
#include <scsi/scsiconf.h>
#ifndef DEBUG
#define DEBUG XXX
#endif
#include <dev/ic/ncr5380reg.h>
#include <dev/ic/ncr5380var.h>
@ -121,7 +117,7 @@ static void ncr5380_machine __P((struct ncr5380_softc *));
#define Debugger() printf("Debug: ncr5380.c:%d\n", __LINE__)
#endif
#ifdef DEBUG
#ifdef NCR5380_DEBUG
#define NCR_DBG_BREAK 1
#define NCR_DBG_CMDS 2
@ -130,11 +126,14 @@ int ncr5380_debug = 0;
do { if (ncr5380_debug & NCR_DBG_BREAK) Debugger(); } while (0)
static void ncr5380_show_scsi_cmd __P((struct scsi_xfer *));
static void ncr5380_show_sense __P((struct scsi_xfer *));
#else /* DEBUG */
#else /* NCR5380_DEBUG */
#define NCR_BREAK() /* nada */
#define ncr5380_show_scsi_cmd(xs) /* nada */
#define ncr5380_show_sense(xs) /* nada */
#endif /* DEBUG */
#endif /* NCR5380_DEBUG */
static char *
phase_names[8] = {
@ -330,7 +329,7 @@ ncr5380_init(sc)
{
int i, j;
#ifdef DEBUG
#ifdef NCR5380_DEBUG
ncr5380_debug_sc = sc;
#endif
@ -715,9 +714,11 @@ ncr5380_done(sc)
switch (sr->sr_status) {
case SCSI_OK: /* 0 */
if (sr->sr_flags & SR_SENSE) {
#ifdef NCR5380_DEBUG
if (ncr5380_debug & NCR_DBG_CMDS) {
ncr5380_show_sense(xs);
}
#endif
xs->error = XS_SENSE;
}
break;
@ -959,11 +960,13 @@ next_job:
* Normal commands start in MSG_OUT phase where we will
* send and IDENDIFY message, and then expect CMD phase.
*/
#ifdef NCR5380_DEBUG
if (ncr5380_debug & NCR_DBG_CMDS) {
printf("ncr5380_sched: begin, target=%d, LUN=%d\n",
xs->sc_link->target, xs->sc_link->lun);
ncr5380_show_scsi_cmd(xs);
}
#endif
if (xs->flags & SCSI_RESET) {
NCR_TRACE("sched: cmd=reset, sr=0x%x\n", (long)sr);
/* Not an error, so do not set NCR_ABORTING */
@ -1980,7 +1983,7 @@ ncr5380_command(sc)
}
if (len != xs->cmdlen) {
#ifdef DEBUG
#ifdef NCR5380_DEBUG
printf("ncr5380_command: short transfer: wanted %d got %d.\n",
xs->cmdlen, len);
ncr5380_show_scsi_cmd(xs);
@ -2355,7 +2358,7 @@ do_actions:
}
#ifdef DEBUG
#ifdef NCR5380_DEBUG
static void
ncr5380_show_scsi_cmd(xs)
@ -2524,4 +2527,4 @@ ncr5380_show_state()
}
#endif /* DDB */
#endif /* DEBUG */
#endif /* NCR5380_DEBUG */

8
sys/dev/ic/ncr5380var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr5380var.h,v 1.4 1996/01/01 22:24:38 thorpej Exp $ */
/* $NetBSD: ncr5380var.h,v 1.5 1996/03/01 01:42:07 gwr Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@ -169,10 +169,10 @@ int ncr5380_scsi_cmd __P((struct scsi_xfer *));
int ncr5380_pio_in __P((struct ncr5380_softc *, int, int, u_char *));
int ncr5380_pio_out __P((struct ncr5380_softc *, int, int, u_char *));
#ifdef DEBUG
#ifdef NCR5380_DEBUG
struct ncr5380_softc *ncr5380_debug_sc;
void ncr5380_trace __P((char *msg, long val));
#define NCR_TRACE(msg, val) ncr5380_trace(msg, val)
#else
#else /* NCR5380_DEBUG */
#define NCR_TRACE(msg, val) /* nada */
#endif
#endif /* NCR5380_DEBUG */