arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Applied to UsartClass the same fix adopted for UartClass

Browse Source
This commit is contained in:
Cristian Maglie
2011-12-01 15:50:37 +01:00
parent 037ecd3e3e
commit 906bb28f9e
3 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
hardware/sam/cores/sam/USARTClass.cpp
View File

@ -23,10 +23,9 @@
// Constructors //////////////////////////////////////////////////////////////// // Constructors ////////////////////////////////////////////////////////////////
USARTClass::USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer, RingBuffer* pTx_buffer ) USARTClass::USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer )
{ {
_rx_buffer = pRx_buffer ; _rx_buffer = pRx_buffer ;
_tx_buffer = pTx_buffer ;
_pUsart=pUsart ; _pUsart=pUsart ;
_dwIrq=dwIrq ; _dwIrq=dwIrq ;
@ -37,40 +36,44 @@ USARTClass::USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffe
void USARTClass::begin( const uint32_t dwBaudRate ) void USARTClass::begin( const uint32_t dwBaudRate )
{ {
/* Configure PMC */ // Configure PMC
PMC_EnablePeripheral( _dwId ) ; PMC_EnablePeripheral( _dwId ) ;
/* Reset and disable receiver & transmitter */ // Disable PDC channel
_pUsart->US_PTCR = US_PTCR_RXTDIS | US_PTCR_TXTDIS ;
// Reset and disable receiver and transmitter
_pUsart->US_CR = US_CR_RSTRX | US_CR_RSTTX | US_CR_RXDIS | US_CR_TXDIS ; _pUsart->US_CR = US_CR_RSTRX | US_CR_RSTTX | US_CR_RXDIS | US_CR_TXDIS ;
/* Configure mode */ // Configure mode
_pUsart->US_MR = US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO | _pUsart->US_MR = US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO |
US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL; US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL;
/* Configure baudrate */ // Configure baudrate, asynchronous no oversampling
/* Asynchronous, no oversampling */
_pUsart->US_BRGR = (SystemCoreClock / dwBaudRate) / 16 ; _pUsart->US_BRGR = (SystemCoreClock / dwBaudRate) / 16 ;
/* Disable PDC channel */ // Configure interrupts
_pUsart->US_PTCR = US_PTCR_RXTDIS | US_PTCR_TXTDIS ; _pUsart->US_IDR = 0xFFFFFFFF;
_pUsart->US_IER = US_IER_RXRDY | US_IER_OVRE | US_IER_FRAME;
/* Enable UART interrupt in NVIC */ // Enable UART interrupt in NVIC
// NVIC_EnableIRQ( _dwIrq ) ; NVIC_EnableIRQ( _dwIrq ) ;
/* Enable receiver and transmitter */ // Enable receiver and transmitter
_pUsart->US_CR = US_CR_RXEN | US_CR_TXEN ; _pUsart->US_CR = US_CR_RXEN | US_CR_TXEN ;
} }
void USARTClass::end( void ) void USARTClass::end( void )
{ {
// wait for transmission of outgoing data
//while ( _tx_buffer->_iHead != _tx_buffer->_iTail )
//{
//}
// clear any received data // clear any received data
_rx_buffer->_iHead = _rx_buffer->_iTail ; _rx_buffer->_iHead = _rx_buffer->_iTail ;
// Disable UART interrupt in NVIC
NVIC_DisableIRQ( _dwIrq ) ;
// Wait for any outstanding data to be sent
flush();
PMC_DisablePeripheral( _dwId ) ; PMC_DisablePeripheral( _dwId ) ;
} }
@ -82,57 +85,53 @@ int USARTClass::available( void )
int USARTClass::peek( void ) int USARTClass::peek( void )
{ {
if ( _rx_buffer->_iHead == _rx_buffer->_iTail ) if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
{
return -1 ; return -1 ;
}
else return _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
{
return _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
}
} }
int USARTClass::read( void ) int USARTClass::read( void )
{ {
// if the head isn't ahead of the tail, we don't have any characters // if the head isn't ahead of the tail, we don't have any characters
if ( _rx_buffer->_iHead == _rx_buffer->_iTail ) if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
{
return -1 ; return -1 ;
}
else
{
uint8_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
_rx_buffer->_iTail = (unsigned int)(_rx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE ; uint8_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
_rx_buffer->_iTail = (unsigned int)(_rx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE ;
return uc ; return uc ;
}
} }
void USARTClass::flush( void ) void USARTClass::flush( void )
{ {
//while ( _tx_buffer->_iHead != _tx_buffer->_iTail ) // Wait for transmission to complete
//{ while ((_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY)
//} ;
} }
void USARTClass::write( const uint8_t uc_data ) void USARTClass::write( const uint8_t uc_data )
{ {
/* Check if the transmitter is ready */ // Check if the transmitter is ready
if ( (_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY ) while ((_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY)
{ ;
return ;
}
/* Send character */ // Send character
_pUsart->US_THR=uc_data ; _pUsart->US_THR = uc_data ;
} }
void USARTClass::IrqHandler( void ) void USARTClass::IrqHandler( void )
{ {
/* Did we receive data ? */ uint32_t status = _pUsart->US_CSR;
if ( (_pUsart->US_IER & US_IER_ENDRX) == US_IER_ENDRX )
{ // Did we receive data ?
if ((status & US_CSR_ENDRX) == US_CSR_ENDRX)
_rx_buffer->store_char( _pUsart->US_RHR ) ; _rx_buffer->store_char( _pUsart->US_RHR ) ;
// Acknowledge errors
if ((status & US_CSR_OVRE) == US_CSR_OVRE ||
(status & US_CSR_FRAME) == US_CSR_FRAME)
{
// TODO: error reporting outside ISR
_pUsart->US_CR |= US_CR_RSTSTA;
} }
} }

7
hardware/sam/cores/sam/USARTClass.h
View File

@ -21,11 +21,10 @@
#include "Arduino.h" #include "Arduino.h"
class USARTClass // : public HardwareSerial class USARTClass : public HardwareSerial
{ {
protected: protected:
RingBuffer *_rx_buffer ; RingBuffer *_rx_buffer ;
RingBuffer *_tx_buffer ;
protected: protected:
Usart* _pUsart ; Usart* _pUsart ;
@ -33,7 +32,7 @@ class USARTClass // : public HardwareSerial
uint32_t _dwId ; uint32_t _dwId ;
public: public:
USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer, RingBuffer* pTx_buffer ) ; USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer ) ;
void begin( const uint32_t dwBaudRate ) ; void begin( const uint32_t dwBaudRate ) ;
void end( void ) ; void end( void ) ;
@ -46,7 +45,7 @@ class USARTClass // : public HardwareSerial
void IrqHandler( void ) ; void IrqHandler( void ) ;
#if defined __GNUC__ /* GCC CS3 */ #if defined __GNUC__ /* GCC CS3 */
// using Print::write ; // pull in write(str) and write(buf, size) from Print using Print::write ; // pull in write(str) and write(buf, size) from Print
#elif defined __ICCARM__ /* IAR Ewarm 5.41+ */ #elif defined __ICCARM__ /* IAR Ewarm 5.41+ */
// virtual void write( const char *str ) ; // virtual void write( const char *str ) ;
// virtual void write( const uint8_t *buffer, size_t size ) ; // virtual void write( const uint8_t *buffer, size_t size ) ;

23
hardware/sam/variants/arduino_due/variant.cpp
View File

@ -279,40 +279,29 @@ void UART_IrqHandler(void)
* USART objects * USART objects
*/ */
RingBuffer rx_buffer2 ; RingBuffer rx_buffer2 ;
RingBuffer tx_buffer2 ;
RingBuffer rx_buffer3 ; RingBuffer rx_buffer3 ;
RingBuffer tx_buffer3 ;
RingBuffer rx_buffer4 ; RingBuffer rx_buffer4 ;
RingBuffer tx_buffer4 ;
USARTClass Serial2( USART0, USART0_IRQn, ID_USART0, &rx_buffer2, &tx_buffer2 ) ; USARTClass Serial2( USART0, USART0_IRQn, ID_USART0, &rx_buffer2 ) ;
USARTClass Serial3( USART1, USART1_IRQn, ID_USART1, &rx_buffer3, &tx_buffer3 ) ; USARTClass Serial3( USART1, USART1_IRQn, ID_USART1, &rx_buffer3 ) ;
USARTClass Serial4( USART2, USART2_IRQn, ID_USART2, &rx_buffer4, &tx_buffer4 ) ; USARTClass Serial4( USART2, USART2_IRQn, ID_USART2, &rx_buffer4 ) ;
#ifdef __cplusplus
extern "C" {
#endif
// IT handlers // IT handlers
extern void USART0_IrqHandler( void ) void USART0_IrqHandler( void )
{ {
Serial2.IrqHandler() ; Serial2.IrqHandler() ;
} }
extern void USART1_IrqHandler( void ) void USART1_IrqHandler( void )
{ {
Serial3.IrqHandler() ; Serial3.IrqHandler() ;
} }
extern void USART2_IrqHandler( void ) void USART2_IrqHandler( void )
{ {
Serial4.IrqHandler() ; Serial4.IrqHandler() ;
} }
#ifdef __cplusplus
}
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __cplusplus #ifdef __cplusplus