Diff: ArduinoSerial.h

Revision:

19:6c8b29734511

Parent:

18:37254b357abd

Child:

20:43451f36281e

--- a/ArduinoSerial.h	Wed Feb 04 09:07:22 2015 +0000
+++ b/ArduinoSerial.h	Wed Feb 04 09:28:28 2015 +0000
@@ -17,16 +17,14 @@
 
 class ArduinoSerial;
 
-typedef struct LinkedListNode{
+typedef struct ArduinoSerialLinkedNode{
     ArduinoSerial* data;
-    struct LinkedListNode *next;
-} LinkedListNode;
+    struct ArduinoSerialLinkedNode *next;
+} ArduinoSerialLinkedNode;
 
 class ArduinoSerial: public Serial, public Print
 {
 public:
-    
-    
     ArduinoSerial(PinName tx, PinName rx);
     
     virtual ~ArduinoSerial(void);
@@ -48,18 +46,18 @@
 
 private:
     static void uartIrqCallback(void);
-    static LinkedListNode *init_list_head_node(LinkedListNode *head);
-    static LinkedListNode *add_node_to_tail(LinkedListNode *head, ArduinoSerial* data);
-    static LinkedListNode *del_node_by_data(LinkedListNode *head, ArduinoSerial* data);
-    static LinkedListNode *find_node_by_data(LinkedListNode *head, ArduinoSerial* data);
+    static ArduinoSerialLinkedNode *initHeadNode(ArduinoSerialLinkedNode *head);
+    static ArduinoSerialLinkedNode *addNode(ArduinoSerialLinkedNode *head, ArduinoSerial* data);
+    static ArduinoSerialLinkedNode *delNode(ArduinoSerialLinkedNode *head, ArduinoSerial* data);
+    static ArduinoSerialLinkedNode *findNode(ArduinoSerialLinkedNode *head, ArduinoSerial* data);
     
-    static LinkedListNode list_head;
-    static unsigned int instance_counter;
+    static ArduinoSerialLinkedNode ms_list_head;
+    static unsigned int ms_instance_counter;
     
     void write_char(unsigned char c);
  
-    ArduinoSerialRingBuffer rx_buffer;
-    unsigned long find_timeout;
+    ArduinoSerialRingBuffer m_rx_buffer;
+    unsigned long m_find_timeout;
 };
 
 #endif /* #ifndef __ARDUINOSERIAL_H__ */
\ No newline at end of file