ARMmbed · Jul 27, 2020 · Jul 27, 2020 · Jul 27, 2020 · Jul 27, 2020 · Jul 27, 2020
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
@@ -134,7 +134,7 @@ class FlashIAPBlockDevice : public mbed::BlockDevice {
     *  @param size     Size to erase in bytes
     *  @return         True if erase is valid for underlying block device
     */
-    virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const;
+    virtual bool is_valid_erase(mbed::bd_addr_t addr, mbed::bd_size_t size) const;
 
 
 private:

diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
@@ -1058,8 +1058,7 @@ int QSPIFBlockDevice::_handle_vendor_quirks()
             // 2. Require setting a "fast mode" bit in config register 2 to operate at higher clock rates
             // 3. Should never attempt to enable 4-byte addressing (it causes reads and writes to fail)
             tr_debug("Applying quirks for macronix");
-            _needs_fast_mode = true;
-            _num_status_registers = 3;
+            //_needs_fast_mode = true;
             _read_status_reg_2_inst = QSPIF_INST_RDCR;
             _attempt_4_byte_addressing = false;
             break;

diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
@@ -53,7 +53,7 @@
  */
 enum qspif_bd_error {
     QSPIF_BD_ERROR_OK                    = 0,     /*!< no error */
-    QSPIF_BD_ERROR_DEVICE_ERROR          = BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
+    QSPIF_BD_ERROR_DEVICE_ERROR          = mbed::BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
     QSPIF_BD_ERROR_PARSING_FAILED        = -4002, /* SFDP Parsing failed */
     QSPIF_BD_ERROR_READY_FAILED          = -4003, /* Wait for Mem Ready failed */
     QSPIF_BD_ERROR_WREN_FAILED           = -4004, /* Write Enable Failed */
@@ -289,7 +289,7 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
     qspi_status_t _qspi_set_frequency(int freq);
 
     // Update the 4-byte addressing extension register with the MSB of the address if it is in use
-    qspi_status_t _qspi_update_4byte_ext_addr_reg(bd_addr_t addr);
+    qspi_status_t _qspi_update_4byte_ext_addr_reg(mbed::bd_addr_t addr);
 
     /*********************************/
     /* Flash Configuration Functions */

diff --git a/components/wifi/esp8266-driver/mbed_lib.json b/components/wifi/esp8266-driver/mbed_lib.json
@@ -103,6 +103,10 @@
         "NUCLEO_F411RE": {
             "tx": "D8",
             "rx": "D2"
+        },
+        "PORTENTA_H7": {
+            "tx": "PA_9",
+            "rx": "PA_10"
         }
     }
 }
