Module Name: src
Committed By: macallan
Date: Tue Apr 16 09:04:24 UTC 2013
Modified Files:
src/sys/dev/pci/voyager: pwmclock.c
Log Message:
unscrew this again
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/voyager/pwmclock.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/dev/pci/voyager/pwmclock.c
diff -u src/sys/dev/pci/voyager/pwmclock.c:1.7 src/sys/dev/pci/voyager/pwmclock.c:1.8
--- src/sys/dev/pci/voyager/pwmclock.c:1.7 Mon Apr 15 19:46:16 2013
+++ src/sys/dev/pci/voyager/pwmclock.c Tue Apr 16 09:04:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $ */
+/* $NetBSD: pwmclock.c,v 1.8 2013/04/16 09:04:24 macallan Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwmclock.c,v 1.8 2013/04/16 09:04:24 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,10 +157,9 @@ pwmclock_attach(device_t parent, device_
/* 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;
@@ -236,10 +235,8 @@ pwmclock_shutdown(void *cookie)
/* 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
@@ -296,11 +293,10 @@ pwmclock_intr(void *cookie)
* 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();
