Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

use new nanming scheme of avrlibc for interrupt service routines

  • Loading branch information...
commit 88dd0b521a6420090ec14bb7b763645d4821afa0 1 parent c916e82
Erik Kunze eku authored
Showing with 47 additions and 52 deletions.
  1. +1 −1  hardware/camera/dc3840.c
  2. +3 −3 hardware/clock/dcf77/dcf77.c
  3. +1 −1  hardware/i2c/slave/i2c_slave.c
  4. +1 −1  hardware/input/ps2/ps2.c
  5. +1 −1  hardware/ir/rc5/rc5.c
  6. +2 −2 hardware/pwm/pwm_servo.c
  7. +2 −2 hardware/radio/rfm12/ask_sense.c
  8. +3 −3 hardware/radio/rfm12/rfm12.c
  9. +1 −1  hardware/sms/sms.c
  10. +2 −2 mcuf/ledmatrixint.c
  11. +1 −1  mcuf/ledmatrixint.h
  12. +1 −1  mcuf/mcuf.c
  13. +0 −5 pinning/internals/hackery_atmega168p.m4
  14. +9 −9 pinning/internals/header.m4
  15. +1 −1  protocols/dmx/dmx.c
  16. +2 −2 protocols/ecmd/via_usart/ecmd_usart.c
  17. +1 −1  protocols/fnordlicht/fnordlicht_servo.c
  18. +2 −2 protocols/modbus/modbus.c
  19. +1 −1  protocols/msr1/msr1.c
  20. +1 −1  protocols/nmea/nmea.c
  21. +1 −1  protocols/serial_line_log/serial_line_log.c
  22. +1 −1  protocols/to1/to1.c
  23. +1 −1  protocols/usb/usbconfig.h
  24. +1 −1  protocols/usb/usbdrv/usbconfig-prototype.h
  25. +1 −1  protocols/usb/usbdrv/usbdrvasm.S
  26. +2 −2 protocols/yport/yport.c
  27. +2 −2 protocols/zbus/zbus.c
  28. +2 −2 services/clock/clock.c
