Skip to content

Serial discard line break #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Serial discard line break #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1181a6
Enable interrupt mode of UART tx
descampsa Aug 11, 2016
5450f41
Use UART TX FIFO
descampsa Aug 12, 2016
3d4fdca
Discard data in case of line break
descampsa Aug 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 34 additions & 15 deletions cores/arduino/UARTClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void UARTClass::init(const uint32_t dwBaudRate, const uint8_t modeReg)
while (uart_irq_rx_ready(CONFIG_UART_CONSOLE_INDEX))
uart_fifo_read(CONFIG_UART_CONSOLE_INDEX, &c, 1);


uart_irq_err_enable(CONFIG_UART_CONSOLE_INDEX);
uart_irq_rx_enable(CONFIG_UART_CONSOLE_INDEX);

}
Expand All @@ -116,6 +116,7 @@ void UARTClass::end( void )
//enable loopback, needed to prevent a short disconnection to be
//interpreted as a packet and corrupt receiver state
uart_loop_enable(CONFIG_UART_CONSOLE_INDEX);
uart_irq_err_disable(CONFIG_UART_CONSOLE_INDEX);

SET_PIN_MODE(17, GPIO_MUX_MODE); // Rdx SOC PIN (Arduino header pin 0)
SET_PIN_MODE(16, GPIO_MUX_MODE); // Txd SOC PIN (Arduino header pin 1)
Expand Down Expand Up @@ -168,7 +169,7 @@ int UARTClass::read( void )

void UARTClass::flush( void )
{
while (_tx_buffer->_iHead != _tx_buffer->_iTail); //wait for transmit data to be sent
while (_tx_buffer->_iHead != *(volatile int*)&(_tx_buffer->_iTail)); //wait for transmit data to be sent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a particular reason for casting the pointer to a volatile pointer first prior to using it? Is the code being optimized out by the compiler if the volatile casting is omitted?

Copy link
Contributor Author

@descampsa descampsa Oct 18, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason is that iTail can be updated in the irq handler.
Without the volatile, the compiler may optimize the code by reading it only once from memory, and keeping its value in register. That would lead to an infinite loop.

I don't remember if i actually ran into this problem or not, and i did not check the resulting assembly, but that looks like a typical case where volatile is needed.

Note that this more related to pull request #266 than to #274

// Wait for transmission to complete
while(!uart_tx_complete(CONFIG_UART_CONSOLE_INDEX));
}
Expand All @@ -179,11 +180,11 @@ size_t UARTClass::write( const uint8_t uc_data )
return(0);

