Merge branch 'sam-serial-flush-tx-empty' of https://github.com/sandeepmistry/Arduino

cmaglie · cmaglie · commit a259f9c6dc83 · 2015-11-18T09:58:57.000+01:00
diff --git a/hardware/arduino/sam/cores/arduino/UARTClass.cpp b/hardware/arduino/sam/cores/arduino/UARTClass.cpp
@@ -138,7 +138,7 @@ void UARTClass::flush( void )
 {
   while (_tx_buffer->_iHead != _tx_buffer->_iTail); //wait for transmit data to be sent
   // Wait for transmission to complete
-  while ((_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY)
+  while ((_pUart->UART_SR & UART_SR_TXEMPTY) != UART_SR_TXEMPTY)
    ;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void UARTClass::flush( void )`
`138`	`138`	`{`
`139`	`139`	`while (_tx_buffer->_iHead != _tx_buffer->_iTail); //wait for transmit data to be sent`
`140`	`140`	`// Wait for transmission to complete`
`141`		`- while ((_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY)`
	`141`	`+ while ((_pUart->UART_SR & UART_SR_TXEMPTY) != UART_SR_TXEMPTY)`
`142`	`142`	`;`
`143`	`143`	`}`
`144`	`144`