From b1d77bf4bc7fb6e89b5280d99f401caa50c8a0d8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 19 Jan 2009 20:56:24 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@648
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/MSP430-MSP430x1611-GCC/board.c | 2 +-
 ports/MSP430/chcore.h                | 2 +-
 ports/MSP430/msp430_serial.c         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index 51a50afb0..c10e73172 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -85,7 +85,7 @@ void hwinit(void) {
   InitSerial();
 }
 
-CH_IRQ_HANDLER(TIMERA0_VECTOR) tmr0irq(void) {
+CH_IRQ_HANDLER(TIMERA0_VECTOR) {
 
   CH_IRQ_PROLOGUE();
 
diff --git a/ports/MSP430/chcore.h b/ports/MSP430/chcore.h
index ee184be53..1111118d7 100644
--- a/ports/MSP430/chcore.h
+++ b/ports/MSP430/chcore.h
@@ -157,7 +157,7 @@ struct context {
 /**
  * IRQ handler function modifier.
  */
-#define PORT_IRQ_HANDLER(id) interrupt void id(void)
+#define PORT_IRQ_HANDLER(id) interrupt(id) _vect_##id(void)
 
 /**
  * This function is empty in this port.
diff --git a/ports/MSP430/msp430_serial.c b/ports/MSP430/msp430_serial.c
index 58a44a076..81ef18c54 100644
--- a/ports/MSP430/msp430_serial.c
+++ b/ports/MSP430/msp430_serial.c
@@ -44,7 +44,7 @@ FullDuplexDriver COM1;
 static uint8_t ib1[SERIAL_BUFFERS_SIZE];
 static uint8_t ob1[SERIAL_BUFFERS_SIZE];
 
-CH_IRQ_HANDLER(USART0TX_VECTOR) u0txirq(void) {
+CH_IRQ_HANDLER(USART0TX_VECTOR) {
   msg_t b;
 
   CH_IRQ_PROLOGUE();
@@ -60,7 +60,7 @@ CH_IRQ_HANDLER(USART0TX_VECTOR) u0txirq(void) {
   CH_IRQ_EPILOGUE();
 }
 
-CH_IRQ_HANDLER(USART0RX_VECTOR) u0rxirq(void) {
+CH_IRQ_HANDLER(USART0RX_VECTOR) {
   uint8_t urctl;
 
   CH_IRQ_PROLOGUE();
@@ -116,7 +116,7 @@ FullDuplexDriver COM2;
 static uint8_t ib2[SERIAL_BUFFERS_SIZE];
 static uint8_t ob2[SERIAL_BUFFERS_SIZE];
 
-CH_IRQ_HANDLER(USART1TX_VECTOR) u1txirq(void) {
+CH_IRQ_HANDLER(USART1TX_VECTOR) {
   msg_t b;
 
   CH_IRQ_PROLOGUE();
@@ -132,7 +132,7 @@ CH_IRQ_HANDLER(USART1TX_VECTOR) u1txirq(void) {
   CH_IRQ_EPILOGUE();
 }
 
-CH_IRQ_HANDLER(USART1RX_VECTOR) u1rxirq(void) {
+CH_IRQ_HANDLER(USART1RX_VECTOR) {
   uint8_t urctl;
 
   CH_IRQ_PROLOGUE();