File new-avr-gcc-fix of Package simulavr

Overview Repositories Revisions Requests Users Attributes Meta

File new-avr-gcc-fix of Package simulavr (Revision c74b57133889892f594c2230cefe7e0f)

Currently displaying revision c74b57133889892f594c2230cefe7e0f , Show latest

diff -Nurd simulavr-1.0.0.orig/examples/atmega128_timer/main.c simulavr-1.0.0-test2/examples/atmega128_timer/main.c
--- simulavr-1.0.0.orig/examples/atmega128_timer/main.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/atmega128_timer/main.c	2013-03-17 10:56:41.252887904 +0100
@@ -5,7 +5,7 @@
 volatile int timer2_ticks;
 
 /* Every ~ms */
-ISR(SIG_OUTPUT_COMPARE2)
+ISR(TIMER2_COMP_vect)
 {                               /* Every ~1ms */
    timer2_ticks++;
 }
diff -Nurd simulavr-1.0.0.orig/examples/atmel_key/kb.c simulavr-1.0.0-test2/examples/atmel_key/kb.c
--- simulavr-1.0.0.orig/examples/atmel_key/kb.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/atmel_key/kb.c	2013-03-17 11:20:40.719252058 +0100
@@ -36,7 +36,7 @@
     bitcount = 11;
 }
 
-SIGNAL(SIG_INTERRUPT0)
+SIGNAL(INT0_vect)
 {
     static unsigned char data;                // Holds the received scan code
 
diff -Nurd simulavr-1.0.0.orig/examples/atmel_key/scancodes.h simulavr-1.0.0-test2/examples/atmel_key/scancodes.h
--- simulavr-1.0.0.orig/examples/atmel_key/scancodes.h	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/atmel_key/scancodes.h	2013-03-17 11:29:14.318218972 +0100
@@ -87,7 +87,7 @@
 };
 
 // Shifted characters
-prog_char shifted[][2] = {
+static char shifted[][2]  __attribute__ ((progmem)) = {
 0x0d,9,
 0x0e,'~',
 0x15,'Q',
diff -Nurd simulavr-1.0.0.orig/examples/atmel_key/StdDefs.h simulavr-1.0.0-test2/examples/atmel_key/StdDefs.h
--- simulavr-1.0.0.orig/examples/atmel_key/StdDefs.h	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/atmel_key/StdDefs.h	2013-03-17 11:10:48.069999894 +0100
@@ -63,51 +63,51 @@
    #define UART_BAUD_REG_H      UBRR0H
    #define UART_CONTROL_REG     UCSR0B
    #define UART_STATUS_REG      UCSR0A
-   #define UART_RCV_INT_VECTOR  SIG_UART0_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART0_DATA
+   #define UART_RCV_INT_VECTOR  USART0_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  USART0_UDRE_vect
    #define UART_DATA_REG        UDR0
 #elif DEVICE_NAME == ATMEGA163
    #define UART_BAUD_REG        UBRR
    #define UART_CONTROL_REG     UCSRB
    #define UART_STATUS_REG      UCSRA
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect 
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #elif DEVICE_NAME == AT90S2313
    #define UART_BAUD_REG        UBRR
    #define UART_CONTROL_REG     UCR
    #define UART_STATUS_REG      USR
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #elif DEVICE_NAME == AT90S4433
    #define UART_BAUD_REG        UBRRL
    #define UART_CONTROL_REG     UCSRB
    #define UART_STATUS_REG      UCSRA
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #elif DEVICE_NAME == AT90S4434
    #define UART_BAUD_REG        UBRR
    #define UART_CONTROL_REG     UCR
    #define UART_STATUS_REG      USR
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #elif DEVICE_NAME == AT90S8515
    #define UART_BAUD_REG        UBRR
    #define UART_CONTROL_REG     UCR
    #define UART_STATUS_REG      USR
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #else
    // Defaults to AT90S2313
    #define UART_BAUD_REG        UBRR
    #define UART_CONTROL_REG     UCR
    #define UART_STATUS_REG      USR
-   #define UART_RCV_INT_VECTOR  SIG_UART_RECV
-   #define UART_REG_EMPTY_INT_VECTOR  SIG_UART_DATA
+   #define UART_RCV_INT_VECTOR  UART_RX_vect
+   #define UART_REG_EMPTY_INT_VECTOR  UART_UDRE_vect
    #define UART_DATA_REG        UDR
 #endif
 
diff -Nurd simulavr-1.0.0.orig/examples/python/example.c simulavr-1.0.0-test2/examples/python/example.c
--- simulavr-1.0.0.orig/examples/python/example.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/python/example.c	2013-03-17 11:50:42.496438805 +0100
@@ -4,7 +4,7 @@
 volatile int timer2_ticks;
 
 /* Every ~ms */
-ISR(SIG_OUTPUT_COMPARE2) {
+ISR(TIMER2_COMP_vect) {
    timer2_ticks++;
 }
 
diff -Nurd simulavr-1.0.0.orig/examples/python/example_io.c simulavr-1.0.0-test2/examples/python/example_io.c
--- simulavr-1.0.0.orig/examples/python/example_io.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/python/example_io.c	2013-03-17 11:37:25.051130782 +0100
@@ -5,7 +5,7 @@
 volatile int port_val;
 volatile int port_cnt;
 
-ISR(SIG_OUTPUT_COMPARE2) {
+ISR(TIMER2_COMP_vect) {
    timer2_ticks++;
 }
 
diff -Nurd simulavr-1.0.0.orig/examples/python/ex_pinout.c simulavr-1.0.0-test2/examples/python/ex_pinout.c
--- simulavr-1.0.0.orig/examples/python/ex_pinout.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/python/ex_pinout.c	2013-03-17 11:38:01.518014715 +0100
@@ -3,7 +3,7 @@
 
 volatile int timer2_ticks;
 
-ISR(SIG_OUTPUT_COMPARE2) {
+ISR(TIMER2_COMP_vect) {
    timer2_ticks++;
 }
 
diff -Nurd simulavr-1.0.0.orig/examples/python/multicore.c simulavr-1.0.0-test2/examples/python/multicore.c
--- simulavr-1.0.0.orig/examples/python/multicore.c	2012-02-12 16:26:38.000000000 +0100
+++ simulavr-1.0.0-test2/examples/python/multicore.c	2013-03-17 11:50:33.016235615 +0100
@@ -11,7 +11,7 @@
 volatile char cnt_irq = 0;         // IRQ counter
 volatile char cnt_res = 0;         // measurement value for time distance between events
 
-ISR(SIG_INTERRUPT0) {
+ISR(TIMER2_COMP_vect) {
   cnt_irq++;                       // increment event counter
   cnt_res = TCNT0;                 // save timer value = time distance to last event
   TCNT0 = 0;                       // reset timer value

Places

File new-avr-gcc-fix of Package simulavr (Revision c74b57133889892f594c2230cefe7e0f)

Places