2  hardware/camera/dc3840.c
View
@@ -322,7 +322,7 @@ parse_cmd_dc3840_zoom (char *cmd, char *output, uint16_t len)
#endif /* ECMD_PARSER_SUPPORT */
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
uint8_t temp = usart (UDR);
6 hardware/clock/dcf77/dcf77.c
View
@@ -109,10 +109,10 @@ uint32_t compute_dcf77_timestamp() {
return timestamp;
}
-#ifdef DCF77_vect
-SIGNAL (DCF77_vect)
+#ifdef DCF77_VECTOR
+ISR (DCF77_VECTOR)
#else
-SIGNAL (SIG_COMPARATOR)
+ISR (ANALOG_COMP_vect)
#endif
{
uint8_t TCNT2temp = TCNT2;
2  hardware/i2c/slave/i2c_slave.c
View
@@ -105,7 +105,7 @@ void i2c_slave_core_newdata(void)
/* Interruptroutine des TWI
*/
-SIGNAL (SIG_2WIRE_SERIAL)
+ISR (TWI_vect)
{
switch (TWSR & 0xF8){
2  hardware/input/ps2/ps2.c
View
@@ -250,7 +250,7 @@ decode_key(uint8_t keycode)
}
}
-SIGNAL(PS2_vect)
+ISR(PS2_VECTOR)
{
if (! PIN_HIGH(PS2_CLOCK)) {
/* Start the timeout to 20ms - 40ms */
2  hardware/ir/rc5/rc5.c
View
@@ -339,7 +339,7 @@ void rc5_process(void)
}
}
-ISR(RC5_INT_SIGNAL)
+ISR(RC5_INT_VECTOR)
{
if (rc5_global.enabled && !rc5_global.temp_disable) {
4 hardware/pwm/pwm_servo.c
View
@@ -49,11 +49,11 @@ uint8_t pwm_servo_enabled = 0;
/************************************************************************
- SIGNAL(SIG_OVERFLOWx)
+ ISR(TIMERx_OVF_vect)
timer interrupt, generates the high and low pulses for each servo
***************************************************************************/
-SIGNAL(SIG_OVERFLOW1)
+ISR(TIMER1_OVF_vect)
{
static uint8_t servoindex_half=0;
if (pwm_servo_enabled==1) {
4 hardware/radio/rfm12/ask_sense.c
View
@@ -159,7 +159,7 @@ rfm12_ask_sense_start (void)
/* Initialize Timer0, prescaler 1/256 */
TC0_PRESCALER_256;
- TC0_INT_COMPARE_ON;
+ TC0_INT_OVERFLOW_ON;
/* Initialize Interrupt */
_EIMSK |= _BV (RFM12_ASKINT_PIN);
@@ -214,7 +214,7 @@ ISR (TC0_VECTOR_OVERFLOW)
}
-ISR (RFM12_ASKINT_SIGNAL)
+ISR (RFM12_ASKINT_VECTOR)
{
uint8_t ts = TC0_COUNTER_CURRENT; /* Get current timestamp. */
uint8_t delta = DELTA (ts, last_noise_ts);
6 hardware/radio/rfm12/rfm12.c
View
@@ -55,12 +55,12 @@ uint8_t rfm12_drssi = RSSI_79;
static void rfm12_txstart_hard (void);
-#ifdef RFM12_INT_SIGNAL
-SIGNAL(RFM12_INT_SIGNAL)
+#ifdef RFM12_INT_VECTOR
+ISR(RFM12_INT_VECTOR)
#elif defined(RFM12_USE_POLL)
void rfm12_int_process(void)
#else
-ISR(RFM12_vect) /* PCINT */
+ISR(RFM12_VECTOR) /* PCINT */
#endif
{
#ifdef HAVE_RFM12_PCINT
2  hardware/sms/sms.c
View
@@ -73,7 +73,7 @@ generate_usart_init()
int noinline
my_uart_put (char d, FILE *stream);
-SIGNAL(usart(USART,_RX_vect)) {
+ISR(usart(USART,_RX_vect)) {
uint8_t data = usart(UDR);
static int8_t i = -1;
4 mcuf/ledmatrixint.c
View
@@ -77,7 +77,7 @@ void resync_led_display(void) {
//Verwende Variante mit 4Bit Farben (16 moegliche Farbtoene)
//4+24+19+(12+7+9)*16+7+5+4+27=538Takte pro Interrupt
-SIGNAL(SIG_OVERFLOW2) {
+ISR(TIMER2_OVF_vect) {
uint8_t gspalte;
uint8_t gtemp,gdbyte;
uint8_t gdurchlauf_t;
@@ -141,7 +141,7 @@ SIGNAL(SIG_OVERFLOW2) {
gdurchlauf_t = 3 nur die allerhellsten.
*/
-SIGNAL(SIG_OVERFLOW2) {
+ISR(TIMER2_OVF_vect) {
uint8_t gspalte;
uint8_t gtemp,gdbyte;
const uint8_t gdurchlauf_t = 1;
2  mcuf/ledmatrixint.h
View
@@ -108,6 +108,6 @@ extern uint8_t volatile gzeile; //Welche Zeile gerade behandelt wird
void init_led_display(void); //Initialisiert das LED Display
void resync_led_display(void); //kurz ein Reset bei eventuellen Fehlern
-//SIGNAL(SIG_OVERFLOW2); //Schreibt die Display Daten
+//ISR(TIMER2_OVF_vect); //Schreibt die Display Daten
#endif /* LEDMATRIXINT_H */
2  mcuf/mcuf.c
View
@@ -442,7 +442,7 @@ void tx_start(uint8_t len) {
}
#ifndef SOFT_UART_SUPPORT
-SIGNAL(usart(USART,_TX_vect)) {
+ISR(usart(USART,_TX_vect)) {
if (buffer.sent < buffer.len) {
usart(UDR) = buffer.data[buffer.sent++];
} else {
5 pinning/internals/hackery_atmega168p.m4
View
@@ -34,11 +34,6 @@
#define PD0 PORTD0
#endif
-#ifndef SIG_INTERRUPT0
-#define SIG_INTERRUPT0 INT0_vect
-#define SIG_INTERRUPT1 INT1_vect
-#endif
-
/* ATmega168 specific adjustments */
#define _SPCR0 SPCR
#define _SPE0 SPE
18 pinning/internals/header.m4
View
@@ -83,7 +83,7 @@ define(`RFM12_NO_INT', `dnl
define(`RFM12_USE_INT', `dnl
/* rfm12 module interrupt line */
#define RFM12_INT_PIN INT$1
-#define RFM12_INT_SIGNAL SIG_INTERRUPT$1
+#define RFM12_INT_VECTOR INT$1`_vect'
')
define(`RFM12_USE_PCINT', `dnl
@@ -103,13 +103,13 @@ dnl Configure pin-change-mask to monitor PCINTn and enable interrupt
PCICR &= ~_BV(_paste(PCIE, eval($1/8))); \
} while(0)
-#define RFM12_vect _paste3(PCINT, eval($1/8), _vect)
+#define RFM12_VECTOR _paste3(PCINT, eval($1/8), _vect)
')
define(`RC5_USE_INT', `dnl
/* rc5 interrupt line (TSOP Data out)*/
#define RC5_INT_PIN INT$1
-#define RC5_INT_SIGNAL SIG_INTERRUPT$1
+#define RC5_INT_VECTOR INT$1`_vect'
#define RC5_ISC0 ISC$1`0'
#define RC5_ISC1 ISC$1`1'
')
@@ -119,13 +119,13 @@ define(`RFM12_ASK_SENSE_USE_INT', `dnl
#define RFM12_ASKINT_PIN INT$1
#define RFM12_ASKINT_ISC _ISC($1,0)
#define RFM12_ASKINT_ISCMASK (_ISC($1,0) | _ISC($1,1))
-#define RFM12_ASKINT_SIGNAL SIG_INTERRUPT$1
+#define RFM12_ASKINT_VECTOR INT$1`_vect'
')
define(`USB_USE_INT', `dnl
/* usb interrupt line */
#define USB_INT_PIN INT$1
-#define USB_INT_SIGNAL SIG_INTERRUPT$1
+#define USB_INT_VECTOR INT$1`_vect'
#define USB_INTR_CFG_HACK(no) ((1 << ISC ## no ## 0) | (1 << ISC ## no ## 0))
#define USB_INTR_CFG_SET USB_INTR_CFG_HACK($1)
')
@@ -139,7 +139,7 @@ dnl Configure pin-change-mask to monitor PCINTn and enable interrupt
_paste(PCMSK, eval($1/8)) |= _BV(PCINT$1); \
PCICR |= _BV(_paste(PCIE, eval($1/8)));
-#define DCF77_vect _paste3(PCINT, eval($1/8), _vect)
+#define DCF77_VECTOR _paste3(PCINT, eval($1/8), _vect)
')
define(`DCF77_USE_INT', `dnl
@@ -150,7 +150,7 @@ pin(DCF1, $2, INPUT)
#define DCF77_INT_PIN INT$1
#define DCF77_INT_ISC _ISC($1,0)
#define DCF77_INT_ISCMASK (_ISC($1,0) | _ISC($1,1))
-#define DCF77_vect SIG_INTERRUPT$1
+#define DCF77_VECTOR INT$1`_vect'
')
define(`PS2_USE_PCINT', `dnl
@@ -162,7 +162,7 @@ dnl Configure pin-change-mask to monitor PCINTn and enable interrupt
_paste(PCMSK, eval($1/8)) |= _BV(PCINT$1); \
PCICR |= _BV(_paste(PCIE, eval($1/8)));
-#define PS2_vect _paste3(PCINT, eval($1/8), _vect)
+#define PS2_VECTOR _paste3(PCINT, eval($1/8), _vect)
')
define(`PS2_USE_INT', `dnl
@@ -173,7 +173,7 @@ pin(PS21, $2, INPUT)
#define PS2_INT_PIN INT$1
#define PS2_INT_ISC _ISC($1,0)
#define PS2_INT_ISCMASK (_ISC($1,0) | _ISC($1,1))
-#define PS2_vect SIG_INTERRUPT$1
+#define PS2_VECTOR INT$1`_vect'
')
define(`MOTORCURTAIN_PORT_RANGE', `dnl
2  protocols/dmx/dmx.c
View
@@ -190,7 +190,7 @@ dmx_periodic(void)
}
}
-SIGNAL(usart(USART,_TX_vect))
+ISR(usart(USART,_TX_vect))
{
/* Send the rest */
if(dmx_index < dmx_txlen) {
4 protocols/ecmd/via_usart/ecmd_usart.c
View
@@ -94,7 +94,7 @@ ecmd_serial_usart_periodic(void)
}
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE)))) {
@@ -123,7 +123,7 @@ SIGNAL(usart(USART,_RX_vect))
recv_buffer[recv_len++] = data;
}
-SIGNAL(usart(USART,_TX_vect))
+ISR(usart(USART,_TX_vect))
{
if (sent < write_len) {
while (!(usart(UCSR,A) & _BV(usart(UDRE))));
2  protocols/fnordlicht/fnordlicht_servo.c
View
@@ -56,7 +56,7 @@ fnordlicht_servo_init(void)
memset(flmmax,0xff, PWM_SERVOS);
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
uint8_t data = usart(UDR);
4 protocols/modbus/modbus.c
View
@@ -169,7 +169,7 @@ modbus_rxstart(uint8_t *data, uint8_t len, int16_t *recv_len) {
return 1;
}
-SIGNAL(usart(USART,_TX_vect))
+ISR(usart(USART,_TX_vect))
{
if (modbus_data.sent < modbus_data.len) {
usart(UDR) = modbus_data.data[modbus_data.sent++];
@@ -189,7 +189,7 @@ SIGNAL(usart(USART,_TX_vect))
}
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE)))) {
2  protocols/msr1/msr1.c
View
@@ -87,7 +87,7 @@ msr1_periodic(void)
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE)))) {
2  protocols/nmea/nmea.c
View
@@ -39,7 +39,7 @@ nmea_init(void)
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE))))
2  protocols/serial_line_log/serial_line_log.c
View
@@ -64,7 +64,7 @@ serial_line_log_periodic(void)
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE)))) {
2  protocols/to1/to1.c
View
@@ -68,7 +68,7 @@ to1_periodic(void)
if (to1_sensors[i].timeout) to1_sensors[i].timeout--;
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
if ((usart(UCSR,A) & _BV(usart(DOR))) || (usart(UCSR,A) & _BV(usart(FE)))) {
2  protocols/usb/usbconfig.h
View
@@ -383,6 +383,6 @@ section at the end of this file).
#define USB_INTR_ENABLE_BIT USB_INT_PIN
/* #define USB_INTR_PENDING GIFR */
#define USB_INTR_PENDING_BIT USB_INT_PIN
-#define USB_INTR_VECTOR USB_INT_SIGNAL
+#define USB_INTR_VECTOR USB_INT_VECTOR
#endif /* __usbconfig_h_included__ */
2  protocols/usb/usbdrv/usbconfig-prototype.h
View
@@ -352,6 +352,6 @@ section at the end of this file).
/* #define USB_INTR_ENABLE_BIT INT0 */
/* #define USB_INTR_PENDING GIFR */
/* #define USB_INTR_PENDING_BIT INTF0 */
-/* #define USB_INTR_VECTOR SIG_INTERRUPT0 */
+/* #define USB_INTR_VECTOR INT0_vect */
#endif /* __usbconfig_h_included__ */
2  protocols/usb/usbdrv/usbdrvasm.S
View
@@ -57,7 +57,7 @@ the file appropriate for the given clock rate.
#else /* __IAR_SYSTEMS_ASM__ */
# ifndef USB_INTR_VECTOR /* default to hardware interrupt INT0 */
-# define USB_INTR_VECTOR SIG_INTERRUPT0
+# define USB_INTR_VECTOR INT0_vect
# endif
.text
.global USB_INTR_VECTOR
4 protocols/yport/yport.c
View
@@ -79,7 +79,7 @@ yport_rxstart(uint8_t *data, uint16_t len)
}
-SIGNAL(usart(USART,_TX_vect))
+ISR(usart(USART,_TX_vect))
{
if (yport_send_buffer.sent < yport_send_buffer.len) {
usart(UDR) = yport_send_buffer.data[yport_send_buffer.sent++];
@@ -89,7 +89,7 @@ SIGNAL(usart(USART,_TX_vect))
}
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
while (usart(UCSR,A) & _BV(usart(RXC)))
{
4 protocols/zbus/zbus.c
View
@@ -183,7 +183,7 @@ zbus_core_periodic(void)
-SIGNAL(usart(USART,_TX_vect))
+ISR(usart(USART,_TX_vect))
{
#ifdef ZBUS_DEBUG
@@ -249,7 +249,7 @@ SIGNAL(usart(USART,_TX_vect))
}
}
-SIGNAL(usart(USART,_RX_vect))
+ISR(usart(USART,_RX_vect))
{
/* Ignore errors */
uint8_t flags = usart(UCSR,A);
4 services/clock/clock.c
View
@@ -88,9 +88,9 @@ clock_init (void)
#if defined(CLOCK_CRYSTAL_SUPPORT) || defined(CLOCK_CPU_SUPPORT)
#ifdef CLOCK_CPU_SUPPORT
-SIGNAL (TIMER1_OVF_vect)
+ISR (TIMER1_OVF_vect)
#else
-SIGNAL (CLOCK_SIG)
+ISR (CLOCK_SIG)
#endif
{
#ifdef CLOCK_CPU_SUPPORT
Please sign in to comment.
Something went wrong with that request. Please try again.