[src/trunk]: src/sys Fix DEBUG build.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d4ad588a8c29
branches:  trunk
changeset: 759428:d4ad588a8c29
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Dec 09 04:31:57 2010 +0000

description:
Fix DEBUG build.

diffstat:

 sys/arch/evbppc/pmppc/dev/ds17485.c |   7 ++-----
 sys/arch/hpcarm/dev/wzero3_lcd.c    |  10 +++++-----
 sys/dev/sbus/zx.c                   |   9 +++++++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diffs (98 lines):

diff -r 93e164f5dfbb -r d4ad588a8c29 sys/arch/evbppc/pmppc/dev/ds17485.c
--- a/sys/arch/evbppc/pmppc/dev/ds17485.c       Thu Dec 09 01:48:05 2010 +0000
+++ b/sys/arch/evbppc/pmppc/dev/ds17485.c       Thu Dec 09 04:31:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ds17485.c,v 1.6 2008/04/28 20:23:17 martin Exp $       */
+/*     $NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $     */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -150,7 +150,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds17485.c,v 1.6 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -201,9 +201,6 @@
        }
 
        rtc_attached = 1;
-#ifdef DEBUG
-       rtc_print();
-#endif
        rtc_write(sc, MC_REGA, MC_BASE_32_KHz | MC_RATE_1024_Hz);
        rtc_write(sc, MC_REGB, MC_REGB_24HR);
 
diff -r 93e164f5dfbb -r d4ad588a8c29 sys/arch/hpcarm/dev/wzero3_lcd.c
--- a/sys/arch/hpcarm/dev/wzero3_lcd.c  Thu Dec 09 01:48:05 2010 +0000
+++ b/sys/arch/hpcarm/dev/wzero3_lcd.c  Thu Dec 09 04:31:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wzero3_lcd.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $    */
+/*     $NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $  */
 
 /*
  * Copyright (c) 2008,2009 NONAKA Kimihiro <nonaka%netbsd.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -450,18 +450,18 @@
        switch (dp->param) {
        case WSDISPLAYIO_PARAM_BACKLIGHT:
                /* unsupported */
-               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_BACKLIGHT) isn't supported\n", device_xname(&sc->dev)));
+               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_BACKLIGHT) isn't supported\n", device_xname(sc->dev)));
                res = ENOTTY;
                break;
 
        case WSDISPLAYIO_PARAM_CONTRAST:
-               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_CONTRAST) isn't supported\n", device_xname(&sc->dev)));
+               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_CONTRAST) isn't supported\n", device_xname(sc->dev)));
                /* unsupported */
                res = ENOTTY;
                break;
 
        case WSDISPLAYIO_PARAM_BRIGHTNESS:
-               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_BRIGHTNESS) isn't supported\n", device_xname(&sc->dev)));
+               DPRINTF(("%s: ioctl(WSDISPLAYIO_PARAM_BRIGHTNESS) isn't supported\n", device_xname(sc->dev)));
                /* unsupported */
                res = ENOTTY;
        }
diff -r 93e164f5dfbb -r d4ad588a8c29 sys/dev/sbus/zx.c
--- a/sys/dev/sbus/zx.c Thu Dec 09 01:48:05 2010 +0000
+++ b/sys/dev/sbus/zx.c Thu Dec 09 04:31:57 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $ */
+/*     $NetBSD: zx.c,v 1.38 2010/12/09 04:35:36 uebayasi Exp $ */
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.38 2010/12/09 04:35:36 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,6 +57,11 @@
 #include <sys/conf.h>
 #include <sys/syslog.h>
 #include <sys/buf.h>
+#ifdef DEBUG
+/* for log(9) in zxioctl() */
+#include <sys/lwp.h>
+#include <sys/proc.h>
+#endif
 
 #include <sys/bus.h>
 #include <machine/autoconf.h>