Recompile target

Author: facchinm

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -316,18 +316,14 @@ class GattServer {
      *
      * The process assigns a unique attribute handle to all the elements added
      * into the attribute table. This handle is an ID that must be used for
-     * subsequent interactions with the elements.
+     * subsequent interractions with the elements.
      *
      * @note There is no mirror function that removes a single service.
      * Application code can remove all the registered services by calling
      * reset().
      *
-     * @attention GattServer allocates its own memory for all the attributes.
-     * The GattServer will set the handles on the service passed in and the
-     * characteristics it contains. You may record the handles you want to
-     * interact with in the future. After that the service and characteristics
-     * you passed in as the parameter may be freed. To write to the GattServer
-     * instances of the characteristics you have to use the saved handles.
+     * @attention Service, characteristics and descriptors objects registered
+     * within the GattServer must remain reachable until reset() is called.
      *
      * @param[in] service The service to be added; attribute handle of services,
      * characteristic and characteristic descriptors are updated by the

cores/arduino/mbed/connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h

@@ -213,101 +213,61 @@ enum GattAuthCallbackReply_t {
      */
     AUTH_CALLBACK_REPLY_SUCCESS = 0x00,
 
-    /** The attribute handle given was not valid on this server. */
-    AUTH_CALLBACK_REPLY_ATTERR_INVALID_HANDLE = 0x01,
-
-    /** The attribute cannot be read. */
-    AUTH_CALLBACK_REPLY_ATTERR_READ_NOT_PERMITTED = 0x02,
-
-    /** The attribute cannot be written. */
-    AUTH_CALLBACK_REPLY_ATTERR_WRITE_NOT_PERMITTED = 0x03,
-
-    /** The attribute PDU was invalid. */
-    AUTH_CALLBACK_REPLY_ATTERR_INVALID_PDU = 0x04,
-
-    /** The attribute requires authentication before it can be read or
-     * written.
+    /**
+     * ATT Error: Invalid attribute handle.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_INSUFFICIENT_AUTHENTICATION = 0x05,
-    AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHENTICATION = 0x05,
+    AUTH_CALLBACK_REPLY_ATTERR_INVALID_HANDLE = 0x0101,
 
-    /** Attribute server does not support the request received from the
-     * client.
+    /**
+     * ATT Error: Read not permitted.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_REQUEST_NOT_SUPPORTED = 0x06,
-
-    /** Offset specified was past the end of the attribute. */
-    AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET = 0x07,
+    AUTH_CALLBACK_REPLY_ATTERR_READ_NOT_PERMITTED = 0x0102,
 
-    /** The attribute requires authorization before it can be read or written. */
-    AUTH_CALLBACK_REPLY_ATTERR_INSUFFICIENT_AUTHORIZATION = 0x08,
-    AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION = 0x08,
-
-    /** Too many prepare writes have been queued. */
-    AUTH_CALLBACK_REPLY_ATTERR_PREPARE_QUEUE_FULL = 0x09,
-
-    /** No attribute found within the given attribute handle range. */
-    AUTH_CALLBACK_REPLY_ATTERR_ATTRIBUTE_NOT_FOUND = 0x0A,
-
-    /** The attribute cannot be read using the Read Blob Request. */
-    AUTH_CALLBACK_REPLY_ATTERR_ATTRIBUTE_NOT_LONG = 0x0B,
-
-    /** The Encryption Key Size used for encrypting this link is
-     * insufficient.
+    /**
+     * ATT Error: Write not permitted.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_INSUFFICIENT_ENCRYPTION_KEY_SIZE = 0x0C,
-
-    /** The attribute value length is invalid for the operation. */
-    AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATTRIBUTE_VALUE_LENGTH = 0x0D,
-    AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH = 0x0D,
+    AUTH_CALLBACK_REPLY_ATTERR_WRITE_NOT_PERMITTED = 0x0103,
 
-    /** The attribute request that was requested has encountered an error
-     * that was unlikely, and therefore could not be completed as requested.
+    /**
+     * ATT Error: Authenticated link required.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_UNLIKELY_ERROR = 0x0E,
+    AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHENTICATION = 0x0105,
 
-    /** The attribute requires encryption before it can be read or written. */
-    AUTH_CALLBACK_REPLY_ATTERR_INSUFFICIENT_ENCRYPTION = 0x0F,
-
-    /** The attribute type is not a supported grouping attribute as defined
-     * by a higher layer specification.
+    /**
+     * ATT Error: The specified offset was past the end of the attribute.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_UNSUPPORTED_GROUP_TYPE = 0x10,
-
-    /** Insufficient Resources to complete the request. */
-    AUTH_CALLBACK_REPLY_ATTERR_INSUFFICIENT_RESOURCES = 0x11,
-    AUTH_CALLBACK_REPLY_ATTERR_INSUF_RESOURCES = 0x11,
-
-    /* 0x12 - 0x7F => reserved for future use */
+    AUTH_CALLBACK_REPLY_ATTERR_INVALID_OFFSET = 0x0107,
 
-    /* 0x80 - 0x9F => Application Error */
-
-    /* 0xA0 0xDF => Reserved for future use */
+    /**
+     * ATT Error: Used in ATT as "insufficient authorization".
+     */
+    AUTH_CALLBACK_REPLY_ATTERR_INSUF_AUTHORIZATION = 0x0108,
 
-    /* 0xE0 - 0xFF Common Profile and service Error Codes */
+    /**
+     * ATT Error: Used in ATT as "prepare queue full".
+     */
+    AUTH_CALLBACK_REPLY_ATTERR_PREPARE_QUEUE_FULL = 0x0109,
 
-    /** The Write Request Rejected error code is used when a requested write
-     * operation cannot be fulfilled for reasons other than permissions.
+    /**
+     * ATT Error: Used in ATT as "attribute not found".
      */
-    AUTH_CALLBACK_REPLY_ATTERR_WRITE_REQUEST_REJECTED = 0xFC,
+    AUTH_CALLBACK_REPLY_ATTERR_ATTRIBUTE_NOT_FOUND = 0x010A,
 
-    /** The Client Characteristic Configuration Descriptor Improperly
-     * Configured error code is used when a Client Characteristic
-     * Configuration descriptor is not configured according to the
-     * requirements of the profile or service.
+    /**
+     * ATT Error: Attribute cannot be read or written using read/write blob
+     * requests.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_CLIENT_CHARACTERISTIC_CONFIGURATION_DESCRIPTOR_IMPROPERLY_CONFIGURED = 0xFD,
+    AUTH_CALLBACK_REPLY_ATTERR_ATTRIBUTE_NOT_LONG = 0x010B,
 
-    /** The Procedure Already in Progress error code is used when a profile
-     * or service request cannot be serviced because an operation that has
-     * been previously triggered is still in progress
+    /**
+     * ATT Error: Invalid value size.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_PROCEDURE_ALREADY_IN_PROGRESS = 0xFE,
+    AUTH_CALLBACK_REPLY_ATTERR_INVALID_ATT_VAL_LENGTH = 0x010D,
 
-    /** The Out of Range error code is used when an attribute value is out
-     * of range as defined by a profile or service specification.
+    /**
+     * ATT Error: Encrypted link required.
      */
-    AUTH_CALLBACK_REPLY_ATTERR_OUT_OF_RANGE = 0xFF,
+    AUTH_CALLBACK_REPLY_ATTERR_INSUF_RESOURCES = 0x0111,
 };
 
 /**

cores/arduino/mbed/connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.h

@@ -185,19 +185,6 @@ class GattServer : public PalSigningMonitor {
         GapAdvertisingData::Appearance getAppearance();
 
     #endif // Disabled until reworked and reintroduced to GattServer API
-private:
-    struct char_auth_callback {
-        /** The registered callback handler for read authorization reply. */
-        FunctionPointerWithContext<GattReadAuthCallbackParams *> read_cb;
-        /** The registered callback handler for write authorization reply. */
-        FunctionPointerWithContext<GattWriteAuthCallbackParams *> write_cb;
-        /** built in list */
-        char_auth_callback *_next = nullptr;
-        /** Characteristic handle the callbacks belong to. */
-        ble::attribute_handle_t handle = 0;
-        /** security requirement of update operations */
-        ble::att_security_requirement_t update_security = ble::att_security_requirement_t::NONE;
-    };
 
 public:
     /**
@@ -287,7 +274,7 @@ class GattServer : public PalSigningMonitor {
 
     void *alloc_block(size_t block_size);
 
-    char_auth_callback *get_auth_callback(uint16_t value_handle);
+    GattCharacteristic *get_auth_char(uint16_t value_handle);
 
     bool get_cccd_index_by_cccd_handle(GattAttribute::Handle_t cccd_handle, uint8_t &idx) const;
 
@@ -367,8 +354,8 @@ class GattServer : public PalSigningMonitor {
     uint16_t cccd_handles[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CCCD_COUNT];
     uint8_t cccd_cnt;
 
-    char_auth_callback *_auth_callbacks;
-    uint8_t _auth_callbacks_count;
+    GattCharacteristic *_auth_char[MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CHARACTERISTIC_AUTHORISATION_COUNT];
+    uint8_t _auth_char_count;
 
     struct {
         attsGroup_t service;

cores/arduino/mbed/connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.h

@@ -401,18 +401,30 @@ class PalGap final : public ble::PalGap {
 
         static GapConnectionCompleteEvent convert(const hciLeConnCmplEvt_t *conn_evt)
         {
+            const bdAddr_t *peer_rpa = &conn_evt->peerRpa;
+            const bdAddr_t *peer_address = &conn_evt->peerAddr;
+
+#if defined(TARGET_MCU_STM32WB55xx)
+            const bdAddr_t invalidAddress = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+            if (conn_evt->addrType == DM_ADDR_RANDOM &&
+                memcmp(peer_address, invalidAddress, sizeof(invalidAddress)) == 0 &&
+                memcmp(peer_rpa, invalidAddress, sizeof(invalidAddress) != 0)
+            ) {
+                std::swap(peer_rpa, peer_address);
+            }
+#endif
             return GapConnectionCompleteEvent(
                 conn_evt->status,
                 // note the usage of the stack handle, not the HCI handle
                 conn_evt->hdr.param,
                 (connection_role_t::type) conn_evt->role,
                 (peer_address_type_t::type) conn_evt->addrType,
-                conn_evt->peerAddr,
+                *peer_address,
                 conn_evt->connInterval,
                 conn_evt->connLatency,
                 conn_evt->supTimeout,
                 conn_evt->localRpa,
-                conn_evt->peerRpa
+                *peer_rpa
             );
         }
     };

cores/arduino/mbed/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h

@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include "ble/driver/CordioHCITransportDriver.h"
 #include "drivers/DigitalInOut.h"
-#include "drivers/InterruptIn.h"
 #include "drivers/UnbufferedSerial.h"
 
 namespace ble {
@@ -41,9 +40,9 @@ class CyH4TransportDriver : public CordioHCITransportDriver {
      * Initialize the transport driver.
      *
      */
