From e2b6b440e12562804f161d8db677554bbd666bd1 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 10 Jan 2009 16:21:27 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@612 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- ports/ARM7-AT91SAM7X/sam7x_emac.c | 6 ++++-- ports/ARM7-AT91SAM7X/sam7x_serial.c | 12 ++++++++---- ports/ARM7-LPC214x/lpc214x_serial.c | 12 ++++++++---- ports/ARMCM3-STM32F103/stm32_serial.c | 24 +++++++++++++++--------- ports/ARMCM3/chcore.c | 8 +++++--- ports/AVR/avr_serial.c | 24 ++++++++++++------------ ports/AVR/chcore.h | 10 +++++++++- ports/MSP430/chcore.h | 10 +++++++++- ports/MSP430/msp430_serial.c | 25 ++++++++++++------------- 9 files changed, 82 insertions(+), 49 deletions(-) (limited to 'ports') diff --git a/ports/ARM7-AT91SAM7X/sam7x_emac.c b/ports/ARM7-AT91SAM7X/sam7x_emac.c index 47de8650e..05701b369 100644 --- a/ports/ARM7-AT91SAM7X/sam7x_emac.c +++ b/ports/ARM7-AT91SAM7X/sam7x_emac.c @@ -126,9 +126,11 @@ static void ServeInterrupt(void) { CH_IRQ_HANDLER void EMACIrqHandler(void) { - chSysIRQEnterI(); + CH_IRQ_PROLOGUE(); + ServeInterrupt(); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /* diff --git a/ports/ARM7-AT91SAM7X/sam7x_serial.c b/ports/ARM7-AT91SAM7X/sam7x_serial.c index 58a275439..023b98527 100644 --- a/ports/ARM7-AT91SAM7X/sam7x_serial.c +++ b/ports/ARM7-AT91SAM7X/sam7x_serial.c @@ -76,16 +76,20 @@ static void ServeInterrupt(AT91PS_USART u, FullDuplexDriver *com) { CH_IRQ_HANDLER void USART0IrqHandler(void) { - chSysIRQEnterI(); + CH_IRQ_PROLOGUE(); + ServeInterrupt(AT91C_BASE_US0, &COM1); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } CH_IRQ_HANDLER void USART1IrqHandler(void) { - chSysIRQEnterI(); + CH_IRQ_PROLOGUE(); + ServeInterrupt(AT91C_BASE_US1, &COM2); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /* diff --git a/ports/ARM7-LPC214x/lpc214x_serial.c b/ports/ARM7-LPC214x/lpc214x_serial.c index 38eae3169..ececd30c4 100644 --- a/ports/ARM7-LPC214x/lpc214x_serial.c +++ b/ports/ARM7-LPC214x/lpc214x_serial.c @@ -111,18 +111,22 @@ static void ServeInterrupt(UART *u, FullDuplexDriver *com) { CH_IRQ_HANDLER void UART0IrqHandler(void) { - chSysIRQEnterI(); + CH_IRQ_PROLOGUE(); + ServeInterrupt(U0Base, &COM1); VICVectAddr = 0; - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } CH_IRQ_HANDLER void UART1IrqHandler(void) { - chSysIRQEnterI(); + CH_IRQ_PROLOGUE(); + ServeInterrupt(U1Base, &COM2); VICVectAddr = 0; - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } #ifdef FIFO_PRELOAD diff --git a/ports/ARMCM3-STM32F103/stm32_serial.c b/ports/ARMCM3-STM32F103/stm32_serial.c index 015084488..c17d7a56c 100644 --- a/ports/ARMCM3-STM32F103/stm32_serial.c +++ b/ports/ARMCM3-STM32F103/stm32_serial.c @@ -85,11 +85,13 @@ static void ServeInterrupt(USART_TypeDef *u, FullDuplexDriver *com) { /* * USART1 IRQ service routine. */ -SYS_IRQ_HANDLER void VectorD4(void) { +CH_IRQ_HANDLER void VectorD4(void) { + + CH_IRQ_PROLOGUE(); - chSysIRQEnterI(); ServeInterrupt(USART1, &COM1); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /* @@ -106,11 +108,13 @@ static void OutNotify1(void) { /* * USART2 IRQ service routine. */ -SYS_IRQ_HANDLER void VectorD8(void) { +CH_IRQ_HANDLER void VectorD8(void) { + + CH_IRQ_PROLOGUE(); - chSysIRQEnterI(); ServeInterrupt(USART2, &COM2); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /* @@ -127,11 +131,13 @@ static void OutNotify2(void) { /* * USART3 IRQ service routine. */ -SYS_IRQ_HANDLER void VectorDC(void) { +CH_IRQ_HANDLER void VectorDC(void) { + + CH_IRQ_PROLOGUE(); - chSysIRQEnterI(); ServeInterrupt(USART3, &COM3); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /* diff --git a/ports/ARMCM3/chcore.c b/ports/ARMCM3/chcore.c index a6871d701..f3e15238d 100644 --- a/ports/ARMCM3/chcore.c +++ b/ports/ARMCM3/chcore.c @@ -65,13 +65,15 @@ void threadstart(void) { * This interrupt is used as system tick. * @note The timer is initialized in the board setup code. */ -SYS_IRQ_HANDLER void SysTickVector(void) { +CH_IRQ_HANDLER void SysTickVector(void) { + + CH_IRQ_PROLOGUE(); - chSysIRQEnterI(); chSysLockI(); chSysTimerHandlerI(); chSysUnlockI(); - chSysIRQExitI(); + + CH_IRQ_EPILOGUE(); } /** diff --git a/ports/AVR/avr_serial.c b/ports/AVR/avr_serial.c index f60cfb4e6..628067e83 100644 --- a/ports/AVR/avr_serial.c +++ b/ports/AVR/avr_serial.c @@ -40,10 +40,10 @@ FullDuplexDriver SER1; static uint8_t ib1[SERIAL_BUFFERS_SIZE]; static uint8_t ob1[SERIAL_BUFFERS_SIZE]; -SYS_IRQ_HANDLER(USART0_RX_vect) { +CH_IRQ_HANDLER(USART0_RX_vect) { uint8_t sra; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); sra = UCSR0A; if (sra & ((1 << DOR) | (1 << UPE) | (1 << FE))) @@ -52,13 +52,13 @@ SYS_IRQ_HANDLER(USART0_RX_vect) { chFDDIncomingDataI(&SER1, UDR0); chSysUnlockI(); - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } -SYS_IRQ_HANDLER(USART0_UDRE_vect) { +CH_IRQ_HANDLER(USART0_UDRE_vect) { msg_t b; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); chSysLockI(); b = chFDDRequestDataI(&SER1); @@ -68,7 +68,7 @@ SYS_IRQ_HANDLER(USART0_UDRE_vect) { else UDR0 = b; - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } /* @@ -99,10 +99,10 @@ FullDuplexDriver SER2; static uint8_t ib2[SERIAL_BUFFERS_SIZE]; static uint8_t ob2[SERIAL_BUFFERS_SIZE]; -SYS_IRQ_HANDLER(USART1_RX_vect) { +CH_IRQ_HANDLER(USART1_RX_vect) { uint8_t sra; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); sra = UCSR1A; if (sra & ((1 << DOR) | (1 << UPE) | (1 << FE))) @@ -111,13 +111,13 @@ SYS_IRQ_HANDLER(USART1_RX_vect) { chFDDIncomingDataI(&SER2, UDR1); chSysUnlockI(); - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } -SYS_IRQ_HANDLER(USART1_UDRE_vect) { +CH_IRQ_HANDLER(USART1_UDRE_vect) { msg_t b; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); chSysLockI(); b = chFDDRequestDataI(&SER2); @@ -127,7 +127,7 @@ SYS_IRQ_HANDLER(USART1_UDRE_vect) { else UDR1 = b; - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } /* diff --git a/ports/AVR/chcore.h b/ports/AVR/chcore.h index 6bb420a5d..b967cb9a0 100644 --- a/ports/AVR/chcore.h +++ b/ports/AVR/chcore.h @@ -208,10 +208,18 @@ asm ("" : : : "r18", "r19", "r20", "r21", "r22", "r23", "r24", \ */ #define sys_enable_from_isr() -#if ENABLE_WFI_IDLE != 0 +/** + * Disables all the interrupt sources, even those having a priority higher + * to the kernel. + * In this port it is no different than sys_disable() because the simple + * interrupt handling + */ +#define sys_disable_all() sys_disable() + /** * This port function is implemented as inlined code for performance reasons. */ +#if ENABLE_WFI_IDLE != 0 #define sys_wait_for_interrupt() { \ asm volatile ("sleep"); \ } diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h index 7f27c3f8b..b090cffba 100644 --- a/ports/MSP430/chcore.h +++ b/ports/MSP430/chcore.h @@ -176,10 +176,18 @@ if (chSchRescRequiredI()) \ */ #define sys_enable_from_isr() -#if ENABLE_WFI_IDLE != 0 +/** + * Disables all the interrupt sources, even those having a priority higher + * to the kernel. + * In this port it is no different than sys_disable() because the simple + * interrupt handling + */ +#define sys_disable_all() sys_disable() + /** * This port function is implemented as inlined code for performance reasons. */ +#if ENABLE_WFI_IDLE != 0 #define sys_wait_for_interrupt() { \ asm volatile ("wfi"); \ } diff --git a/ports/MSP430/msp430_serial.c b/ports/MSP430/msp430_serial.c index 27094edeb..58a44a076 100644 --- a/ports/MSP430/msp430_serial.c +++ b/ports/MSP430/msp430_serial.c @@ -44,10 +44,10 @@ FullDuplexDriver COM1; static uint8_t ib1[SERIAL_BUFFERS_SIZE]; static uint8_t ob1[SERIAL_BUFFERS_SIZE]; -SYS_IRQ_HANDLER(USART0TX_VECTOR) u0txirq(void) { +CH_IRQ_HANDLER(USART0TX_VECTOR) u0txirq(void) { msg_t b; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); chSysLockI(); b = chFDDRequestDataI(&COM1); @@ -57,13 +57,13 @@ SYS_IRQ_HANDLER(USART0TX_VECTOR) u0txirq(void) { else U0TXBUF = b; - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } -SYS_IRQ_HANDLER(USART0RX_VECTOR) u0rxirq(void) { +CH_IRQ_HANDLER(USART0RX_VECTOR) u0rxirq(void) { uint8_t urctl; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); if ((urctl = U0RCTL) & RXERR) SetError(urctl, &COM1); @@ -71,7 +71,7 @@ SYS_IRQ_HANDLER(USART0RX_VECTOR) u0rxirq(void) { chFDDIncomingDataI(&COM1, U0RXBUF); chSysUnlockI(); - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } /* @@ -116,10 +116,10 @@ FullDuplexDriver COM2; static uint8_t ib2[SERIAL_BUFFERS_SIZE]; static uint8_t ob2[SERIAL_BUFFERS_SIZE]; -SYS_IRQ_HANDLER(USART1TX_VECTOR) u1txirq(void) { +CH_IRQ_HANDLER(USART1TX_VECTOR) u1txirq(void) { msg_t b; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); chSysLockI(); b = chFDDRequestDataI(&COM2); @@ -129,13 +129,13 @@ SYS_IRQ_HANDLER(USART1TX_VECTOR) u1txirq(void) { else U1TXBUF = b; - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } -SYS_IRQ_HANDLER(USART1RX_VECTOR) u1rxirq(void) { +CH_IRQ_HANDLER(USART1RX_VECTOR) u1rxirq(void) { uint8_t urctl; - SYS_IRQ_PROLOGUE(); + CH_IRQ_PROLOGUE(); if ((urctl = U1RCTL) & RXERR) SetError(urctl, &COM2); @@ -143,10 +143,9 @@ SYS_IRQ_HANDLER(USART1RX_VECTOR) u1rxirq(void) { chFDDIncomingDataI(&COM2, U1RXBUF); chSysUnlockI(); - SYS_IRQ_EPILOGUE(); + CH_IRQ_EPILOGUE(); } - /* * Invoked by the high driver when one or more bytes are inserted in the * output queue. -- cgit v1.2.3