Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions drivers/source/SerialBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
namespace mbed {

SerialBase::SerialBase(PinName tx, PinName rx, int baud) :
_init_func(&SerialBase::_init),
#if DEVICE_SERIAL_ASYNCH
_thunk_irq(this),
#endif
_baud(baud),
_tx_pin(tx),
_rx_pin(rx),
_init_func(&SerialBase::_init)
_rx_pin(rx)
{
// No lock needed in the constructor

Expand All @@ -42,6 +42,7 @@ SerialBase::SerialBase(PinName tx, PinName rx, int baud) :
}

SerialBase::SerialBase(const serial_pinmap_t &static_pinmap, int baud) :
_init_func(&SerialBase::_init_direct),
#if DEVICE_SERIAL_ASYNCH
_thunk_irq(this), _tx_usage(DMA_USAGE_NEVER),
_rx_usage(DMA_USAGE_NEVER), _tx_callback(NULL),
Expand All @@ -52,8 +53,7 @@ SerialBase::SerialBase(const serial_pinmap_t &static_pinmap, int baud) :
_baud(baud),
_tx_pin(static_pinmap.tx_pin),
_rx_pin(static_pinmap.rx_pin),
_static_pinmap(&static_pinmap),
_init_func(&SerialBase::_init_direct)
_static_pinmap(&static_pinmap)
{
// No lock needed in the constructor

Expand Down