ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12282 from mprse/fix_for_issue_12268 

Fix for issue #12268 (SerialBase.cpp: fix initialization list)
pull/12307/head
Anna Bridge 2020-01-23 11:48:58 +00:00 committed by GitHub
parent 34a291be64 f4af0516f4
commit cb53825874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/source/SerialBase.cpp
View File

@ -24,13 +24,13 @@
namespace mbed { namespace mbed {
SerialBase::SerialBase(PinName tx, PinName rx, int baud) : SerialBase::SerialBase(PinName tx, PinName rx, int baud) :
_init_func(&SerialBase::_init),
#if DEVICE_SERIAL_ASYNCH #if DEVICE_SERIAL_ASYNCH
_thunk_irq(this), _thunk_irq(this),
#endif #endif
_baud(baud), _baud(baud),
_tx_pin(tx), _tx_pin(tx),
_rx_pin(rx), _rx_pin(rx)
_init_func(&SerialBase::_init)
{ {
// No lock needed in the constructor // No lock needed in the constructor
@ -38,14 +38,14 @@ SerialBase::SerialBase(PinName tx, PinName rx, int baud) :
} }
SerialBase::SerialBase(const serial_pinmap_t &static_pinmap, int baud) : SerialBase::SerialBase(const serial_pinmap_t &static_pinmap, int baud) :
_init_func(&SerialBase::_init_direct),
#if DEVICE_SERIAL_ASYNCH #if DEVICE_SERIAL_ASYNCH
_thunk_irq(this), _thunk_irq(this),
#endif #endif
_baud(baud), _baud(baud),
_tx_pin(static_pinmap.tx_pin), _tx_pin(static_pinmap.tx_pin),
_rx_pin(static_pinmap.rx_pin), _rx_pin(static_pinmap.rx_pin),
_static_pinmap(&static_pinmap), _static_pinmap(&static_pinmap)
_init_func(&SerialBase::_init_direct)
{ {
// No lock needed in the constructor // No lock needed in the constructor