Diff: MODSERIAL.cpp

Revision:

23:1236d0b64e71

Parent:

18:21ef26402365

--- a/MODSERIAL.cpp	Thu Apr 19 20:47:46 2012 +0000
+++ b/MODSERIAL.cpp	Fri Jul 13 01:09:23 2012 +0000
@@ -1,128 +1,128 @@
-/*
-    Copyright (c) 2010 Andy Kirkham
- 
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
- 
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
- 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-    
-    @file          MODSERIAL.h 
-    @purpose       Extends Serial to provide fully buffered IO
-    @version       1.6
-    @date          Nov 2010
-    @author        Andy Kirkham    
-*/
-
-#include "MODSERIAL.h"
-#include "MACROS.h"
-
-namespace AjK {
-
-MODSERIAL::MODSERIAL(PinName tx, PinName rx, const char *name) : Serial(tx, rx, name)
-{
-    init(MODSERIAL_DEFAULT_TX_BUFFER_SIZE, MODSERIAL_DEFAULT_RX_BUFFER_SIZE);
-}
-
-MODSERIAL::MODSERIAL(PinName tx, PinName rx, int bufferSize, const char *name) : Serial(tx, rx, name)
-{
-    init(bufferSize, bufferSize);
-}
-
-MODSERIAL::MODSERIAL(PinName tx, PinName rx, int txSize, int rxSize, const char *name) : Serial(tx, rx, name)
-{
-    init(txSize, rxSize);
-}
-
-MODSERIAL::~MODSERIAL()
-{
-    disableIrq();
-    if (buffer[0] != NULL) free((char *)buffer[0]);
-    if (buffer[1] != NULL) free((char *)buffer[1]);    
-}
-
-bool 
-MODSERIAL::txBufferFull(void) 
-{ 
-    return MODSERIAL_TX_BUFFER_FULL; 
-}
-
-bool 
-MODSERIAL::rxBufferFull(void) 
-{ 
-    return MODSERIAL_RX_BUFFER_FULL; 
-}
-
-bool 
-MODSERIAL::txBufferEmpty(void) 
-{ 
-    return MODSERIAL_TX_BUFFER_EMPTY; 
-}
-
-bool 
-MODSERIAL::rxBufferEmpty(void) 
-{ 
-    return MODSERIAL_RX_BUFFER_EMPTY; 
-}
-
-bool 
-MODSERIAL::txIsBusy(void) 
-{ 
-    return (_LSR & (3UL << 5) == 0) ? true : false; 
-} 
-
-void
-MODSERIAL::disableIrq(void)
-{
-    switch(_uidx) {
-        case 0:   NVIC_DisableIRQ(UART0_IRQn); break;
-        case 1:   NVIC_DisableIRQ(UART1_IRQn); break;
-        case 2:   NVIC_DisableIRQ(UART2_IRQn); break;
-        case 3:   NVIC_DisableIRQ(UART3_IRQn); break;
-    }
-}
-
-void
-MODSERIAL::enableIrq(void)
-{
-    switch(_uidx) {
-        case 0:   NVIC_EnableIRQ(UART0_IRQn); break;
-        case 1:   NVIC_EnableIRQ(UART1_IRQn); break;
-        case 2:   NVIC_EnableIRQ(UART2_IRQn); break;
-        case 3:   NVIC_EnableIRQ(UART3_IRQn); break;
-    }
-}
-
-int 
-MODSERIAL::rxDiscardLastChar(void)
-{
-    // This function can only be called indirectly from
-    // an rxCallback function. Therefore, we know we 
-    // just placed a char into the buffer.
-    char c = buffer[RxIrq][buffer_in[RxIrq]];
-    
-    if (buffer_count[RxIrq]) {        
-        buffer_count[RxIrq]--;
-        buffer_in[RxIrq]--;
-        if (buffer_in[RxIrq] < 0) {
-            buffer_in[RxIrq] = buffer_size[RxIrq] - 1;
-        }
-    }
-    
-    return (int)c;
-}
-
-
-}; // namespace AjK ends
+/*
+    Copyright (c) 2010 Andy Kirkham
+ 
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+ 
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+ 
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+    
+    @file          MODSERIAL.h 
+    @purpose       Extends Serial to provide fully buffered IO
+    @version       1.6
+    @date          Nov 2010
+    @author        Andy Kirkham    
+*/
+
+#include "MODSERIAL.h"
+#include "MACROS.h"
+
+namespace AjK {
+
+MODSERIAL::MODSERIAL(PinName tx, PinName rx, const char *name) : Serial(tx, rx, name)
+{
+    init(MODSERIAL_DEFAULT_TX_BUFFER_SIZE, MODSERIAL_DEFAULT_RX_BUFFER_SIZE);
+}
+
+MODSERIAL::MODSERIAL(PinName tx, PinName rx, int bufferSize, const char *name) : Serial(tx, rx, name)
+{
+    init(bufferSize, bufferSize);
+}
+
+MODSERIAL::MODSERIAL(PinName tx, PinName rx, int txSize, int rxSize, const char *name) : Serial(tx, rx, name)
+{
+    init(txSize, rxSize);
+}
+
+MODSERIAL::~MODSERIAL()
+{
+    disableIrq();
+    if (buffer[0] != NULL) free((char *)buffer[0]);
+    if (buffer[1] != NULL) free((char *)buffer[1]);    
+}
+
+bool 
+MODSERIAL::txBufferFull(void) 
+{ 
+    return MODSERIAL_TX_BUFFER_FULL; 
+}
+
+bool 
+MODSERIAL::rxBufferFull(void) 
+{ 
+    return MODSERIAL_RX_BUFFER_FULL; 
+}
+
+bool 
+MODSERIAL::txBufferEmpty(void) 
+{ 
+    return MODSERIAL_TX_BUFFER_EMPTY; 
+}
+
+bool 
+MODSERIAL::rxBufferEmpty(void) 
+{ 
+    return MODSERIAL_RX_BUFFER_EMPTY; 
+}
+
+bool 
+MODSERIAL::txIsBusy(void) 
+{ 
+    return (_LSR & (3UL << 5) == 0) ? true : false; 
+} 
+
+void
+MODSERIAL::disableIrq(void)
+{
+    switch(_uidx) {
+        case 0:   NVIC_DisableIRQ(UART0_IRQn); break;
+        case 1:   NVIC_DisableIRQ(UART1_IRQn); break;
+        case 2:   NVIC_DisableIRQ(UART2_IRQn); break;
+        case 3:   NVIC_DisableIRQ(UART3_IRQn); break;
+    }
+}
+
+void
+MODSERIAL::enableIrq(void)
+{
+    switch(_uidx) {
+        case 0:   NVIC_EnableIRQ(UART0_IRQn); break;
+        case 1:   NVIC_EnableIRQ(UART1_IRQn); break;
+        case 2:   NVIC_EnableIRQ(UART2_IRQn); break;
+        case 3:   NVIC_EnableIRQ(UART3_IRQn); break;
+    }
+}
+
+int 
+MODSERIAL::rxDiscardLastChar(void)
+{
+    // This function can only be called indirectly from
+    // an rxCallback function. Therefore, we know we 
+    // just placed a char into the buffer.
+    char c = buffer[RxIrq][buffer_in[RxIrq]];
+    
+    if (buffer_count[RxIrq]) {        
+        buffer_count[RxIrq]--;
+        buffer_in[RxIrq]--;
+        if (buffer_in[RxIrq] < 0) {
+            buffer_in[RxIrq] = buffer_size[RxIrq] - 1;
+        }
+    }
+    
+    return (int)c;
+}
+
+
+}; // namespace AjK ends