Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci/voyager make this compile again; macallan, pleas...
details: https://anonhg.NetBSD.org/src/rev/162156f34c47
branches: trunk
changeset: 786110:162156f34c47
user: christos <christos%NetBSD.org@localhost>
date: Mon Apr 15 19:46:16 2013 +0000
description:
make this compile again; macallan, please commit the right fix!
diffstat:
sys/dev/pci/voyager/pwmclock.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diffs (52 lines):
diff -r 142c8c02afa3 -r 162156f34c47 sys/dev/pci/voyager/pwmclock.c
--- a/sys/dev/pci/voyager/pwmclock.c Mon Apr 15 19:26:15 2013 +0000
+++ b/sys/dev/pci/voyager/pwmclock.c Mon Apr 15 19:46:16 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $ */
+/* $NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,8 +157,10 @@
/* ok, let's see how far the cycle counter gets between interrupts */
DPRINTF("calibrating CPU timer...\n");
for (clk = 1; clk < 8; clk++) {
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) & ~LS2FCFG_FREQSCALE_MASK) | clk;
+#endif
bus_space_write_4(sc->sc_memt, sc->sc_regh, SM502_PWM1,
sc->sc_reg);
acc = 0;
@@ -234,8 +236,10 @@
/* just in case the interrupt handler runs again after this */
sc->sc_step_wanted = 7;
/* set the clock to full speed */
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) & ~LS2FCFG_FREQSCALE_MASK) | 7;
+#endif
}
void
@@ -292,9 +296,11 @@
* we only change sc_step after doing that
*/
if (sc->sc_step_wanted != sc->sc_step) {
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) & ~LS2FCFG_FREQSCALE_MASK) |
sc->sc_step_wanted;
+#endif
}
now = mips3_cp0_count_read();
Home |
Main Index |
Thread Index |
Old Index