Skip to content

Commit 62cc4ec

Browse files
authored
Merge pull request #12345 from VeijoPesonen/fix_compiler_warnings
USBMSD; NFCEEPROM; mbed_compat: Fix compiler warnings
2 parents 8b829e5 + 399aaba commit 62cc4ec

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

drivers/source/usb/USBMSD.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,11 @@ enum Status {
6767

6868
USBMSD::USBMSD(BlockDevice *bd, bool connect_blocking, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
6969
: USBDevice(get_usb_phy(), vendor_id, product_id, product_release),
70-
_initialized(false), _media_removed(false), _in_task(&_queue), _out_task(&_queue), _reset_task(&_queue), _control_task(&_queue), _configure_task(&_queue), _bd(bd),
71-
_addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0), _out_ready(false), _in_ready(false), _bulk_out_size(0)
70+
_initialized(false), _media_removed(false),
71+
_addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0),
72+
_out_ready(false), _in_ready(false), _bulk_out_size(0),
73+
_in_task(&_queue), _out_task(&_queue), _reset_task(&_queue), _control_task(&_queue),
74+
_configure_task(&_queue), _bd(bd)
7275
{
7376
_init();
7477
if (connect_blocking) {
@@ -80,8 +83,11 @@ USBMSD::USBMSD(BlockDevice *bd, bool connect_blocking, uint16_t vendor_id, uint1
8083

8184
USBMSD::USBMSD(USBPhy *phy, BlockDevice *bd, uint16_t vendor_id, uint16_t product_id, uint16_t product_release)
8285
: USBDevice(phy, vendor_id, product_id, product_release),
83-
_initialized(false), _media_removed(false), _in_task(&_queue), _out_task(&_queue), _reset_task(&_queue), _control_task(&_queue), _configure_task(&_queue), _bd(bd),
84-
_addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0), _out_ready(false), _in_ready(false), _bulk_out_size(0)
86+
_initialized(false), _media_removed(false),
87+
_addr(0), _length(0), _mem_ok(false), _block_size(0), _memory_size(0), _block_count(0),
88+
_out_ready(false), _in_ready(false), _bulk_out_size(0),
89+
_in_task(&_queue), _out_task(&_queue), _reset_task(&_queue), _control_task(&_queue),
90+
_configure_task(&_queue), _bd(bd)
8591
{
8692
_init();
8793
}

features/nfc/source/nfc/NFCEEPROM.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
using namespace mbed;
2121
using namespace mbed::nfc;
2222

23-
NFCEEPROM::NFCEEPROM(NFCEEPROMDriver *driver, events::EventQueue *queue, const Span<uint8_t> &ndef_buffer) : NFCTarget(ndef_buffer),
24-
_delegate(NULL), _driver(driver), _event_queue(queue), _initialized(false), _current_op(nfc_eeprom_idle), _ndef_buffer_read_sz(0), _eeprom_address(0),
25-
_operation_result(NFC_ERR_UNKNOWN), _ndef_buffer_reader{nullptr, 0, nullptr}
23+
NFCEEPROM::NFCEEPROM(NFCEEPROMDriver *driver, events::EventQueue *queue, const Span<uint8_t> &ndef_buffer)
24+
:
25+
NFCTarget(ndef_buffer), _delegate(NULL), _driver(driver), _event_queue(queue), _initialized(false),
26+
_current_op(nfc_eeprom_idle), _ndef_buffer_reader { nullptr, 0, nullptr }, _ndef_buffer_read_sz(0),
27+
_eeprom_address(0), _operation_result(NFC_ERR_UNKNOWN)
2628
{
2729
_driver->set_delegate(this);
2830
_driver->set_event_queue(queue);

hal/mbed_compat.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ MBED_WEAK void spi_get_capabilities(PinName ssel, bool slave, spi_capabilities_t
8080

8181
// check if given ssel pin is in the cs pinmap
8282
const PinMap *cs_pins = spi_master_cs_pinmap();
83-
PinName pin = NC;
8483
while (cs_pins->pin != NC) {
8584
if (cs_pins->pin == ssel) {
8685
#if DEVICE_SPISLAVE

0 commit comments

Comments
 (0)