Module Name: src
Committed By: matt
Date: Sat Jun 19 19:47:34 UTC 2010
Modified Files:
src/sys/arch/arm/at91: at91dbgu.c at91pio.c at91tctmr.c
src/sys/arch/evbarm/mpcsa: mpcsa_leds.c
Log Message:
Misc fixes to get this to compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91dbgu.c \
src/sys/arch/arm/at91/at91tctmr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91pio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/mpcsa/mpcsa_leds.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/arm/at91/at91dbgu.c
diff -u src/sys/arch/arm/at91/at91dbgu.c:1.3 src/sys/arch/arm/at91/at91dbgu.c:1.4
--- src/sys/arch/arm/at91/at91dbgu.c:1.3 Sat Mar 14 15:36:01 2009
+++ src/sys/arch/arm/at91/at91dbgu.c Sat Jun 19 19:47:34 2010
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.3 2009/03/14 15:36:01 dsl Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.3 2009/03/14 15:36:01 dsl Exp $ */
+/* $Id: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $ */
/*
*
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.3 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -270,7 +270,7 @@
cn_tab->cn_dev = makedev(maj, device_unit(sc->sc_dev));
- aprint_normal("%s: console (maj %u min %u cn_dev %u)\n",
+ aprint_normal("%s: console (maj %u min %u cn_dev %#"PRIx64")\n",
device_xname(sc->sc_dev), maj, device_unit(sc->sc_dev),
cn_tab->cn_dev);
}
Index: src/sys/arch/arm/at91/at91tctmr.c
diff -u src/sys/arch/arm/at91/at91tctmr.c:1.3 src/sys/arch/arm/at91/at91tctmr.c:1.4
--- src/sys/arch/arm/at91/at91tctmr.c:1.3 Tue Oct 27 03:42:31 2009
+++ src/sys/arch/arm/at91/at91tctmr.c Sat Jun 19 19:47:34 2010
@@ -1,4 +1,4 @@
-/*$NetBSD: at91tctmr.c,v 1.3 2009/10/27 03:42:31 snj Exp $*/
+/*$NetBSD: at91tctmr.c,v 1.4 2010/06/19 19:47:34 matt Exp $*/
/*
* AT91 Timer Counter (TC) based clock functions
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.3 2009/10/27 03:42:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,v 1.4 2010/06/19 19:47:34 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -207,7 +207,7 @@
sc->sc_timerclock = AT91_MSTCLK / 128U;
cmr = TC_CMR_TCCLKS_MCK_DIV_128;
} else
- panic("%s: cannot setup timer to reach HZ", device-xname(sc->sc_dev));
+ panic("%s: cannot setup timer to reach HZ", device_xname(sc->sc_dev));
sc->sc_divider = (sc->sc_timerclock + HZ - 1) / HZ; /* round up */
sc->sc_usec_per_tick = 1000000UL / (sc->sc_timerclock / sc->sc_divider);
Index: src/sys/arch/arm/at91/at91pio.c
diff -u src/sys/arch/arm/at91/at91pio.c:1.2 src/sys/arch/arm/at91/at91pio.c:1.3
--- src/sys/arch/arm/at91/at91pio.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pio.c Sat Jun 19 19:47:34 2010
@@ -1,5 +1,5 @@
-/* $Id: at91pio.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91pio.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
+/* $NetBSD: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/gpio.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/gpio/gpiovar.h>
Index: src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.2 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.3
--- src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.2 Thu Jul 3 01:15:39 2008
+++ src/sys/arch/evbarm/mpcsa/mpcsa_leds.c Sat Jun 19 19:47:34 2010
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_leds.c,v 1.2 2008/07/03 01:15:39 matt Exp $ */
-/* $NetBSD: mpcsa_leds.c,v 1.2 2008/07/03 01:15:39 matt Exp $ */
+/* $Id: mpcsa_leds.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
+/* $NetBSD: mpcsa_leds.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,13 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.2 2008/07/03 01:15:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.3 2010/06/19 19:47:34 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/lock.h>
+#include <sys/gpio.h>
#include <dev/spi/spivar.h>
#include <dev/gpio/gpiovar.h>
#include <evbarm/mpcsa/mpcsa_leds_var.h>
