Diff: INIT.cpp

Revision:

24:fca9bb26ca15

Parent:

23:5c45c21f36b7

Child:

25:aa4d92532e46

--- a/INIT.cpp	Wed Jul 25 22:27:49 2012 +0000
+++ b/INIT.cpp	Thu Nov 22 09:38:19 2012 +0000
@@ -37,13 +37,15 @@
     _base = LPC_USART;
     
 #else    
-    switch(_uidx) {
+   
+    switch(_serial.index) {
         case 0:   _base = LPC_UART0; break;
         case 1:   _base = LPC_UART1; break;
         case 2:   _base = LPC_UART2; break;
         case 3:   _base = LPC_UART3; break;
         default : _base = NULL;      break;
     }
+
 #endif
     
     dmaSendChannel  = -1;
@@ -56,7 +58,7 @@
         buffer_out[RxIrq]      = 0;
         buffer_count[RxIrq]    = 0;
         buffer_overflow[RxIrq] = 0;
-        Serial::attach(this, &MODSERIAL::isr_rx, Serial::RxIrq);        
+        Serial::attach(this, &MODSERIAL::isr_rx, (SerialIrq)RxIrq);        
         
         buffer_size[TxIrq]     = txSize;
         buffer[TxIrq]          = txSize > 0 ? (char *)malloc(buffer_size[TxIrq]) : (char *)NULL;
@@ -64,7 +66,7 @@
         buffer_out[TxIrq]      = 0;
         buffer_count[TxIrq]    = 0;
         buffer_overflow[TxIrq] = 0;
-        Serial::attach(this, &MODSERIAL::isr_tx, Serial::TxIrq);
+        Serial::attach(this, &MODSERIAL::isr_tx, (SerialIrq)TxIrq);
     }
     else {
         error("MODSERIAL must have a defined UART to function.");