// Is the hardware currently busy?
if (_tx_buffer->_iTail != _tx_buffer->_iHead)
if (_tx_buffer->_iTail != _tx_buffer->_iHead || !uart_tx_ready(CONFIG_UART_CONSOLE_INDEX))
{
// If busy we buffer
int l = (_tx_buffer->_iHead + 1) % SERIAL_BUFFER_SIZE;
while (_tx_buffer->_iTail == l)
while (*(volatile int*)&(_tx_buffer->_iTail) == l)
; // Spin locks if we're about to overwrite the buffer. This continues once the data is sent

_tx_buffer->_aucBuffer[_tx_buffer->_iHead] = uc_data;
Expand All @@ -201,21 +202,39 @@ size_t UARTClass::write( const uint8_t uc_data )

void UARTClass::IrqHandler( void )
{
uint8_t uc_data;
int ret;
ret = uart_poll_in(CONFIG_UART_CONSOLE_INDEX, &uc_data);

while ( ret != -1 ) {
_rx_buffer->store_char(uc_data);
uart_irq_update(CONFIG_UART_CONSOLE_INDEX);
// if irq is Receiver Line Status
if(uart_irq_err_detected(CONFIG_UART_CONSOLE_INDEX))
{
// if it is a break line, we discard the data
if(uart_break_check(CONFIG_UART_CONSOLE_INDEX))
{
uint8_t uc_data;
uart_poll_in(CONFIG_UART_CONSOLE_INDEX, &uc_data);
}
}
// if irq is Receiver Data Available
else if(uart_irq_rx_ready(CONFIG_UART_CONSOLE_INDEX))
{
uint8_t uc_data;
int ret;
ret = uart_poll_in(CONFIG_UART_CONSOLE_INDEX, &uc_data);

while ( ret != -1 ) {
_rx_buffer->store_char(uc_data);
ret = uart_poll_in(CONFIG_UART_CONSOLE_INDEX, &uc_data);
}
}

// Do we need to keep sending data?
if (!uart_irq_tx_ready(CONFIG_UART_CONSOLE_INDEX))
// if irq is Transmitter Holding Register
else if(uart_irq_tx_ready(CONFIG_UART_CONSOLE_INDEX))
{
if (_tx_buffer->_iTail != _tx_buffer->_iHead) {
uart_poll_out(CONFIG_UART_CONSOLE_INDEX, _tx_buffer->_aucBuffer[_tx_buffer->_iTail]);
_tx_buffer->_iTail = (unsigned int)(_tx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE;
if(_tx_buffer->_iTail != _tx_buffer->_iHead)
{
int end = (_tx_buffer->_iTail < _tx_buffer->_iHead) ? _tx_buffer->_iHead:SERIAL_BUFFER_SIZE;
int l = min(end - _tx_buffer->_iTail, UART_FIFO_SIZE);
uart_fifo_fill(CONFIG_UART_CONSOLE_INDEX, _tx_buffer->_aucBuffer+_tx_buffer->_iTail, l);
_tx_buffer->_iTail = (_tx_buffer->_iTail+l)%SERIAL_BUFFER_SIZE;
}
else
{
Expand Down
21 changes: 18 additions & 3 deletions system/libarc32_arduino101/drivers/ns16550.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ unsigned char uart_poll_out(
)
{
/* wait for transmitter to ready to accept a character */
while ((INBYTE(LSR(which)) & LSR_TEMT) == 0)
while ((INBYTE(LSR(which)) & LSR_THRE) == 0)
;

OUTBYTE(THR(which), outChar);
Expand All @@ -352,6 +352,8 @@ unsigned char uart_poll_out(
*
* uart_fifo_fill - fill FIFO with data
*
* It is up to the caller to make sure that FIFO capcity is not exceeded
*
* RETURNS: number of bytes sent
*/

Expand All @@ -362,8 +364,8 @@ int uart_fifo_fill(int which, /* UART on which to send */
{
int i;

for (i = 0; i < size && (INBYTE(LSR(which)) &
LSR_BOTH_EMPTY) != 0; i++) {
for (i = 0; i < size ; i++)
{
OUTBYTE(THR(which), txData[i]);
}
return i;
Expand Down Expand Up @@ -640,6 +642,19 @@ uint8_t uart_tx_complete(int which)
return INBYTE(LSR(which)) & LSR_TEMT;
}

/*******************************************************************************
*
* uart_tx_complete - check if tx holding register is empty
*
* RETURNS: zero if register is non-empty,
* non-zero if register is empty (ready to receive new data)
*/

uint8_t uart_tx_ready(int which)
{
return INBYTE(LSR(which)) & LSR_THRE;
}

/*******************************************************************************
*
* uart_loop_enable - enable loopback
Expand Down
4 changes: 4 additions & 0 deletions system/libarc32_arduino101/drivers/uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ extern "C" {
/* options for uart init */
#define UART_OPTION_AFCE 0x01

/* Size of the FIFO in bytes */
#define UART_FIFO_SIZE 16

/* generic UART info structure */
struct uart_init_info {
int baud_rate;
Expand Down Expand Up @@ -92,6 +95,7 @@ int uart_break_check(int port);
void uart_break_send(int port, int delay);
void uart_disable(int port);
uint8_t uart_tx_complete(int which);
uint8_t uart_tx_ready(int which);
void uart_loop_enable(int which);
void uart_loop_disable(int which);

Expand Down