diff --git a/drivers/AnalogIn.h b/drivers/AnalogIn.h
@@ -88,6 +88,13 @@ class AnalogIn {
      */
     AnalogIn(PinName pin, float vref = MBED_CONF_TARGET_DEFAULT_ADC_VREF);
 
+
+    /** Reconfigure the adc object using the given configuration
+     *
+     * @param config reference to structure which holds AnalogIn configuration
+     */
+    void configure(const analogin_config_t &config);
+
     /** Read the input voltage, represented as a float in the range [0.0, 1.0]
      *
      * @returns A floating-point value representing the current input voltage, measured as a percentage

diff --git a/drivers/I2CSlave.h b/drivers/I2CSlave.h
@@ -172,7 +172,7 @@ class I2CSlave {
      *
      *  @return Result of the operation.
      *  @retval 0       If the number of bytes read is equal to length requested.
-     *  @retval nonzero On error or if the number of bytes read is less than requested.
+     *  @retval the number of bytes read.
      */
     int read(char *data, int length);
 

diff --git a/drivers/USBCDC.h b/drivers/USBCDC.h
@@ -33,6 +33,8 @@ class AsyncOp;
  * @{
  */
 
+#define CDC_MAX_PACKET_SIZE   64
+
 class USBCDC: public USBDevice {
 public:
 
@@ -219,13 +221,13 @@ class USBCDC: public USBDevice {
 
     OperationList<AsyncWrite> _tx_list;
     bool _tx_in_progress;
-    uint8_t _tx_buffer[64];
+    uint8_t _tx_buffer[CDC_MAX_PACKET_SIZE];
     uint8_t *_tx_buf;
     uint32_t _tx_size;
 
     OperationList<AsyncRead> _rx_list;
     bool _rx_in_progress;
-    uint8_t _rx_buffer[64];
+    uint8_t _rx_buffer[CDC_MAX_PACKET_SIZE];
     uint8_t *_rx_buf;
     uint32_t _rx_size;
 };

diff --git a/drivers/source/AnalogIn.cpp b/drivers/source/AnalogIn.cpp
@@ -38,6 +38,13 @@ AnalogIn::AnalogIn(const PinMap &pinmap, float vref) : _vref(vref)
     unlock();
 }
 
+void AnalogIn::configure(const analogin_config_t &config)
+{
+    lock();
+    analogin_configure(&_adc, &config);
+    unlock();
+}
+
 float AnalogIn::read()
 {
     lock();

diff --git a/drivers/source/I2CSlave.cpp b/drivers/source/I2CSlave.cpp
@@ -52,7 +52,7 @@ int I2CSlave::receive(void)
 
 int I2CSlave::read(char *data, int length)
 {
-    return i2c_slave_read(&_i2c, data, length) != length;
+    return i2c_slave_read(&_i2c, data, length);
 }
 
 int I2CSlave::read(void)

diff --git a/drivers/source/usb/USBCDC.cpp b/drivers/source/usb/USBCDC.cpp
@@ -34,8 +34,6 @@ static const uint8_t cdc_line_coding_default[7] = {0x80, 0x25, 0x00, 0x00, 0x00,
 #define CLS_DTR   (1 << 0)
 #define CLS_RTS   (1 << 1)
 
-#define CDC_MAX_PACKET_SIZE    64
-
 class USBCDC::AsyncWrite: public AsyncOp {
 public:
     AsyncWrite(USBCDC *serial, uint8_t *buf, uint32_t size):

diff --git a/drivers/source/usb/USBDevice.cpp b/drivers/source/usb/USBDevice.cpp
@@ -980,10 +980,11 @@ void USBDevice::out(usb_ep_t endpoint)
 
     endpoint_info_t *info = &_endpoint_info[EP_TO_INDEX(endpoint)];
 
-    MBED_ASSERT(info->pending >= 1);
-    info->pending -= 1;
-    if (info->callback) {
-        info->callback();
+    if (info->pending >= 1) {
+      info->pending -= 1;
+        if (info->callback) {
+          info->callback();
+        }
     }
 }
 
@@ -1007,10 +1008,11 @@ void USBDevice::in(usb_ep_t endpoint)
 
     endpoint_info_t *info = &_endpoint_info[EP_TO_INDEX(endpoint)];
 
-    MBED_ASSERT(info->pending >= 1);
-    info->pending -= 1;
-    if (info->callback) {
-        info->callback();
+    if (info->pending >= 1) {
+      info->pending -= 1;
+        if (info->callback) {
+          info->callback();
+        }
     }
 }
 

diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/mbed_lib.json b/features/FEATURE_BLE/targets/TARGET_CORDIO/mbed_lib.json
@@ -1,6 +1,6 @@
 {
     "name": "cordio",
-    "macros": ["WSF_MS_PER_TICK=1"],
+    "macros": ["WSF_MS_PER_TICK=10"],
     "config": {
         "max-connections": {
             "help": "Maximum number of connections",
@@ -78,4 +78,4 @@
             "macro_name": "EATT_CONN_CHAN_MAX"
         }
     }
-}
+}
diff --git a/...s/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/sources/ble/lctr/lctr_main_conn.c b/...s/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/sources/ble/lctr/lctr_main_conn.c
@@ -514,14 +514,16 @@ void lctrFreeConnCtx(lctrConnCtx_t *pCtx)
     WsfMsgFree(pBuf);
   }
 
+  uint16_t handle = LCTR_GET_CONN_HANDLE(pCtx);
+
+  lmgrPersistCb.sendCompCback(handle, numTxBufs);
+
   /* Cleanup timers. */
   WsfTimerStop(&pCtx->tmrSupTimeout);
   WsfTimerStop(&pCtx->tmrProcRsp);
   WsfTimerStop(&pCtx->tmrPingTimeout);
   WsfTimerStop(&pCtx->tmrAuthTimeout);
 
-  uint16_t handle = LCTR_GET_CONN_HANDLE(pCtx);
-
   /* VS cleanup. */
   if (pLctrVsHdlrs && pLctrVsHdlrs->connCleanup)
   {