diff options
| author | David A. Mellis <d.mellis@arduino.cc> | 2011-03-03 18:57:05 -0500 |
|---|---|---|
| committer | David A. Mellis <d.mellis@arduino.cc> | 2011-03-03 18:57:05 -0500 |
| commit | b0ab2bc48bd3edd3b42d3a52f0995f220f77f814 (patch) | |
| tree | 119379a36e6494f3a9ac44ba4a1b5a65fd1c80f0 | |
| parent | 58d683239d80d4620a3ab35c4eac53bbe2c35d50 (diff) | |
Rearranging internal #defines in headers.
| -rw-r--r-- | cores/arduino/pins_arduino.h | 26 | ||||
| -rwxr-xr-x | cores/arduino/wiring_private.h | 22 |
2 files changed, 22 insertions, 26 deletions
diff --git a/cores/arduino/pins_arduino.h b/cores/arduino/pins_arduino.h index 98af18e..4f0c1c3 100644 --- a/cores/arduino/pins_arduino.h +++ b/cores/arduino/pins_arduino.h @@ -27,32 +27,6 @@ #include <avr/pgmspace.h> -#define NOT_A_PIN 0 -#define NOT_A_PORT 0 - -#define NOT_ON_TIMER 0 -#define TIMER0A 1 -#define TIMER0B 2 -#define TIMER1A 3 -#define TIMER1B 4 -#define TIMER2 5 -#define TIMER2A 6 -#define TIMER2B 7 - -#define TIMER3A 8 -#define TIMER3B 9 -#define TIMER3C 10 -#define TIMER4A 11 -#define TIMER4B 12 -#define TIMER4C 13 -#define TIMER5A 14 -#define TIMER5B 15 -#define TIMER5C 16 - -#ifndef INLINED -#define INLINED static __attribute__((always_inline)) inline -#endif - #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) const static uint8_t SS = 53; const static uint8_t MOSI = 51; diff --git a/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h index 74c0d06..b131ba0 100755 --- a/cores/arduino/wiring_private.h +++ b/cores/arduino/wiring_private.h @@ -44,6 +44,28 @@ extern "C"{ #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) #endif +#define NOT_A_PIN 0 +#define NOT_A_PORT 0 + +#define NOT_ON_TIMER 0 +#define TIMER0A 1 +#define TIMER0B 2 +#define TIMER1A 3 +#define TIMER1B 4 +#define TIMER2 5 +#define TIMER2A 6 +#define TIMER2B 7 + +#define TIMER3A 8 +#define TIMER3B 9 +#define TIMER3C 10 +#define TIMER4A 11 +#define TIMER4B 12 +#define TIMER4C 13 +#define TIMER5A 14 +#define TIMER5B 15 +#define TIMER5C 16 + #define EXTERNAL_INT_0 0 #define EXTERNAL_INT_1 1 #define EXTERNAL_INT_2 2 |