razzor
/
twiboot
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

Do not repeat check for every chip type

This commit is contained in:
Olaf Rempel 2020-01-20 23:42:10 +01:00
parent 7e7e50ad84
commit 05a4533cd2
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.c
View File

@ -196,13 +196,14 @@ static void write_eeprom_byte(uint8_t val)
EEDR = val; EEDR = val;
addr++; addr++;
#if defined (__AVR_ATmega8__) #if defined (EEWE)
EECR |= (1<<EEMWE); EECR |= (1<<EEMWE);
EECR |= (1<<EEWE); EECR |= (1<<EEWE);
#elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega168__) || \ #elif defined (EEPE)
defined (__AVR_ATmega328P__)
EECR |= (1<<EEMPE); EECR |= (1<<EEMPE);
EECR |= (1<<EEPE); EECR |= (1<<EEPE);
#else
#error "EEWE/EEPE not defined"
#endif #endif
eeprom_busy_wait(); eeprom_busy_wait();
@ -484,11 +485,12 @@ int main(void)
LED_GN_ON(); LED_GN_ON();
/* timer0: running with F_CPU/1024 */ /* timer0: running with F_CPU/1024 */
#if defined (__AVR_ATmega8__) #if defined (TCCR0)
TCCR0 = (1<<CS02) | (1<<CS00); TCCR0 = (1<<CS02) | (1<<CS00);
#elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega168__) || \ #elif defined (TCCR0B)
defined (__AVR_ATmega328P__)
TCCR0B = (1<<CS02) | (1<<CS00); TCCR0B = (1<<CS02) | (1<<CS00);
#else
#error "TCCR0(B) not defined"
#endif #endif
/* TWI init: set address, auto ACKs */ /* TWI init: set address, auto ACKs */
@ -502,19 +504,20 @@ int main(void)
TWI_vect(); TWI_vect();
} }
#if defined (__AVR_ATmega8__) #if defined (TIFR)
if (TIFR & (1<<TOV0)) if (TIFR & (1<<TOV0))
{ {
TIMER0_OVF_vect(); TIMER0_OVF_vect();
TIFR = (1<<TOV0); TIFR = (1<<TOV0);
} }
#elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega168__) || \ #elif defined (TIFR0)
defined (__AVR_ATmega328P__)
if (TIFR0 & (1<<TOV0)) if (TIFR0 & (1<<TOV0))
{ {
TIMER0_OVF_vect(); TIMER0_OVF_vect();
TIFR0 = (1<<TOV0); TIFR0 = (1<<TOV0);
} }
#else
#error "TIFR(0) not defined"
#endif #endif
} }
@ -522,11 +525,12 @@ int main(void)
TWCR = 0x00; TWCR = 0x00;
/* disable timer0 */ /* disable timer0 */
#if defined (__AVR_ATmega8__) #if defined (TCCR0)
TCCR0 = 0x00; TCCR0 = 0x00;
#elif defined (__AVR_ATmega88__) || defined (__AVR_ATmega168__) || \ #elif defined (TCCR0B)
defined (__AVR_ATmega328P__)
TCCR0B = 0x00; TCCR0B = 0x00;
#else
#error "TCCR0(B) not defined"
#endif #endif
LED_OFF(); LED_OFF();