-	CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, PinName bt_power_name, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name,
+	CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name,
                             uint8_t host_wake_irq = 0, uint8_t dev_wake_irq = 0);
-        CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts,  PinName bt_power_name, int baud);
+        CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud);
 
     /**
      * Destructor
@@ -93,26 +92,19 @@ class CyH4TransportDriver : public CordioHCITransportDriver {
     mbed::UnbufferedSerial uart;
     PinName cts;
     PinName rts;
-    PinName tx;
-    PinName rx;
     PinName bt_host_wake_name;
     PinName bt_device_wake_name;
 
-    mbed::DigitalInOut bt_power;
     mbed::DigitalInOut bt_host_wake;
     mbed::DigitalInOut bt_device_wake;
-
     bool bt_host_wake_active;
 
-#if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
-    mbed::InterruptIn *host_wake_pin;
-#endif
-
     bool     enabled_powersave;
     uint8_t  host_wake_irq_event;
     uint8_t  dev_wake_irq_event;
 
     bool     holding_deep_sleep_lock;
+
 };
 
 } // namespace cypress

cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION.h

@@ -44,7 +44,6 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
         ModuleBGS2,
         ModuleEMS31,
         ModuleEHS5E,
-        ModuleTX62,
     };
     static Module get_module();
 
@@ -61,7 +60,6 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
     void init_module_els61();
     void init_module_ems31();
     void init_module_ehs5e();
-    void init_module_tx62();
 };
 
 } // namespace mbed

cores/arduino/mbed/connectivity/netsocket/include/netsocket/nsapi.h

@@ -34,9 +34,7 @@
 #include "netsocket/NetworkInterface.h"
 #include "netsocket/EthInterface.h"
 #include "netsocket/WiFiInterface.h"
-#if MBED_CONF_CELLULAR_PRESENT
 #include "netsocket/CellularInterface.h"
-#endif
 #include "netsocket/MeshInterface.h"
 
 #include "netsocket/Socket.h"