BLE Gap: remove version one scan API

Author: LDong-Arm

features/FEATURE_BLE/ble/gap/Gap.h

@@ -1265,15 +1265,6 @@ class Gap : public StaticInterface<Impl, Gap> {
     ble_error_t setRandomStaticAddress(const ble::address_t& address);
 
 protected:
-    /** Can only be called if use_non_deprecated_scan_api() hasn't been called.
-     *  This guards against mixed use of deprecated and nondeprecated API.
-     */
-    void useVersionOneAPI() const;
-
-    /** Can only be called if use_deprecated_scan_api() hasn't been called.
-     *  This guards against mixed use of deprecated and nondeprecated API.
-     */
-    void useVersionTwoAPI() const;
 
     /**
      * Construct a Gap instance.
@@ -1415,8 +1406,6 @@ class Gap : public StaticInterface<Impl, Gap> {
         central_privay_configuration_t *configuration
     );
     ble_error_t setRandomStaticAddress_(const ble::address_t& address);
-    void useVersionOneAPI_() const;
-    void useVersionTwoAPI_() const;
 
 protected:
     /**

features/FEATURE_BLE/ble/generic/GenericGap.h

@@ -99,8 +99,6 @@ class GenericGap :
     using ble::interface::Gap<GenericGap>::getMaxAdvertisingDataLength;
 #endif // BLE_ROLE_BROADCASTER
     using ble::interface::Gap<GenericGap>::isFeatureSupported;
-    using ble::interface::Gap<GenericGap>::useVersionOneAPI;
-    using ble::interface::Gap<GenericGap>::useVersionTwoAPI;
 
     // Imports from PalGap EventHandler
     using PalGapEventHandler::on_scan_timeout;
@@ -642,10 +640,6 @@ class GenericGap :
 
     void on_address_rotation_timeout();
 
-    void useVersionOneAPI_() const;
-
-    void useVersionTwoAPI_() const;
-
     /* implements pal::Gap::EventHandler */
 private:
     void on_read_phy_(
@@ -828,8 +822,6 @@ class GenericGap :
     BitArray<MAX_ADVERTISING_SETS> _set_is_connectable;
 
     // deprecation flags
-    mutable bool _deprecated_scan_api_used : 1;
-    mutable bool _non_deprecated_scan_api_used : 1;
     bool _user_manage_connection_parameter_requests : 1;
 
 private:

features/FEATURE_BLE/source/gap/Gap.tpp

@@ -418,18 +418,6 @@ ble_error_t Gap<Impl>::setPhy(
 }
 #endif // BLE_FEATURE_PHY_MANAGEMENT
 
-template<class Impl>
-void Gap<Impl>::useVersionOneAPI() const
-{
-    return impl()->useVersionOneAPI_();
-}
-
-template<class Impl>
-void Gap<Impl>::useVersionTwoAPI() const
-{
-    return impl()->useVersionTwoAPI_();
-}
-
 template<class Impl>
 Gap<Impl>::Gap() : _eventHandler(NULL)
 {
@@ -819,16 +807,6 @@ ble_error_t Gap<Impl>::setPhy_(
     return BLE_ERROR_NOT_IMPLEMENTED;
 }
 
-template<class Impl>
-void Gap<Impl>::useVersionOneAPI_() const
-{
-}
-
-template<class Impl>
-void Gap<Impl>::useVersionTwoAPI_() const
-{
-}
-
 template<class Impl>
 ble_error_t Gap<Impl>::enablePrivacy_(bool enable)
 {