hendrik
/
wordclock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

replaced deprecated SIGNAL() and SIG_* macros to be compatible with avr-libc 1.8.0 and gcc 4.7.0

feature/2015
Christian Kroll 13 years ago
parent
d6e322a988
commit
6f084a5923
14 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      borg_hw/borg_hw_ancient.c
  2. 4
      borg_hw/borg_hw_andreborg.c
  3. 4
      borg_hw/borg_hw_borg16.c
  4. 2
      borg_hw/borg_hw_borg16_hgmod.c
  5. 2
      borg_hw/borg_hw_borg_ls.c
  6. 2
      borg_hw/borg_hw_borg_mh.c
  7. 2
      borg_hw/borg_hw_borg_mini.c
  8. 4
      borg_hw/borg_hw_gigaborg.c
  9. 2
      borg_hw/borg_hw_panel_one.c
  10. 2
      borg_hw/borg_hw_pd1165.c
  11. 2
      borg_hw/borg_hw_pingpong.c
  12. 2
      borg_hw/borg_hw_rotor.c
  13. 2
      can/can.c
  14. 4
      uart/uart.c

2
borg_hw/borg_hw_ancient.c
View File

@ -27,7 +27,7 @@
unsigned char pixmap[NUMPLANE][NUM_ROWS][LINEBYTES]; unsigned char pixmap[NUMPLANE][NUM_ROWS][LINEBYTES];
SIGNAL(SIG_OUTPUT_COMPARE0) ISR(TIMER0_COMP_vect)
{ {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

4
borg_hw/borg_hw_andreborg.c
View File

@ -37,7 +37,7 @@
#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__)
/* more ifdef magic :-( */ /* more ifdef magic :-( */
#define OCR0 OCR0A #define OCR0 OCR0A
#define SIG_OUTPUT_COMPARE0 SIG_OUTPUT_COMPARE0A #define TIMER0_COMP_vect TIMER0_COMPA_vect
#endif #endif
// buffer which holds the currently shown frame // buffer which holds the currently shown frame
@ -94,7 +94,7 @@ static void rowshow(unsigned char row, unsigned char plane) {
// depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or // depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL(SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

4
borg_hw/borg_hw_borg16.c
View File

@ -36,7 +36,7 @@
#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__)
/* more ifdef magic :-( */ /* more ifdef magic :-( */
#define OCR0 OCR0A #define OCR0 OCR0A
#define SIG_OUTPUT_COMPARE0 SIG_OUTPUT_COMPARE0A #define TIMER0_COMP_vect TIMER0_COMPA_vect
#endif #endif
// buffer which holds the currently shown frame // buffer which holds the currently shown frame
@ -128,7 +128,7 @@ static void rowshow(unsigned char row, unsigned char plane) {
// depending on the plane this interrupt triggers at 50 kHz, 31.25 kHz or // depending on the plane this interrupt triggers at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL(SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

2
borg_hw/borg_hw_borg16_hgmod.c
View File

@ -35,7 +35,7 @@
/* more ifdef magic :-( */ /* more ifdef magic :-( */
#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__)
#define OCR0 OCR0A #define OCR0 OCR0A
#define SIG_OUTPUT_COMPARE0 SIG_OUTPUT_COMPARE0A #define TIMER0_COMP_vect TIMER0_COMPA_vect
#endif #endif
// buffer which holds the currently shown frame // buffer which holds the currently shown frame

2
borg_hw/borg_hw_borg_ls.c
View File

@ -55,7 +55,7 @@ inline void rowshow(unsigned char row, unsigned char plane) {
} }
SIGNAL(SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

2
borg_hw/borg_hw_borg_mh.c
View File

@ -59,7 +59,7 @@ inline void rowshow(unsigned char row, unsigned char plane) {
// for(n=0;n<250;n++) asm ("nop"); // for(n=0;n<250;n++) asm ("nop");
} }
SIGNAL( SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
unsigned char row = 0; unsigned char row = 0;

2
borg_hw/borg_hw_borg_mini.c
View File

@ -113,7 +113,7 @@ inline void rowshow(unsigned char row, unsigned char plane){
extern uint8_t schmuh; extern uint8_t schmuh;
ISR(SIG_OVERFLOW0) ISR(TIMER0_OVF_vect)
{ {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

4
borg_hw/borg_hw_gigaborg.c
View File

@ -36,7 +36,7 @@
#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__)
/* more ifdef magic :-( */ /* more ifdef magic :-( */
#define OCR0 OCR0A #define OCR0 OCR0A
#define SIG_OUTPUT_COMPARE0 SIG_OUTPUT_COMPARE0A #define TIMER0_COMP_vect TIMER0_COMPA_vect
#endif #endif
@ -46,7 +46,7 @@ unsigned char pixmap[NUMPLANE][NUM_ROWS][LINEBYTES];
// depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or // depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL( SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
// reset watchdog // reset watchdog
wdt_reset(); wdt_reset();

2
borg_hw/borg_hw_panel_one.c
View File

@ -146,7 +146,7 @@ inline void checkkeys(uint8_t row){
// depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or // depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL(SIG_OUTPUT_COMPARE0) ISR(TIMER0_COMP_vect)
{ {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

2
borg_hw/borg_hw_pd1165.c
View File

@ -142,7 +142,7 @@ inline void rowshow(unsigned char row, unsigned char plane) {
// depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or // depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL(SIG_OUTPUT_COMPARE0) { ISR(TIMER0_COMP_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
unsigned char row = 0; unsigned char row = 0;

2
borg_hw/borg_hw_pingpong.c
View File

@ -67,7 +67,7 @@ static void rowshow(unsigned char row, unsigned char plane) {
// depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or // depending on the plane this interrupt gets triggered at 50 kHz, 31.25 kHz or
// 12.5 kHz // 12.5 kHz
SIGNAL(SIG_OVERFLOW0) { ISR(TIMER0_OVF0_vect) {
static unsigned char plane = 0; static unsigned char plane = 0;
static unsigned char row = 0; static unsigned char row = 0;

2
borg_hw/borg_hw_rotor.c
View File

@ -41,7 +41,7 @@ uint32_t akku;
unsigned char row = 0; unsigned char row = 0;
ISR(SIG_OUTPUT_COMPARE0) ISR(TIMER0_COMP_vect)
{ {
// reset watchdog // reset watchdog
wdt_reset(); wdt_reset();

2
can/can.c
View File

@ -205,7 +205,7 @@ unsigned char RX_HEAD=0;volatile unsigned char RX_TAIL=0;
unsigned char TX_HEAD= 0;volatile unsigned char TX_TAIL=0; unsigned char TX_HEAD= 0;volatile unsigned char TX_TAIL=0;
static volatile unsigned char TX_INT; static volatile unsigned char TX_INT;
SIGNAL(SIG_INTERRUPT0) { ISR(INT0_vect) {
unsigned char status = mcp_status(); unsigned char status = mcp_status();
if ( status & 0x01 ) { // Message in RX0 if ( status & 0x01 ) { // Message in RX0

4
uart/uart.c
View File

@ -28,7 +28,7 @@ volatile static char *volatile rxhead, *volatile rxtail;
volatile static char *volatile txhead, *volatile txtail; volatile static char *volatile txhead, *volatile txtail;
SIGNAL(SIG_UART_DATA) { ISR(USART_UDRE_vect) {
#ifdef UART_LEDS #ifdef UART_LEDS
PORTC ^= 0x01; PORTC ^= 0x01;
#endif #endif
@ -41,7 +41,7 @@ SIGNAL(SIG_UART_DATA) {
} }
} }
SIGNAL(SIG_UART_RECV) { ISR(USART_RXC_vect) {
int diff; int diff;
#ifdef UART_LEDS #ifdef UART_LEDS

Write Preview
Loading…
Cancel
Save