summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2008-07-02 03:00:56 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2008-07-02 03:00:56 +0000
commit65b37a21a126fd55ab9c0560b90ab73b095f6e87 (patch)
tree9b207d148c7ad2fb96ed0e75587720d9473bae19
parent95c321782f046a5549c55dd40a54945e209e57a0 (diff)
unify using WDCDEBUG.
-rw-r--r--sys/dev/ic/wdc.c10
-rw-r--r--sys/dev/ic/wdcevent.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 71e1c1339f2..416d121bbbf 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.99 2008/06/30 00:13:30 fgsch Exp $ */
+/* $OpenBSD: wdc.c,v 1.100 2008/07/02 03:00:55 fgsch Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -137,7 +137,7 @@ struct channel_softc_vtbl wdc_default_vtbl = {
wdc_default_write_raw_multi_4
};
-#ifdef WDC_DEBUG
+#ifdef WDCDEBUG
static char *wdc_log_buf = NULL;
static unsigned int wdc_tail = 0;
static unsigned int wdc_head = 0;
@@ -285,7 +285,7 @@ wdc_get_log(unsigned int * size, unsigned int *left)
splx(s);
return (retbuf);
}
-#endif /* WDC_DEBUG */
+#endif /* WDCDEBUG */
u_int8_t
wdc_default_read_reg(chp, reg)
@@ -2290,7 +2290,7 @@ wdc_ioctl(drvp, xfer, addr, flag, p)
int error = 0;
switch (xfer) {
-#ifdef WDC_DEBUG
+#ifdef WDCDEBUG
case ATAIOGETTRACE: {
atagettrace_t *agt = (atagettrace_t *)addr;
unsigned int size = 0;
@@ -2311,7 +2311,7 @@ wdc_ioctl(drvp, xfer, addr, flag, p)
agt->bytes_copied = size;
break;
}
-#endif
+#endif /* WDCDEBUG */
case ATAIOCCOMMAND:
/*
diff --git a/sys/dev/ic/wdcevent.h b/sys/dev/ic/wdcevent.h
index 5988a8b0f18..90380c19f52 100644
--- a/sys/dev/ic/wdcevent.h
+++ b/sys/dev/ic/wdcevent.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdcevent.h,v 1.5 2008/06/30 00:13:30 fgsch Exp $ */
+/* $OpenBSD: wdcevent.h,v 1.6 2008/07/02 03:00:55 fgsch Exp $ */
/*
* Copyright (c) 2001 Constantine Sapuntzakis
*
@@ -43,7 +43,7 @@ enum wdcevent_type {
#ifdef _KERNEL
-#ifdef WDC_DEBUG
+#ifdef WDCDEBUG
void wdc_log(struct channel_softc *chp, enum wdcevent_type type,
unsigned int size, char val[]);
@@ -129,7 +129,7 @@ static __inline void WDC_LOG_ATA_CMDEXT(struct channel_softc *chp,
#define WDC_LOG_REG(chp, reg, val)
#define WDC_LOG_ATA_CMDEXT(chp, lba_hi1, lba_hi2, lba_mi1, lba_mi2, \
lba_lo1, lba_lo2, count1, count2, command)
-#endif /* WDC_DEBUG */
+#endif /* WDCDEBUG */
#endif /* _KERNEL */