Removed clumsy polling alternative for interrupts

Author: maxint-rd

cores/arduino/HardwareSerial.cpp

@@ -21,8 +21,10 @@
   Modified 14 August 2012 by Alarus
   Modified 3  December 2013 by Matthijs Kooijman
   Modified 1 may 2023 by TempersLee
+  Modified 28 July 2024 by Maxint R&D
 */
 
+
 #include <stdio.h>
 #include "Arduino.h"
 #include "HardwareSerial.h"
@@ -175,59 +177,6 @@ void HardwareSerial::begin(unsigned long baud, byte config)
 #endif
 }
 
-
-#if(OPT_USART1_INT==1)
-#else
-// MMOLE: reintroduced RX buffer to properly implement read/available/peek methods
-void HardwareSerial::fillRxBuffer(void)    // private method: read all characters that can be read
-{
-  // Fill RX buffer during read/available calls
-  // Newly received characters are added to the buffer
-  // _rx_buffer_head is the location of the new character
-  // _rx_buffer_tail is the location of the oldest character that is not read yet
-  unsigned char c;
-/*
-  while(uart_getc(&_serial, &c) == 0)
-  {
-    _rx_buffer[_rx_buffer_head]=c;
-    _rx_buffer_head = (rx_buffer_index_t)(_rx_buffer_head + 1) % SERIAL_RX_BUFFER_SIZE;
-  }
-*/
-  // To avoid buffer underruns, we try to read during at least a few millis.
-  // Perhaps there is a better way, but for now it works.
-  // Maybe we should also do something to handle disruption of interrupts
-/*
-  #define SERIAL_WAIT_FOR_RX 5000L
-  uint32_t uStart=micros();
-  while((micros()-uStart)<SERIAL_WAIT_FOR_RX)
-*/
-  #define SERIAL_WAIT_FOR_RX 3
-  uint32_t uStart=millis();
-  while((millis()-uStart)<SERIAL_WAIT_FOR_RX)
-  {
-    if(uart_getc(&_serial, &c) == 0)
-    {
-/*
-      _rx_buffer[_rx_buffer_head]=c;
-      _rx_buffer_head = (rx_buffer_index_t)(_rx_buffer_head + 1) % SERIAL_RX_BUFFER_SIZE;
-/**/
-      rx_buffer_index_t i = (unsigned int)(_rx_buffer_head + 1) % SERIAL_RX_BUFFER_SIZE;
-  
-      // if we should be storing the received character into the location
-      // just before the tail (meaning that the head would advance to the
-      // current location of the tail), we're about to overflow the buffer
-      // and so we don't write the character or advance the head.
-      if (i != _rx_buffer_tail) {
-        _rx_buffer[_rx_buffer_head] = c;
-        _rx_buffer_head = i;
-      }
-/**/
-    }
-  }
-}
-#endif
-
-
 void HardwareSerial::end()
 {
   // MMOLE: reintroduced RX buffer to properly implement read/available/peek methods
@@ -245,9 +194,6 @@ int HardwareSerial::available(void)
 {
   // MMOLE: reintroduced RX buffer to properly implement read/available/peek methods
   //return -1;
-#if(OPT_USART1_INT==0)
-  fillRxBuffer();   // use polling to fill the RX buffer
-#endif
   return ((unsigned int)(SERIAL_RX_BUFFER_SIZE + _rx_buffer_head - _rx_buffer_tail)) % SERIAL_RX_BUFFER_SIZE;
 }
 
@@ -256,9 +202,6 @@ int HardwareSerial::peek(void)
   // MMOLE: reintroduced RX buffer to properly implement read/available/peek methods
   // MMOLE 240316: Serial.parseInt() uses peek() with timeout to see if more data is available
    //return -1;
-#if(OPT_USART1_INT==0)
-  fillRxBuffer();   // use polling to fill the RX buffer
-#endif
   if (_rx_buffer_head == _rx_buffer_tail) {
     return -1;
   } else {
@@ -277,10 +220,6 @@ int HardwareSerial::read(void)
     return -1;
   }
 */
-#if(OPT_USART1_INT==0)
-  // Fill RX buffer during read/available calls
-  fillRxBuffer();   // use polling to fill the RX buffer
-#endif
 
   // if the head isn't ahead of the tail, we don't have any characters
   if (_rx_buffer_head == _rx_buffer_tail) {