diff options
| author | Christian Pointner <equinox@mur.at> | 2014-06-03 19:11:17 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2014-06-03 19:11:17 +0200 |
| commit | 2d9c22fc460c9e936de2819096c64df899f53766 (patch) | |
| tree | 576479bb4eaafe0c8ef0d43e881012c2a2504ef1 /software/avr.lib/util.c | |
| parent | removed obsolete patch for chibios (diff) | |
upgrade avr utils
Diffstat (limited to 'software/avr.lib/util.c')
| -rw-r--r-- | software/avr.lib/util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c index 104f2b6..7442b2c 100644 --- a/software/avr.lib/util.c +++ b/software/avr.lib/util.c @@ -66,6 +66,8 @@ void jtag_disable(void) #define BOOTLOADER_VEC 0x3800 #elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) #define BOOTLOADER_VEC 0x3800 +#elif defined(__BOARD_rhmixxx__) + #define BOOTLOADER_VEC 0xF000 #else #define BOOTLOADER_VEC 0x0000 #endif @@ -78,7 +80,7 @@ void reset2bootloader(void) #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \ defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \ defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || \ - defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) + defined(__BOARD_rhmixxx__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) cli(); // disable watchdog, if enabled // disable all peripherals @@ -122,6 +124,11 @@ void reset2bootloader(void) TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0; + #elif defined(__BOARD_rhmixxx__) + EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0; + TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0; + DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; + PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0; #endif start_bootloader(); #endif |