diff options
| author | Christian Pointner <equinox@mur.at> | 2013-02-12 18:21:26 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2013-02-12 18:21:26 +0000 |
| commit | 0dd620a00ccbd8a19b715555b1142b1091c6fb39 (patch) | |
| tree | 6efe282a50dd948da016a1a53435dc5d90524deb /software/avr.lib/util.c | |
| parent | cleaned up beacon test (diff) | |
updated avr utils
avr build scripts support subware culv3 now
git-svn-id: https://svn.spreadspace.org/mur.sat@668 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/avr.lib/util.c')
| -rw-r--r-- | software/avr.lib/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c index 6624699..3de042e 100644 --- a/software/avr.lib/util.c +++ b/software/avr.lib/util.c @@ -2,7 +2,7 @@ * spreadspace avr utils * * - * Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org> + * Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org> * * This file is part of spreadspace avr utils. * @@ -49,7 +49,7 @@ void cpu_init(void) #define BOOTLOADER_VEC 0x3000 #elif defined(__BOARD_minimus32__) #define BOOTLOADER_VEC 0x3800 -#elif defined(__BOARD_hhd70dongle__) +#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) #define BOOTLOADER_VEC 0x3800 #else #define BOOTLOADER_VEC 0x0000 @@ -61,7 +61,7 @@ f_ptr_type start_bootloader = (f_ptr_type)BOOTLOADER_VEC; void reset2bootloader(void) { #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \ - defined(__BOARD_hhd70dongle__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) + defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) cli(); // disable watchdog, if enabled // disable all peripherals @@ -99,7 +99,7 @@ void reset2bootloader(void) TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0; DDRB = 0; DDRC = 0; DDRD = 0; PORTB = 0; PORTC = 0; PORTD = 0; - #elif defined(__BOARD_hhd70dongle__) + #elif defined(__BOARD_hhd70dongle__) || defined(__culV3__) EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0; TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0; |