Module Name: src
Committed By: matt
Date: Mon Jul 30 23:35:05 UTC 2012
Modified Files:
src/sys/arch/evbarm/ixm1200: nappi_nr.c
Log Message:
Make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ixm1200/nappi_nr.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/ixm1200/nappi_nr.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.9 src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.10
--- src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.9 Fri Jul 1 20:42:37 2011
+++ src/sys/arch/evbarm/ixm1200/nappi_nr.c Mon Jul 30 23:35:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
+/* $NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $");
/*
* LED support for NAPPI.
@@ -107,8 +107,10 @@ nappinr_callout(void *arg)
{
static const int ptn[] = { 1, 2, 4, 8, 4, 2 };
struct nappinr_softc* sc = arg;
+ uint32_t v;
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, 0,
- ptn[sc->sc_pos++ % 6] | ptn[sc->sc_pos++ % 6]<< 4);
+ v = ptn[sc->sc_pos++ % 6];
+ v |= ptn[sc->sc_pos++ % 6] << 4;
+ bus_space_write_4(sc->sc_iot, sc->sc_ioh, 0, v);
callout_reset(&sc->sc_co, hz / 10, nappinr_callout, sc);
}
