Diff: iSerial.cpp

Revision:

5:d83fc550ccbc

Parent:

4:b38ef9675d39

Child:

6:8d4b95b90c3b

diff -r b38ef9675d39 -r d83fc550ccbc iSerial.cpp
--- a/iSerial.cpp	Mon Sep 03 09:15:34 2012 +0000
+++ b/iSerial.cpp	Mon Sep 03 11:18:05 2012 +0000
@@ -10,19 +10,40 @@
 #include "iSerial.h"
 
 
-
-#if defined(TARGET_LPC1768)
+//DigitalOut led1(LED1);
 
-//  UART1 = p9, p10
-
-    #define UART_IRQn   UART2_IRQn
 
-#elif defined(TARGET_LPC11U24)
+void
+iSerial::enable_uart_irq(void)
+{
+    switch(tx){
+    case USBTX:
+        #if defined(TARGET_LPC1768)
+            NVIC_EnableIRQ(UART2_IRQn);
+        #elif defined(TARGET_LPC11U24)
+            NVIC_EnableIRQ(UART_IRQn);
+        #endif
+//        led1 = !led1;
+        break;
+        
+    case p9:
+        #if defined(TARGET_LPC1768)
+            NVIC_EnableIRQ(UART1_IRQn);
+        #elif defined(TARGET_LPC11U24)
+            NVIC_EnableIRQ(UART_IRQn);
+        #endif
+        break;
 
-    #define UART_IRQn   UART_IRQn
-
-#endif
-
+    #if defined(TARGET_LPC1768)
+    case p13:
+        NVIC_EnableIRQ(UART3_IRQn);
+        break;
+    case p28:
+        NVIC_EnableIRQ(UART0_IRQn);
+        break;
+    #endif
+    }
+}
 
 
 /*
@@ -34,8 +55,7 @@
     if(Serial::readable()){
         rxbuf.save(Serial::getc());
     }
-
-    NVIC_EnableIRQ(UART_IRQn); // UART1_IRQn);
+    enable_uart_irq();
 }
 
 void
@@ -46,16 +66,18 @@
             Serial::putc( txbuf.read() );
         }
     }
-    NVIC_EnableIRQ(UART_IRQn); // UART1_IRQn);
+    enable_uart_irq();
 }
 
 iSerial::iSerial(PinName _tx, PinName _rx, const char *_name, int _txbufsize, int _rxbufsize)
 :   Serial(_tx, _rx, _name),
+    tx(_tx),
+    rx(_rx),
     txbufsize(_txbufsize),
     rxbufsize(_rxbufsize),
     txbuf(RingBuffer(txbufsize)),
     rxbuf(RingBuffer(rxbufsize)),
-    str(new char [txbufsize])
+    str(new char [txbufsize])    
 {
     __disable_irq();
 
@@ -66,7 +88,7 @@
 //  baud(baudrate);
 
     __enable_irq();
-    NVIC_EnableIRQ(UART_IRQn); // UART1_IRQn);
+    enable_uart_irq();    
 }
 
 iSerial::~iSerial()
@@ -100,7 +122,7 @@
     } else {
         while(txbuf.full());
         txbuf.save(ch);
-        NVIC_EnableIRQ(UART_IRQn); // UART1_IRQn);
+        enable_uart_irq();
     }
 }
 
@@ -136,5 +158,3 @@
 }
 
 
-
-