minor cosmetics

minor cosmetics

Author: gicking

Diff for: cores/arduino/HardwareSerial.cpp

@@ -79,16 +79,16 @@ void serialEventRun(void)
 #endif
 }
 
-// dummy function attached to TxC interrupt. Is faster than if(NULL) check 
-void dummyFct(void) { /* dummy */}
-
 // macro to guard critical sections when needed for large TX buffer sizes
 #if (SERIAL_TX_BUFFER_SIZE>256)
 #define TX_BUFFER_ATOMIC ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
 #else
 #define TX_BUFFER_ATOMIC
 #endif
 
+// dummy custom function for TxC interrupt. Is faster than check if(fct==NULL) 
+void dummyTxFct(void) { /* dummy */}
+
 // Actual interrupt handlers //////////////////////////////////////////////////////////////
 
 void HardwareSerial::_tx_udr_empty_irq(void)
@@ -296,7 +296,7 @@ void HardwareSerial::attachInterrupt_Receive( isrRx_t fn )
 void HardwareSerial::attachInterrupt_Send( isrTx_t fn )
 {
   ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
-    _isrTx = fn;
+    _isrTx = fn;             // set custom function
     sbi(*_ucsra, TXC0);      // clear TXC status
     sbi(*_ucsrb, TXCIE0);    // activate TXC interrupt
   }
@@ -305,7 +305,7 @@ void HardwareSerial::attachInterrupt_Send( isrTx_t fn )
 void HardwareSerial::detachInterrupt_Send()
 {
   ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
-    _isrTx = NULL;
+    _isrTx = dummyTxFct;     // restore dummy function
     cbi(*_ucsrb, TXCIE0);    // deactivate TXC interrupt
   }
 }

Diff for: cores/arduino/HardwareSerial.h

@@ -92,6 +92,9 @@ typedef uint8_t rx_buffer_index_t;
 #define SERIAL_7O2 0x3C
 #define SERIAL_8O2 0x3E
 
+// dummy custom function for TxC interrupt. Is faster than check if(fct==NULL) 
+void dummyTxFct(void);
+
 class HardwareSerial : public Stream
 {
   protected:
@@ -149,7 +152,7 @@ class HardwareSerial : public Stream
 
     // attach custom handlers for RX and TXC interrupts 
     void attachInterrupt_Receive( isrRx_t fn );
-    void detachInterrupt_Receive() { attachInterrupt_Receive( (isrRx_t) NULL ); };
+    void detachInterrupt_Receive( void ) { attachInterrupt_Receive( (isrRx_t) NULL ); };
     void attachInterrupt_Send( isrTx_t fn );
     void detachInterrupt_Send( void );
 

Diff for: cores/arduino/HardwareSerial_private.h

@@ -84,9 +84,6 @@
 #error "Not all bit positions for UART3 are the same as for UART0"
 #endif
 
-// dummy custom function attached and TXC interrupt. Is faster than if(NULL) check 
-void dummyFct(void);
-
 // Constructors ////////////////////////////////////////////////////////////////
 
 HardwareSerial::HardwareSerial(
@@ -98,7 +95,7 @@ HardwareSerial::HardwareSerial(
     _udr(udr),
     _rx_buffer_head(0), _rx_buffer_tail(0),
     _tx_buffer_head(0), _tx_buffer_tail(0),
-    _isrRx(dummyFct), _isrTx(dummyFct)
+    _isrRx(NULL), _isrTx(dummyTxFct)
 {
 }