Merge pull request #10659 from LDong-Arm/replace_ArrayView

Replace uses of ArrayView with mbed::Span

Author: adbridge

features/FEATURE_BLE/ble/ArrayView.h

@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "ble/SafeEnum.h"
-#include "ble/ArrayView.h"
+#include "platform/Span.h"
 #include "ble/gap/Types.h"
 
 /**
@@ -33,6 +33,10 @@
 
 namespace ble {
 
+using mbed::Span;
+using mbed::make_Span;
+using mbed::make_const_Span;
+
 /** Special advertising set handle used for the legacy advertising set. */
 static const advertising_handle_t LEGACY_ADVERTISING_HANDLE = 0x00;
 
@@ -412,29 +416,29 @@ struct byte_array_t {
 };
 
 /**
- * Construct a fixed size ArrayView from a byte_array_t.
+ * Construct a fixed size Span from a byte_array_t.
  *
- * @param src byte_array_t to create a view from.
+ * @param src byte_array_t to create a Span from.
  *
- * @return An ArrayView to @p src.
+ * @return A Span to @p src.
  */
 template<size_t Size>
-ArrayView<uint8_t, Size> make_ArrayView(byte_array_t<Size>& src)
+Span<uint8_t, Size> make_Span(byte_array_t<Size>& src)
 {
-    return ArrayView<uint8_t, Size>(src.data(), src.size());
+    return Span<uint8_t, Size>(src.data(), src.size());
 }
 
 /**
- * Construct a fixed size ArrayView from a const byte_array_t.
+ * Construct a fixed size Span from a const byte_array_t.
  *
- * @param src byte_array_t to create a view from.
+ * @param src byte_array_t to create a Span from.
  *
- * @return An ArrayView to @p src.
+ * @return A Span to @p src.
  */
 template<size_t Size>
-ArrayView<const uint8_t, Size> make_const_ArrayView(const byte_array_t<Size>& src)
+Span<const uint8_t, Size> make_const_Span(const byte_array_t<Size>& src)
 {
-    return ArrayView<const uint8_t, Size>(src.data(), src.size());
+    return Span<const uint8_t, Size>(src.data(), src.size());
 }
 
 /** 128 bit keys used by paired devices */

features/FEATURE_BLE/ble/BLETypes.h

@@ -1438,13 +1438,13 @@ class LegacyGap :
      * Reset the value of the advertising payload advertised.
      *
      * @deprecated Deprecated since addition of extended advertising support.
