Module Name: src
Committed By: bsh
Date: Fri Apr 6 01:47:16 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: INTEGRATOR
src/sys/arch/evbarm/dev: plcom.c
Log Message:
avoid warning with options PLCOM_DEBUG for INTEGRATOR.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/INTEGRATOR
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/dev/plcom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/INTEGRATOR
diff -u src/sys/arch/evbarm/conf/INTEGRATOR:1.64 src/sys/arch/evbarm/conf/INTEGRATOR:1.65
--- src/sys/arch/evbarm/conf/INTEGRATOR:1.64 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/evbarm/conf/INTEGRATOR Fri Apr 6 01:47:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INTEGRATOR,v 1.64 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: INTEGRATOR,v 1.65 2012/04/06 01:47:15 bsh Exp $
#
# GENERIC -- ARM Integrator board Generic kernel
#
@@ -155,6 +155,7 @@ ifpga0 at mainbus?
# PL010 uart
plcom0 at ifpga? offset 0x06000000 irq 1
plcom1 at ifpga? offset 0x07000000 irq 2
+#options PLCOM_DEBUG
# PL030 real time clock
plrtc0 at ifpga? offset 0x05000000
Index: src/sys/arch/evbarm/dev/plcom.c
diff -u src/sys/arch/evbarm/dev/plcom.c:1.33 src/sys/arch/evbarm/dev/plcom.c:1.34
--- src/sys/arch/evbarm/dev/plcom.c:1.33 Thu Feb 2 19:42:59 2012
+++ src/sys/arch/evbarm/dev/plcom.c Fri Apr 6 01:47:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $ */
+/* $NetBSD: plcom.c,v 1.34 2012/04/06 01:47:16 bsh Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.33 2012/02/02 19:42:59 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.34 2012/04/06 01:47:16 bsh Exp $");
#include "opt_plcom.h"
#include "opt_ddb.h"
@@ -280,9 +280,9 @@ plcomspeed(long speed, long frequency)
#ifdef PLCOM_DEBUG
int plcom_debug = 0;
-void plcomstatus (struct plcom_softc *, char *);
+void plcomstatus (struct plcom_softc *, const char *);
void
-plcomstatus(struct plcom_softc *sc, char *str)
+plcomstatus(struct plcom_softc *sc, const char *str)
{
struct tty *tp = sc->sc_tty;
@@ -304,6 +304,7 @@ plcomstatus(struct plcom_softc *sc, char
}
#endif
+/* XXX this function is not used? */
int
plcomprobe1(bus_space_tag_t iot, bus_space_handle_t ioh)
{
