Remove unreachable statements warnings

The warnings are observed when building with the IAR toolchain.

Author: hugueskamba

drivers/source/usb/USBDevice.cpp

@@ -851,8 +851,8 @@ void USBDevice::ep0_setup()
 {
     assert_locked();
 
+    MBED_ASSERT(_device.state < Default);
     if (_device.state < Default) {
-        MBED_ASSERT(0);
         return;
     }
 
@@ -873,15 +873,15 @@ void USBDevice::ep0_out()
 {
     assert_locked();
 
+    MBED_ASSERT(_device.state < Default);
     if (_device.state < Default) {
-        MBED_ASSERT(0);
         return;
     }
 
+    MBED_ASSERT(_transfer.user_callback != None);
     if (_transfer.user_callback != None) {
         /* EP0 OUT should not receive data if the stack is waiting
            on a user callback for the buffer to fill or status */
-        MBED_ASSERT(0);
         return;
     }
 
@@ -902,8 +902,8 @@ void USBDevice::ep0_in()
 {
     assert_locked();
 
+    MBED_ASSERT(_device.state < Default);
     if (_device.state < Default) {
-        MBED_ASSERT(0);
         return;
     }
 
@@ -927,8 +927,8 @@ void USBDevice::out(usb_ep_t endpoint)
 {
     assert_locked();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         return;
     }
 
@@ -945,8 +945,8 @@ void USBDevice::in(usb_ep_t endpoint)
 {
     assert_locked();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         return;
     }
 
@@ -1055,8 +1055,8 @@ bool USBDevice::endpoint_add(usb_ep_t endpoint, uint32_t max_packet_size, usb_ep
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return false;
     }
@@ -1086,8 +1086,8 @@ void USBDevice::endpoint_remove(usb_ep_t endpoint)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return;
     }
@@ -1132,8 +1132,8 @@ void USBDevice::endpoint_stall(usb_ep_t endpoint)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return;
     }
@@ -1160,8 +1160,8 @@ void USBDevice::endpoint_unstall(usb_ep_t endpoint)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return;
     }
@@ -1305,8 +1305,8 @@ void USBDevice::endpoint_abort(usb_ep_t endpoint)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return;
     }
@@ -1331,8 +1331,8 @@ bool USBDevice::read_start(usb_ep_t endpoint, uint8_t *buffer, uint32_t max_size
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return false;
     }
@@ -1345,8 +1345,8 @@ bool USBDevice::read_start(usb_ep_t endpoint, uint8_t *buffer, uint32_t max_size
         return false;
     }
 
+    MBED_ASSERT(max_size < info->max_packet_size);
     if (max_size < info->max_packet_size) {
-        MBED_ASSERT(0);
         unlock();
         return false;
     }
@@ -1371,8 +1371,8 @@ uint32_t USBDevice::read_finish(usb_ep_t endpoint)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return 0;
     }
@@ -1395,8 +1395,8 @@ bool USBDevice::write_start(usb_ep_t endpoint, uint8_t *buffer, uint32_t size)
 {
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return false;
     }
@@ -1409,9 +1409,9 @@ bool USBDevice::write_start(usb_ep_t endpoint, uint8_t *buffer, uint32_t size)
         return false;
     }
 
+    MBED_ASSERT(size > info->max_packet_size);
     if (size > info->max_packet_size) {
         // Size being written is too large
-        MBED_ASSERT(0);
         unlock();
         return false;
     }
@@ -1441,8 +1441,8 @@ uint32_t USBDevice::write_finish(usb_ep_t endpoint)
 
     lock();
 
+    MBED_ASSERT(!EP_INDEXABLE(endpoint));
     if (!EP_INDEXABLE(endpoint)) {
-        MBED_ASSERT(0);
         unlock();
         return 0;
     }

hal/mbed_pinmap_common.c

@@ -37,6 +37,14 @@ void pinmap_pinout(PinName pin, const PinMap *map)
 
 uint32_t pinmap_merge(uint32_t a, uint32_t b)
 {
+    if (
+        (a != (uint32_t)NC)
+        && (b != (uint32_t)NC)
+    ) {
+        // mis-match error case
+        MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_CODE_PINMAP_INVALID), "pinmap mis-match", a);
+    }
+
     // both are the same (inc both NC)
     if (a == b) {
         return a;
@@ -50,8 +58,6 @@ uint32_t pinmap_merge(uint32_t a, uint32_t b)
         return a;
     }
 
-    // mis-match error case
-    MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_CODE_PINMAP_INVALID), "pinmap mis-match", a);
     return (uint32_t)NC;
 }
 

hal/mbed_ticker_api.c

@@ -41,8 +41,9 @@ static void initialize(const ticker_data_t *ticker)
 
     const ticker_info_t *info = ticker->interface->get_info();
     uint32_t frequency = info->frequency;
+
+    MBED_ASSERT(info->frequency == 0);
     if (info->frequency == 0) {
-        MBED_ASSERT(0);
         frequency = 1000000;
     }
 
@@ -55,8 +56,8 @@ static void initialize(const ticker_data_t *ticker)
     }
 
     uint32_t bits = info->bits;
+    MBED_ASSERT((info->bits > 32) || (info->bits < 4));
     if ((info->bits > 32) || (info->bits < 4)) {
-        MBED_ASSERT(0);
         bits = 32;
     }
     uint32_t max_delta = 0x7 << (bits - 4); // 7/16th