aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/wiring.c
diff options
context:
space:
mode:
authorDavid A. Mellis <d.mellis@arduino.cc>2011-03-06 11:29:35 -0500
committerDavid A. Mellis <d.mellis@arduino.cc>2011-03-06 11:29:35 -0500
commitbc416b14bd62937a96bd6eb28d3755282fdeb941 (patch)
tree6d6ca9cdf2ad8d36b23b015ee794269bc342f2dd /cores/arduino/wiring.c
parentd8d233ad3e4513cb5378dca459c251e0a127e129 (diff)
Moving TCCR1B reset into #ifdef check.
Diffstat (limited to 'cores/arduino/wiring.c')
-rwxr-xr-xcores/arduino/wiring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index b90d07e..ce4cad6 100755
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -212,10 +212,10 @@ void init()
// note, however, that fast pwm mode can achieve a frequency of up
// 8 MHz (with a 16 MHz clock) at 50% duty cycle
+#if defined(TCCR1B) && defined(CS11) && defined(CS10)
TCCR1B = 0;
// set timer 1 prescale factor to 64
-#if defined(TCCR1B) && defined(CS11) && defined(CS10)
sbi(TCCR1B, CS11);
sbi(TCCR1B, CS10);
#elif defined(TCCR1) && defined(CS11) && defined(CS10)