diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2004-08-03 12:10:49 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2004-08-03 12:10:49 +0000 |
| commit | 57bba588fb2f5a81bccbc1d52774403db366f7cc (patch) | |
| tree | fd33ea2d01625a5dedf9ca15fafd8c53a78b4218 /sys/arch | |
| parent | c04b122966d038b53c821703962a4d199da35cee (diff) | |
the rest of the '#if DIAGNOSTIC' -> '#ifdef DIAGNOSTIC' in the kernel; ok miod@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/dev/if_ae.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/mac68k5380.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/z8530sc.c | 8 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/clock.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c index 210686ee915..105205d0d95 100644 --- a/sys/arch/mac68k/dev/if_ae.c +++ b/sys/arch/mac68k/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae.c,v 1.22 2004/04/16 22:54:48 xsa Exp $ */ +/* $OpenBSD: if_ae.c,v 1.23 2004/08/03 12:10:47 todd Exp $ */ /* $NetBSD: if_ae.c,v 1.62 1997/04/24 16:52:05 scottr Exp $ */ /* @@ -443,7 +443,7 @@ outloop: buffer = (sc->txb_new * ED_TXBUF_SIZE) << ED_PAGE_SHIFT; len = ae_put(sc, m0, buffer); -#if DIAGNOSTIC +#ifdef DIAGNOSTIC if (len != m0->m_pkthdr.len) printf("aestart: len %d != m0->m_pkthdr.len %d.\n", len, m0->m_pkthdr.len); diff --git a/sys/arch/mac68k/dev/mac68k5380.c b/sys/arch/mac68k/dev/mac68k5380.c index ca239678d05..e6c07b743d8 100644 --- a/sys/arch/mac68k/dev/mac68k5380.c +++ b/sys/arch/mac68k/dev/mac68k5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac68k5380.c,v 1.17 2003/03/14 10:47:36 miod Exp $ */ +/* $OpenBSD: mac68k5380.c,v 1.18 2004/08/03 12:10:47 todd Exp $ */ /* $NetBSD: mac68k5380.c,v 1.29 1997/02/28 15:50:50 scottr Exp $ */ /* @@ -585,7 +585,7 @@ transfer_pdma(phasep, data, count) while ( ((GET_5380_REG(NCR5380_IDSTAT) & SC_S_BSY) == 0) && (--scsi_timeout) ); if (!scsi_timeout) { -#if DIAGNOSTIC +#ifdef DIAGNOSTIC printf("scsi timeout: waiting for BSY in %s.\n", (*phasep == PH_DATAOUT) ? "pdma_out" : "pdma_in"); #endif diff --git a/sys/arch/mac68k/dev/z8530sc.c b/sys/arch/mac68k/dev/z8530sc.c index 37a02ad2239..acded984c68 100644 --- a/sys/arch/mac68k/dev/z8530sc.c +++ b/sys/arch/mac68k/dev/z8530sc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.c,v 1.5 2003/06/02 23:27:49 millert Exp $ */ +/* $OpenBSD: z8530sc.c,v 1.6 2004/08/03 12:10:47 todd Exp $ */ /* $NetBSD: z8530sc.c,v 1.1 1996/05/18 18:54:28 briggs Exp $ */ /* @@ -293,7 +293,7 @@ zsc_intr_hard(arg) register struct zs_chanstate *cs_b; register int rval; register u_char rr3, rr3a; -#if DIAGNOSTIC +#ifdef DIAGNOSTIC register int loopcount; loopcount = ZS_INTERRUPT_CNT; #endif @@ -307,7 +307,7 @@ zsc_intr_hard(arg) rr3 = zs_read_reg(cs_a, 3); while ((rr3 = zs_read_reg(cs_a, ZSRR_IPEND)) -#if DIAGNOSTIC +#ifdef DIAGNOSTIC && --loopcount #endif ) { @@ -332,7 +332,7 @@ zsc_intr_hard(arg) rr3a |= rr3; } -#if DIAGNOSTIC +#ifdef DIAGNOSTIC if (loopcount == 0) { if (rr3 & (ZSRR3_IP_A_RX | ZSRR3_IP_A_TX | ZSRR3_IP_A_STAT)) cs_a->cs_flags |= ZS_FLAGS_INTERRUPT_OVERRUN; diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c index eda5931e108..c2280ca6821 100644 --- a/sys/arch/mac68k/mac68k/clock.c +++ b/sys/arch/mac68k/mac68k/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.15 2003/06/02 23:27:49 millert Exp $ */ +/* $OpenBSD: clock.c,v 1.16 2004/08/03 12:10:47 todd Exp $ */ /* $NetBSD: clock.c,v 1.36 1997/10/07 03:04:55 scottr Exp $ */ /* @@ -342,7 +342,7 @@ inittodr(base) timbuf = pramt_2_ugmt(pram_readtime()); if ((timbuf - (macos_boottime + 60 * tz.tz_minuteswest)) > 10 * 60) { -#if DIAGNOSTIC +#ifdef DIAGNOSTIC printf( "PRAM time does not appear to have been read correctly.\n"); printf("PRAM: 0x%lx, macos_boottime: 0x%lx.\n", |