Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc fixes to get this to compile again.

This commit is contained in:
matt 2010-06-19 19:47:34 +00:00
parent 30ce2039ad
commit a0bdfc6191
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/arm/at91/at91dbgu.c
View File

@ -1,5 +1,5 @@
/* $Id: 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.3 2009/03/14 15:36:01 dsl Exp $ */ /* $NetBSD: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $ */
/* /*
* *
@ -83,7 +83,7 @@
*/ */
#include <sys/cdefs.h> #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_ddb.h"
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -270,7 +270,7 @@ at91dbgu_attach(device_t parent, device_t self, void *aux)
cn_tab->cn_dev = makedev(maj, device_unit(sc->sc_dev)); 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), device_xname(sc->sc_dev), maj, device_unit(sc->sc_dev),
cn_tab->cn_dev); cn_tab->cn_dev);
} }

7
sys/arch/arm/at91/at91pio.c
View File

@ -1,5 +1,5 @@
/* $Id: 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.2 2008/07/03 01:15:38 matt Exp $ */ /* $NetBSD: at91pio.c,v 1.3 2010/06/19 19:47:34 matt Exp $ */
/* /*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved. * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -30,12 +30,13 @@
*/ */
#include <sys/cdefs.h> #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/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/device.h> #include <sys/device.h>
#include <sys/gpio.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <machine/intr.h> #include <machine/intr.h>
#include <dev/gpio/gpiovar.h> #include <dev/gpio/gpiovar.h>

6
sys/arch/arm/at91/at91tctmr.c
View File

@ -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 * AT91 Timer Counter (TC) based clock functions
@ -40,7 +40,7 @@
*/ */
#include <sys/cdefs.h> #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/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -207,7 +207,7 @@ at91tctmr_attach(device_t parent, device_t self, void *aux)
sc->sc_timerclock = AT91_MSTCLK / 128U; sc->sc_timerclock = AT91_MSTCLK / 128U;
cmr = TC_CMR_TCCLKS_MCK_DIV_128; cmr = TC_CMR_TCCLKS_MCK_DIV_128;
} else } 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_divider = (sc->sc_timerclock + HZ - 1) / HZ; /* round up */
sc->sc_usec_per_tick = 1000000UL / (sc->sc_timerclock / sc->sc_divider); sc->sc_usec_per_tick = 1000000UL / (sc->sc_timerclock / sc->sc_divider);

7
sys/arch/evbarm/mpcsa/mpcsa_leds.c
View File

@ -1,5 +1,5 @@
/* $Id: 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.2 2008/07/03 01:15:39 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. * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@ -30,13 +30,14 @@
*/ */
#include <sys/cdefs.h> #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/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/device.h> #include <sys/device.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/gpio.h>
#include <dev/spi/spivar.h> #include <dev/spi/spivar.h>
#include <dev/gpio/gpiovar.h> #include <dev/gpio/gpiovar.h>
#include <evbarm/mpcsa/mpcsa_leds_var.h> #include <evbarm/mpcsa/mpcsa_leds_var.h>