diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2021-12-21 21:09:45 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2021-12-21 21:10:00 +0100 |
| commit | 56dc720dffcc4639e0bb5492c6101f3e2aa9b5ad (patch) | |
| tree | e2c4ad6c212049830e6de986f5aacf00319816a1 | |
| parent | 4cd3ce53b396b7daa46fb9e1ba333f687af0eb2a (diff) | |
Remove unused TIMER_US support
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/arch/arduino-nano/arch.cc | 8 | ||||
| -rw-r--r-- | src/arch/blinkenrocket/arch.cc | 7 | ||||
| -rw-r--r-- | src/arch/msp430fr5969lp/arch.cc | 19 | ||||
| -rw-r--r-- | src/arch/msp430fr5994lp/arch.cc | 19 |
5 files changed, 0 insertions, 58 deletions
@@ -256,10 +256,6 @@ ifeq (${softi2c_timer}, 1) COMMON_FLAGS += -DSOFTI2C_TIMER endif -ifeq (${timer_us}, 1) - COMMON_FLAGS += -DTIMER_US -endif - # still used in makefiles ifeq (${loop}, 1) COMMON_FLAGS += -DCONFIG_loop @@ -307,7 +303,6 @@ clean: arch_clean help: arch_help @echo @echo "common flags:" - @echo " timer_us timer_s -- enable specific timers. May be mutually exclusive" @echo " loop -- enable loop() function" @echo " i2c_freq -- I2C Frequency in Hz" @echo " timer_freq -- Timer frequency in Hz" diff --git a/src/arch/arduino-nano/arch.cc b/src/arch/arduino-nano/arch.cc index 5f72c06..87b81cc 100644 --- a/src/arch/arduino-nano/arch.cc +++ b/src/arch/arduino-nano/arch.cc @@ -50,14 +50,6 @@ void Arch::setup(void) TIMSK1 = _BV(OCIE1A); #endif -#ifdef TIMER_US -#if F_CPU != 16000000UL -#error TIMER_US is only supported with F_CPU = 16MHz -#endif - // 16MHz/8 -> 2MHz timer - TCCR2A = 0; - TCCR2B = _BV(CS21); -#endif sei(); } diff --git a/src/arch/blinkenrocket/arch.cc b/src/arch/blinkenrocket/arch.cc index 7f9497e..5fc7cb8 100644 --- a/src/arch/blinkenrocket/arch.cc +++ b/src/arch/blinkenrocket/arch.cc @@ -17,13 +17,6 @@ void Arch::setup(void) TIMSK1 = _BV(OCIE1A); #endif -/* -#ifdef TIMER_US - // 16MHz/8 -> 2MHz timer - TCCR1A = 0; - TCCR2B = _BV(CS21); -#endif -*/ sei(); } diff --git a/src/arch/msp430fr5969lp/arch.cc b/src/arch/msp430fr5969lp/arch.cc index a9e1a57..1c610ca 100644 --- a/src/arch/msp430fr5969lp/arch.cc +++ b/src/arch/msp430fr5969lp/arch.cc @@ -68,25 +68,6 @@ void Arch::setup(void) __delay_cycles(1000000); #endif -#ifdef TIMER_US -#if F_CPU == 16000000UL - TA0CTL = TASSEL__SMCLK | ID__8 | MC__CONTINUOUS; // /8 - TA0EX0 = 1; // /2 -> /16 -#elif F_CPU == 8000000UL - TA0CTL = TASSEL__SMCLK | ID__8 | MC__CONTINUOUS; // /8 - TA0EX0 = 0; // /1 -> /8 -#elif F_CPU == 4000000UL - TA0CTL = TASSEL__SMCLK | ID__4 | MC__CONTINUOUS; // /4 - TA0EX0 = 0; // /1 -> /8 -#elif F_CPU == 1000000UL - TA0CTL = TASSEL__SMCLK | ID__1 | MC__CONTINUOUS; // /1 - TA0EX0 = 0; // /1 -> /8 -#else -#error Unsupported F_CPU -#endif /* F_CPU */ - TA0CTL |= TACLR; -#endif /* TIMER_US */ - #if defined(CONFIG_loop) || defined(TIMER_S) // 1s per wakeup for loop. Independent of SMCLK/F_CPU TA1CTL = TASSEL__ACLK | ID__8 | MC__UP; diff --git a/src/arch/msp430fr5994lp/arch.cc b/src/arch/msp430fr5994lp/arch.cc index b79b8b0..d1fceaf 100644 --- a/src/arch/msp430fr5994lp/arch.cc +++ b/src/arch/msp430fr5994lp/arch.cc @@ -108,25 +108,6 @@ void Arch::setup(void) CSCTL0_H = 0; #endif -#ifdef TIMER_US -#if F_CPU == 16000000UL - TA0CTL = TASSEL__SMCLK | ID__8 | MC__CONTINUOUS; // /8 - TA0EX0 = 1; // /2 -> /16 -#elif F_CPU == 8000000UL - TA0CTL = TASSEL__SMCLK | ID__8 | MC__CONTINUOUS; // /8 - TA0EX0 = 0; // /1 -> /8 -#elif F_CPU == 4000000UL - TA0CTL = TASSEL__SMCLK | ID__4 | MC__CONTINUOUS; // /4 - TA0EX0 = 0; // /1 -> /8 -#elif F_CPU == 1000000UL - TA0CTL = TASSEL__SMCLK | ID__1 | MC__CONTINUOUS; // /1 - TA0EX0 = 0; // /1 -> /8 -#else -#error Unsupported F_CPU -#endif /* F_CPU */ - TA0CTL |= TACLR; -#endif /* TIMER_US */ - #if F_CPU == 32768UL CSCTL0_H = CSKEY >> 8; CSCTL2 = SELA__LFXTCLK | SELS__LFXTCLK | SELM__LFXTCLK; |