Removing hardcoded CPU speed from Wire library.

damellis · damellis · commit 57b4b0e10df5 · 2011-05-12T16:53:14.000-04:00
Replacing CPU_FREQ with F_CPU.
diff --git a/libraries/Wire/utility/twi.c b/libraries/Wire/utility/twi.c
@@ -79,7 +79,7 @@ void twi_init(void)
   // initialize twi prescaler and bit rate
   cbi(TWSR, TWPS0);
   cbi(TWSR, TWPS1);
-  TWBR = ((CPU_FREQ / TWI_FREQ) - 16) / 2;
+  TWBR = ((F_CPU / TWI_FREQ) - 16) / 2;
 
   /* twi bit rate formula from atmega128 manual pg 204
   SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
diff --git a/libraries/Wire/utility/twi.h b/libraries/Wire/utility/twi.h
@@ -24,10 +24,6 @@
 
   //#define ATMEGA8
 
-  #ifndef CPU_FREQ
-  #define CPU_FREQ 16000000L
-  #endif
-
   #ifndef TWI_FREQ
   #define TWI_FREQ 100000L
   #endif
