From 75ffa7cd833d19e2c8b68a1219106dad901e7873 Mon Sep 17 00:00:00 2001 From: ad Date: Sat, 29 Mar 2008 17:36:45 +0000 Subject: Make TCICDEBUG / TCICISADEBUG compile. --- sys/dev/ic/tcic2.c | 8 +++----- sys/dev/isa/tcic2_isa.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c index 61b12beb05c..b4948063c17 100644 --- a/sys/dev/ic/tcic2.c +++ b/sys/dev/ic/tcic2.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcic2.c,v 1.28 2007/10/19 12:00:02 ad Exp $ */ +/* $NetBSD: tcic2.c,v 1.29 2008/03/29 17:36:45 ad Exp $ */ /* * Copyright (c) 1998, 1999 Christoph Badura. All rights reserved. @@ -31,9 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.28 2007/10/19 12:00:02 ad Exp $"); - -#undef TCICDEBUG +__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.29 2008/03/29 17:36:45 ad Exp $"); #include #include @@ -1134,7 +1132,7 @@ tcic_chip_io_map(pch, width, offset, size, pcihp, windowp) bus_addr_t ioaddr = pcihp->addr + offset; int i, win; #ifdef TCICDEBUG - static char *width_names[] = { "auto", "io8", "io16" }; + static const char *width_names[] = { "auto", "io8", "io16" }; #endif /* XXX Sanity check offset/size. */ diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c index f03c9fd175a..6b5462771fb 100644 --- a/sys/dev/isa/tcic2_isa.c +++ b/sys/dev/isa/tcic2_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcic2_isa.c,v 1.18 2007/10/19 12:00:23 ad Exp $ */ +/* $NetBSD: tcic2_isa.c,v 1.19 2008/03/29 17:36:45 ad Exp $ */ /* * @@ -32,9 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.18 2007/10/19 12:00:23 ad Exp $"); - -#undef TCICISADEBUG +__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.19 2008/03/29 17:36:45 ad Exp $"); #include #include @@ -178,7 +176,7 @@ tcic_isa_probe(struct device *parent, struct cfdata *match, return (0); } - DPRINTF(("tcic probing 0x%03x\n", ia->ia_iobase)); + DPRINTF(("tcic probing 0x%03x\n", ia->ia_iomem[0].ir_addr)); found = 0; /* -- cgit