-     * Use setAdvertisingPayload(ble::advertising_handle_t, mbed::Span<uint8_t>,
+     * Use setAdvertisingPayload(ble::advertising_handle_t, Span<uint8_t>,
      * bool).
      */
     MBED_DEPRECATED_SINCE(
         "mbed-os-5.11.0",
         "Deprecated since addition of extended advertising support. "
-        "Use setAdvertisingPayload(ble::advertising_handle_t, mbed::Span<uint8_t>,"
+        "Use setAdvertisingPayload(ble::advertising_handle_t, Span<uint8_t>,"
         "bool)."
     )
     void clearAdvertisingPayload(void);

features/FEATURE_BLE/ble/Gap.h

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "platform/Span.h"
+#include "ble/BLETypes.h"
 #include "platform/NonCopyable.h"
 
 #include "ble/blecommon.h"

features/FEATURE_BLE/ble/gap/AdvertisingDataBuilder.h

@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 #include "ble/gap/AdvertisingDataTypes.h"
-#include "platform/Span.h"
 
 namespace ble {
 

features/FEATURE_BLE/ble/gap/AdvertisingDataParser.h

@@ -19,7 +19,6 @@
 
 #include "ble/blecommon.h"
 #include "ble/BLETypes.h"
-#include "platform/Span.h"
 
 namespace ble {
 

features/FEATURE_BLE/ble/gap/Events.h

@@ -183,14 +183,14 @@ class GenericGap :
      */
     ble_error_t setAdvertisingPayload_(
         advertising_handle_t handle,
-        mbed::Span<const uint8_t> payload
+        Span<const uint8_t> payload
     );
 
     /** @copydoc Gap::setAdvertisingScanResponse
      */
     ble_error_t setAdvertisingScanResponse_(
         advertising_handle_t handle,
-        mbed::Span<const uint8_t> response
+        Span<const uint8_t> response
     );
 
     /** @copydoc Gap::startAdvertising
@@ -222,7 +222,7 @@ class GenericGap :
      */
     ble_error_t setPeriodicAdvertisingPayload_(
         advertising_handle_t handle,
-        mbed::Span<const uint8_t> payload
+        Span<const uint8_t> payload
     );
 
     /** @copydoc Gap::startPeriodicAdvertising
@@ -626,7 +626,7 @@ class GenericGap :
 private:
     ble_error_t setAdvertisingData(
         advertising_handle_t handle,
-        mbed::Span<const uint8_t> payload,
+        Span<const uint8_t> payload,
         bool minimiseFragmentation,
         bool scan_response
     );

features/FEATURE_BLE/ble/generic/GenericGap.h

@@ -26,7 +26,6 @@
 #include "ble/pal/SigningEventMonitor.h"
 #include "ble/generic/GenericGap.h"
 #include "ble/pal/PalSecurityManager.h"
-#include "ble/ArrayView.h"
 
 namespace ble {
 namespace generic {
@@ -473,7 +472,7 @@ class GenericSecurityManager :
      * @param count Number of identities entries retrieved.
      */
     void on_identity_list_retrieved(
-        ble::ArrayView<SecurityEntryIdentity_t>& identity_list,
+        Span<SecurityEntryIdentity_t>& identity_list,
         size_t count
     );
 

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -121,7 +121,7 @@ class SecurityDb {
         SecurityEntrySigningDbCb_t;
     typedef mbed::Callback<void(entry_handle_t, const SecurityEntryIdentity_t*)>
         SecurityEntryIdentityDbCb_t;
-    typedef mbed::Callback<void(ArrayView<SecurityEntryIdentity_t>&, size_t count)>
+    typedef mbed::Callback<void(Span<SecurityEntryIdentity_t>&, size_t count)>
         IdentitylistDbCb_t;
     typedef mbed::Callback<void(::Gap::Whitelist_t*)>
         WhitelistDbCb_t;
@@ -340,7 +340,7 @@ class SecurityDb {
      */
     virtual void get_identity_list(
         IdentitylistDbCb_t cb,
-        ArrayView<SecurityEntryIdentity_t>& identity_list
+        Span<SecurityEntryIdentity_t>& identity_list
     ) {
         size_t count = 0;
         for (size_t i = 0; i < get_entry_count() && count < identity_list.size(); ++i) {

features/FEATURE_BLE/ble/generic/SecurityDb.h

@@ -20,7 +20,6 @@
 #include "ble/common/StaticInterface.h"
 #include "ble/UUID.h"
 #include "ble/BLETypes.h"
-#include "ble/ArrayView.h"
 #include "ble/blecommon.h"
 #include "platform/Callback.h"
 #include "AttServerMessage.h"
@@ -197,7 +196,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
         connection_handle_t connection_handle,
         attribute_handle_range_t discovery_range,
         uint16_t type,
-        const ArrayView<const uint8_t>& value
+        const Span<const uint8_t>& value
     ) {
         return impl()->find_by_type_value_request_(
             connection_handle,
@@ -381,7 +380,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
      */
     ble_error_t read_multiple_request(
         connection_handle_t connection_handle,
-        const ArrayView<const attribute_handle_t>& attribute_handles
+        const Span<const attribute_handle_t>& attribute_handles
     ) {
         return impl()->read_multiple_request_(connection_handle, attribute_handles);
     }
@@ -489,7 +488,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
     ble_error_t write_request(
         connection_handle_t connection_handle,
         attribute_handle_t attribute_handle,
-        const ArrayView<const uint8_t>& value
+        const Span<const uint8_t>& value
     ) {
         return impl()->write_request_(connection_handle, attribute_handle, value);
     }
@@ -511,7 +510,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
     ble_error_t write_command(
         connection_handle_t connection_handle,
         attribute_handle_t attribute_handle,
-        const ArrayView<const uint8_t>& value
+        const Span<const uint8_t>& value
     ) {
         return impl()->write_command_(connection_handle, attribute_handle, value);
     }
@@ -538,7 +537,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
     ble_error_t signed_write_command(
         connection_handle_t connection_handle,
         attribute_handle_t attribute_handle,
-        const ArrayView<const uint8_t>& value
+        const Span<const uint8_t>& value
     ) {
         return impl()->signed_write_command_(connection_handle, attribute_handle, value);
     }
@@ -593,7 +592,7 @@ struct AttClient : public StaticInterface<Impl, AttClient> {
         connection_handle_t connection_handle,
         attribute_handle_t attribute_handle,
         uint16_t offset,
-        const ArrayView<const uint8_t>& value
+        const Span<const uint8_t>& value
     ) {
         return impl()->prepare_write_request_(
             connection_handle,