upgraded avr utils from spreadspace

git-svn-id: https://svn.spreadspace.org/mur.sat@662 7de4ea59-55d0-425e-a1af-a3118ea81d4c

3 files changed, 77 insertions, 9 deletions

diff --git a/software/avr.lib/led.c b/software/avr.lib/led.c
index ea5bcc3..d567cef 100644
--- a/software/avr.lib/led.c
+++ b/software/avr.lib/led.c
@@ -24,13 +24,17 @@
 
 #include "led.h"
 
-#if defined(__BOARD_arduinoUno__) || defined(__BOARD_AvrNetIo__)
-#define HAS_LED 0
+#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
+#define NUM_LEDS 2
+#elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) \
+  || defined(__BOARD_arduinoNG__) ||  defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) \
+  || defined(__BOARD_hhd70dongle__)
+#define NUM_LEDS 1
 #else
-#define HAS_LED 1
+#define NUM_LEDS 0
 #endif
 
-#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__)
+#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
 #define LED_DIR 0
 #else
 #define LED_DIR 1
@@ -42,6 +46,16 @@
 #define LED_PINNUM 6
 #endif
 
+#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
+#define LED_PORT PORTD
+#define LED_DDR DDRD
+#define LED_PINNUM 5
+
+#define LED2_PORT PORTD
+#define LED2_DDR DDRD
+#define LED2_PINNUM 6
+#endif
+
 #if defined(__BOARD_hhd70dongle__)
 #define LED_PORT PORTE
 #define LED_DDR DDRE
@@ -56,15 +70,18 @@
 
 void led_init(void)
 {
-#if HAS_LED == 1
+#if NUM_LEDS >= 1
   led_off();
   LED_DDR = 1<<LED_PINNUM;
+#if NUM_LEDS >= 2
+  LED2_DDR |= 1<<LED2_PINNUM;
+#endif
 #endif
 }
 
 void led_on(void)
 {
-#if HAS_LED == 1
+#if NUM_LEDS >= 1
 #if LED_DIR == 1
   LED_PORT |= 1<<LED_PINNUM;
 #else
@@ -75,7 +92,7 @@ void led_on(void)
 
 void led_off(void)
 {
-#if HAS_LED == 1
+#if NUM_LEDS >= 1
 #if LED_DIR == 1
   LED_PORT &= ~(1<<LED_PINNUM);
 #else
@@ -86,7 +103,37 @@ void led_off(void)
 
 void led_toggle(void)
 {
-#if HAS_LED == 1
+#if NUM_LEDS >= 1
   LED_PORT ^= 1<<LED_PINNUM;
 #endif
 }
+
+
+void led2_on(void)
+{
+#if NUM_LEDS >= 2
+#if LED_DIR == 1
+  LED2_PORT |= 1<<LED2_PINNUM;
+#else
+  LED2_PORT &= ~(1<<LED2_PINNUM);
+#endif
+#endif
+}
+
+void led2_off(void)
+{
+#if NUM_LEDS >= 2
+#if LED_DIR == 1
+  LED2_PORT &= ~(1<<LED2_PINNUM);
+#else
+  LED2_PORT |= 1<<LED2_PINNUM;
+#endif
+#endif
+}
+
+void led2_toggle(void)
+{
+#if NUM_LEDS >= 2
+  LED2_PORT ^= 1<<LED2_PINNUM;
+#endif
+}
diff --git a/software/avr.lib/led.h b/software/avr.lib/led.h
index 12f00a8..d7a8e3b 100644
--- a/software/avr.lib/led.h
+++ b/software/avr.lib/led.h
@@ -28,4 +28,8 @@ void led_on(void);
 void led_off(void);
 void led_toggle(void);
 
+void led2_on(void);
+void led2_off(void);
+void led2_toggle(void);
+
 #endif
diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c
index d927f8e..6624699 100644
--- a/software/avr.lib/util.c
+++ b/software/avr.lib/util.c
@@ -45,8 +45,14 @@ void cpu_init(void)
   #define BOOTLOADER_VEC 0xFC00
 #elif defined(__BOARD_teensy2pp__)
   #define BOOTLOADER_VEC 0x1FC00
+#elif defined(__BOARD_minimus__)
+  #define BOOTLOADER_VEC 0x3000
+#elif defined(__BOARD_minimus32__)
+  #define BOOTLOADER_VEC 0x3800
 #elif defined(__BOARD_hhd70dongle__)
   #define BOOTLOADER_VEC 0x3800
+#else
+  #define BOOTLOADER_VEC 0x0000
 #endif
 
 typedef void (*f_ptr_type)(void);
@@ -54,7 +60,8 @@ 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__)
+#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
+    defined(__BOARD_hhd70dongle__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
   cli();
   // disable watchdog, if enabled
   // disable all peripherals
@@ -82,6 +89,16 @@ void reset2bootloader(void)
     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;
+  #elif defined(__BOARD_minimus__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
+    TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
+    DDRB = 0; DDRC = 0; DDRD = 0;
+    PORTB = 0; PORTC = 0; PORTD = 0;
+  #elif defined(__BOARD_minimus32__)
+    EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
+    TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
+    DDRB = 0; DDRC = 0; DDRD = 0;
+    PORTB = 0; PORTC = 0; PORTD = 0;
   #elif defined(__BOARD_hhd70dongle__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;