Remove deprecated 2.3.1 APIs 10/172110/7
authorWootak Jung <wootak.jung@samsung.com>
Mon, 12 Mar 2018 02:10:51 +0000 (11:10 +0900)
committerWootak Jung <wootak.jung@samsung.com>
Thu, 22 Mar 2018 06:28:58 +0000 (15:28 +0900)
- Remove bt adapter le APIs
- Migrate to private header for some enums
- Add @MOBILE_ONLY tag for mobile only APIs
  to hide on Wearable API reference

Change-Id: I55035ca1d6278dddcfa7cbe05b2781241a66b3dc

include/bluetooth.h
include/bluetooth_internal.h
include/bluetooth_private.h
include/bluetooth_type.h
src/bluetooth-adapter.c
src/bluetooth-common.c
test/bt_unit_test.c
test/bt_unit_test.h

index 1510e427d72a3693205998e4cb60c2d5823142eb..534c34c6c2654861166fad9bff88f1e038ef51b2 100644 (file)
@@ -758,77 +758,16 @@ int bt_adapter_set_remote_oob_ext_data(const char *remote_address,
 int bt_adapter_remove_remote_oob_data(const char *remote_address);
 
 /**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Starts the LE device discovery.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
- *
- * @details If a LE device is discovered, bt_adapter_le_device_discovery_state_changed_cb()
-*  will be invoked with #BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND, and then bt_adapter_le_device_discovery_state_changed_cb()
- * will be called with #BT_ADAPTER_LE_DEVICE_DISCOVERY_FINISHED in case of the completion or cancellation of the discovery.
- *
- * @remarks To connect to peer Bluetooth device, you need to know its Bluetooth address. \n
- * The device discovery can be stopped by bt_adapter_le_stop_device_discovery().
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_NOT_ENABLED  Not enabled
- * @retval #BT_ERROR_NOW_IN_PROGRESS  Operation is now in progress
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_PERMISSION_DENIED  Permission denied
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The state of local Bluetooth must be #BT_ADAPTER_ENABLED.
- * @post This function invokes bt_adapter_le_device_discovery_state_changed_cb().
- *
- * @see bt_adapter_le_is_discovering()
- * @see bt_adapter_le_device_discovery_state_changed_cb()
- * @see bt_adapter_le_set_device_discovery_state_changed_cb()
- * @see bt_adapter_le_unset_device_discovery_state_changed_cb()
- */
-int bt_adapter_le_start_device_discovery(void) TIZEN_DEPRECATED_API;
-
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Stops the LE device discovery, asynchronously.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_NOT_ENABLED  Not enabled
- * @retval #BT_ERROR_NOT_IN_PROGRESS  Operation is not in progress
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_PERMISSION_DENIED  Permission denied
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The device discovery must be in progress with bt_adapter_le_start_device_discovery().
- * @post This function invokes bt_adapter_le_device_discovery_state_changed_cb().
- *
- * @see bt_adapter_le_is_discovering()
- * @see bt_adapter_le_start_device_discovery()
- * @see bt_adapter_le_set_device_discovery_state_changed_cb()
- * @see bt_adapter_le_unset_device_discovery_state_changed_cb()
- * @see bt_adapter_le_device_discovery_state_changed_cb()
- */
-int bt_adapter_le_stop_device_discovery(void) TIZEN_DEPRECATED_API;
-
-/**
+ * @MOBILE_ONLY
  * @deprecated Deprecated since 2.3.1
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief Checks for the LE device discovery is in progress or not.
- * @since_tizen @if WEARABLE @else 2.3 @endif
+ * @since_tizen 2.3
  *
- * @remarks If Bluetooth LE discovery is in progress, other operations are not allowed and
- * you have to either stop the LE discovery operation, or wait for it to be finished,
+ * @remarks If Bluetooth LE scan is in progress, other operations are not allowed and
+ * you have to either stop the LE scan operation, or wait for it to be finished,
  * before performing other operations.
-
+ *
  * @param[out] is_discovering The discovering status: (@c true = in progress , @c  false = not in progress )
  *
  * @return 0 on success, otherwise a negative error value.
@@ -840,53 +779,8 @@ int bt_adapter_le_stop_device_discovery(void) TIZEN_DEPRECATED_API;
  * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
  *
  * @pre The state of local Bluetooth must be #BT_ADAPTER_ENABLED.
- *
- * @see bt_adapter_le_start_device_discovery()
- * @see bt_adapter_le_stop_device_discovery()
- */
-int bt_adapter_le_is_discovering(bool *is_discovering) TIZEN_DEPRECATED_API;
-
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief  Registers a callback function to be invoked when the LE device discovery state changes.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @param[in] callback The callback function to register
- * @param[in] user_data The user data to be passed to the callback function
- *
- * @return   0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_INVALID_PARAMETER  Invalid parameter
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The Bluetooth service must be initialized with bt_initialize().
- * @post bt_adapter_le_device_discovery_state_changed_cb() will be invoked.
- *
- * @see bt_initialize()
- * @see bt_adapter_le_device_discovery_state_changed_cb()
- * @see bt_adapter_le_unset_device_discovery_state_changed_cb()
  */
-int bt_adapter_le_set_device_discovery_state_changed_cb(bt_adapter_le_device_discovery_state_changed_cb callback, void *user_data) TIZEN_DEPRECATED_API;
-
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief      Unregisters the callback function.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @return     0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The Bluetooth service must be initialized with bt_initialize().
- *
- * @see bt_initialize()
- * @see bt_adapter_le_set_device_discovery_state_changed_cb()
- */
-int bt_adapter_le_unset_device_discovery_state_changed_cb(void) TIZEN_DEPRECATED_API;
+int bt_adapter_le_is_discovering(bool *is_discovering);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1327,39 +1221,6 @@ int bt_ipsp_set_connection_state_changed_cb(bt_ipsp_connection_state_changed_cb
  */
 int bt_ipsp_unset_connection_state_changed_cb(void);
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Set the data to be advertised or responded to scan request from LE scanning device.
- *        The maximum advertised or responded data size is 31 bytes
- *        including data type and system wide data.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @remarks In case the data_type is local name or tx power level, you don't need to input data
- * because the data value is written automatically by system.
- *
- * @param[in] advertiser The handle of advertiser
- * @param[in] pkt_type The packet type
- * @param[in] data_type The data type that is included in packet
- * @param[in] data The data to be advertised or be responded to scan request from LE scanning device, no need in case of LOCAL_NAME or TX_POWER_LEVEL
- * @param[in] data_size The size of data to be set.
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_INVALID_PARAMETER  Invalid parameter
- * @retval #BT_ERROR_QUOTA_EXCEEDED  Quota exceeded
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The Bluetooth service must be initialized with bt_initialize().
- *
- * @see bt_adapter_le_clear_advertising_data()
- */
-int bt_adapter_le_add_advertising_data(bt_advertiser_h advertiser,
-               bt_adapter_le_packet_type_e pkt_type, bt_adapter_le_packet_data_type_e data_type,
-               void *data, unsigned int data_size) TIZEN_DEPRECATED_API;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief Add a service UUID to advertise or scan response data.
@@ -1555,31 +1416,6 @@ int bt_adapter_le_set_advertising_device_name(bt_advertiser_h advertiser,
 int bt_adapter_le_set_advertising_tx_power_level(bt_advertiser_h advertiser,
                bt_adapter_le_packet_type_e pkt_type, bool include_tx_power);
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Unset the data to be advertised or responded to scan request from LE scanning device.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @param[in] advertiser The handle of advertiser
- * @param[in] pkt_type The packet type
- * @param[in] data_type The data type to be removed from selected packet
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_INVALID_PARAMETER  Invalid parameter
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The Bluetooth service must be initialized with bt_initialize().
- *
- * @see bt_adapter_le_add_advertising_data()
- * @see bt_adapter_le_clear_advertising_data()
- */
-int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
-               bt_adapter_le_packet_type_e pkt_type, bt_adapter_le_packet_data_type_e data_type) TIZEN_DEPRECATED_API;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief Clear all data to be advertised or responded to scan request from LE scanning device.
@@ -1595,48 +1431,9 @@ int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
  * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
- *
- * @see bt_adapter_le_add_advertising_data()
  */
 int bt_adapter_le_clear_advertising_data(bt_advertiser_h advertiser, bt_adapter_le_packet_type_e pkt_type);
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Start advertising with passed advertiser and advertising parameters.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
- *
- * @details Once Bluetooth advertising is started, nearby Bluetooth LE(Low Energy) supported
- * devices can know this device's existence. And one of them can make a connection request,
- * if it is allowed.
- *
- * @param[in] advertiser The handle of advertiser
- * @param[in] adv_params The parameters of advertising \n
- * If NULL is passed, default values which are defined in driver / controller are used.
- * @param[in] cb The callback to report the result of this function
- * @param[in] user_data The user data to be passed when callback is called
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_INVALID_PARAMETER  Invalid parameter
- * @retval #BT_ERROR_NOT_ENABLED  Not enabled
- * @retval #BT_ERROR_NOW_IN_PROGRESS  Operation is now in progress
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_PERMISSION_DENIED  Permission denied
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The Bluetooth service must be initialized with bt_initialize().
- * @post This function invokes bt_adapter_le_advertising_state_changed_cb().
- *
- * @see bt_adapter_le_stop_advertising()
- * @see bt_adapter_le_advertising_state_changed_cb()
- */
-int bt_adapter_le_start_advertising(bt_advertiser_h advertiser, bt_adapter_le_advertising_params_s *adv_params,
-               bt_adapter_le_advertising_state_changed_cb cb, void *user_data) TIZEN_DEPRECATED_API;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief Stops the advertising.
index c7d261fca91ae63bc830c17ec3b8757114c54cd5..3e31937856e9646e1f97dd7f1b6e22339570bc6d 100644 (file)
@@ -703,35 +703,6 @@ int bt_adapter_le_add_white_list(const char *address, bt_device_address_type_e a
  */
 int bt_adapter_le_remove_white_list(const char *address, bt_device_address_type_e address_type);
 
-/**
- * @internal
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief clear address from the whitelist for not accepting scanning request.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- * @privlevel platform
- * @privilege %http://tizen.org/privilege/bluetooth.admin
- *
- * @remarks If the adress is in the whitelist then other LE devices are able to
- * search this device. Before calling this API, make sure that the adapter is
- * enabled. There is no callback event for this API.
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #BT_ERROR_NONE  Successful
- * @retval #BT_ERROR_NOT_INITIALIZED  Not initialized
- * @retval #BT_ERROR_NOT_ENABLED  Adapter is not enabled
- * @retval #BT_ERROR_RESOURCE_BUSY  Device or resource busy
- * @retval #BT_ERROR_OPERATION_FAILED  Operation failed
- * @retval #BT_ERROR_PERMISSION_DENIED  Permission denied
- * @retval #BT_ERROR_NOT_SUPPORTED  Not supported
- *
- * @pre The state of local Bluetooth must be #BT_ADAPTER_ENABLED.
- *
- * @see bt_adapter_le_start_advertising_new()
- * @see bt_adapter_le_stop_advertising()
- */
-int bt_adapter_le_clear_white_list(void);
-
 /**
  * @internal
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
index 39b02c7d151b5d88a91120d2de3f6ace83bdea06..2293204a0bc126e67b624caeb2dc2280c951a14a 100644 (file)
@@ -68,7 +68,6 @@ typedef enum {
        BT_EVENT_VISIBILITY_MODE_CHANGED, /**< Adapter visibility mode is changed */
        BT_EVENT_VISIBILITY_DURATION_CHANGED, /**< Adapter visibility duration is changed */
        BT_EVENT_DEVICE_DISCOVERY_STATE_CHANGED, /**< Device discovery state is changed */
-       BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED, /**< LE Device discovery state is changed */
        BT_EVENT_LE_SCAN_RESULT_UPDATED, /**< LE Scan result is updated */
        BT_EVENT_BOND_CREATED, /**< A bond is created */
        BT_EVENT_BOND_DESTROYED, /**< A bond is destroyed */
@@ -191,6 +190,19 @@ typedef enum {
        BT_ADAPTER_LE_ADVERTISING_DATA_MANUFACTURER_SPECIFIC_DATA = 0xff, /**< Manufacturer data */
 } bt_adapter_le_advertising_data_type_e;
 
+/**
+ * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
+ * @brief  Enumerations of the Bluetooth advertising type.
+ * @since_tizen @if WEARABLE @else 2.3 @endif
+ */
+typedef enum {
+       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE = 0x00, /**< Connectable undirected advertising (ADV_IND) */
+       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_HIGH = 0x01, /**< Connectable high duty cycle directed advertising (ADV_DIRECT_IND) */
+       BT_ADAPTER_LE_ADVERTISING_SCANNABLE = 0x02, /**< Scannable undirected advertising (ADV_SCAN_IND) */
+       BT_ADAPTER_LE_ADVERTISING_NON_CONNECTABLE = 0x03, /**< Non connectable undirected advertising (ADV_NONCOND_IND) */
+       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_LOW = 0x04, /**< Connectable low duty cycle directed advertising (ADV_DIRECT_IND) */
+} bt_adapter_le_advertising_type_e;
+
 /**
  * @internal
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_MODULE
index d69849f769458654233365087df72b6b17dae530..06c79dec71e0212e4f2ed926645636532e7b7f04 100644 (file)
@@ -140,19 +140,6 @@ typedef enum {
        BT_ADAPTER_DEVICE_DISCOVERY_FOUND, /**< The remote Bluetooth device is found */
 } bt_adapter_device_discovery_state_e;
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Enumerations of the discovery state of Bluetooth LE device.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- */
-typedef enum {
-       BT_ADAPTER_LE_DEVICE_DISCOVERY_STARTED, /**< LE device discovery is started */
-       BT_ADAPTER_LE_DEVICE_DISCOVERY_FINISHED, /**< LE device discovery is finished */
-       BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND, /**< The remote Bluetooth LE device is found */
-} bt_adapter_le_device_discovery_state_e;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief  Enumerations of the Bluetooth advertising state.
@@ -189,20 +176,6 @@ typedef enum {
                                        scan and connection request that in the White list */
 } bt_adapter_le_advertising_filter_policy_e;
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief  Enumerations of the Bluetooth advertising type.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- */
-typedef enum {
-       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE = 0x00, /**< Connectable undirected advertising (ADV_IND) */
-       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_HIGH = 0x01, /**< Connectable high duty cycle directed advertising (ADV_DIRECT_IND) */
-       BT_ADAPTER_LE_ADVERTISING_SCANNABLE = 0x02, /**< Scannable undirected advertising (ADV_SCAN_IND) */
-       BT_ADAPTER_LE_ADVERTISING_NON_CONNECTABLE = 0x03, /**< Non connectable undirected advertising (ADV_NONCOND_IND) */
-       BT_ADAPTER_LE_ADVERTISING_CONNECTABLE_DIRECT_LOW = 0x04, /**< Connectable low duty cycle directed advertising (ADV_DIRECT_IND) */
-} bt_adapter_le_advertising_type_e;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief  Enumerations of the Bluetooth LE packet type.
@@ -213,19 +186,6 @@ typedef enum {
        BT_ADAPTER_LE_PACKET_SCAN_RESPONSE, /**< Scan response packet */
 } bt_adapter_le_packet_type_e;
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief  Enumerations of the Bluetooth LE data type
- *         that can be included in LE packets.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- */
-typedef enum {
-       BT_ADAPTER_LE_PACKET_DATA_COMP_LIST_16_BIT_SERVICE_CLASS_UUIDS = 0x03, /**< Complete list of 16 bit UUIDs */
-       BT_ADAPTER_LE_PACKET_DATA_LOCAL_NAME = 0x09, /**<local device name. unit-test uses this. */
-       BT_ADAPTER_LE_PACKET_DATA_MANUFACTURER_SPECIFIC_DATA = 0xff, /**< Manufacturer data */
-} bt_adapter_le_packet_data_type_e;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief  Enumerations of the Bluetooth le scan mode.
@@ -942,25 +902,6 @@ typedef struct {
        char *manufacturer_data;                /**< manufacturer specific data */
 } bt_adapter_device_discovery_info_s;
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Structure of le device discovery information.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @see #bt_class_s
- * @see bt_adapter_le_device_discovery_state_changed_cb()
- */
-typedef struct {
-       char *remote_address;   /**< The address of remote device */
-       int address_type;       /**< The address type of remote device */
-       int rssi;       /**< The strength indicator of received signal  */
-       int adv_data_len;               /**< advertising indication data length */
-       char *adv_data;                 /**< advertising indication data */
-       int scan_data_len;              /**< scan response data length */
-       char *scan_data;                /**< scan response data */
-} bt_adapter_le_device_discovery_info_s;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief Structure of le scan result information.
@@ -994,24 +935,6 @@ typedef struct {
        int measured_power;     /**< Measured power */
 } bt_adapter_le_ibeacon_scan_result_info_s;
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief Structure of advertising parameters.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @see bt_adapter_le_advertising_state_changed_cb()
- * @see bt_adapter_le_start_advertising()
- */
-typedef struct {
-       float interval_min; /**< Minimum advertising interval for non-directed advertising.
-                             A multiple of 0.625ms is only allowed (Time range : 20ms to 10.24sec). */
-       float interval_max; /**< Maximum advertising interval for non-directed advertising.
-                             A multiple of 0.625ms is only allowed (Time range : 20ms to 10.24sec). */
-       char filter_policy; /* Advertising filter policy */
-       char type; /* Advertising type */
-} bt_adapter_le_advertising_params_s;
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief LE service data structure.
@@ -1237,34 +1160,6 @@ typedef void (*bt_adapter_device_discovery_state_changed_cb)
  */
 typedef bool (*bt_adapter_bonded_device_cb)(bt_device_info_s *device_info, void *user_data);
 
-/**
- * @deprecated Deprecated since 2.3.1
- * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
- * @brief  Called when the state of LE device discovery changes.
- * @since_tizen @if WEARABLE @else 2.3 @endif
- *
- * @remarks If \a discovery_state is #BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND,
- * then you can get some information, such as remote LE device address, remote device name, rssi, and bonding state.
- *
- * @param[in] result The result of the LE device discovery
- * @param[in] discovery_state The discovery state to be changed
- * @param[in] discovery_info The information of the discovered LE device \n
- *                                     If \a discovery_state is #BT_ADAPTER_LE_DEVICE_DISCOVERY_STARTED or
- * #BT_ADAPTER_LE_DEVICE_DISCOVERY_FINISHED, then \a discovery_info is NULL.
- * @param[in] user_data The user data passed from the callback registration function
- *
- * @pre Either bt_adapter_start_device_discovery() or bt_adapter_stop_device_discovery() will invoke this function
- * if you register this callback using bt_adapter_set_device_discovery_state_changed_cb().
- *
- * @see bt_adapter_le_start_device_discovery()
- * @see bt_adapter_le_stop_device_discovery()
- * @see bt_adapter_le_set_device_discovery_state_changed_cb()
- * @see bt_adapter_le_unset_device_discovery_state_changed_cb()
- *
- */
-typedef void (*bt_adapter_le_device_discovery_state_changed_cb)
-       (int result, bt_adapter_le_device_discovery_state_e discovery_state, bt_adapter_le_device_discovery_info_s *discovery_info, void *user_data);
-
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
  * @brief  Called when the LE advertisement has been found.
index 811e96f5be4fc9a940871b088f868b022244cea0..29cff0e1873ab59de539f5eeb1ee99845cb12f64 100644 (file)
@@ -865,21 +865,6 @@ int bt_adapter_set_device_discovery_state_changed_cb(bt_adapter_device_discovery
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_set_device_discovery_state_changed_cb(bt_adapter_le_device_discovery_state_changed_cb callback,
-                                                       void *user_data)
-{
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_set_device_discovery_state_changed_cb() is deprecated and will be removed from next release.");
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(callback);
-
-       _bt_le_adapter_init();
-       _bt_set_cb(BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED,
-                                               callback, user_data);
-       return BT_ERROR_NONE;
-}
-
 int bt_adapter_unset_state_changed_cb(void)
 {
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
@@ -943,17 +928,6 @@ int bt_adapter_unset_device_discovery_state_changed_cb(void)
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_unset_device_discovery_state_changed_cb(void)
-{
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_unset_device_discovery_state_changed_cb() is deprecated and will be removed from next release.");
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       _bt_unset_cb(BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED);
-       _bt_le_adapter_deinit();
-       return BT_ERROR_NONE;
-}
-
 int bt_adapter_start_device_discovery(void)
 {
        int error_code = BT_ERROR_NONE;
@@ -1003,40 +977,9 @@ int bt_adapter_is_discovering(bool *is_discovering)
        }
 }
 
-int bt_adapter_le_start_device_discovery(void)
-{
-       int error_code = BT_ERROR_NONE;
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_start_device_discovery() is deprecated and will be removed from next release. Use bt_adapter_le_start_scan() instead.");
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       error_code = _bt_get_error_code(bluetooth_start_le_discovery());
-       if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                                       error_code); /* LCOV_EXCL_LINE */
-       } /* LCOV_EXCL_LINE */
-       return error_code;
-}
-
-int bt_adapter_le_stop_device_discovery(void)
-{
-       int error_code = BT_ERROR_NONE;
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_stop_device_discovery() is deprecated and will be removed from next release. Use bt_adapter_le_stop_scan() instead.");
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       error_code = _bt_get_error_code(bluetooth_stop_le_discovery());
-       if (error_code != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                                                               error_code);
-       }
-       return error_code;
-}
-
 int bt_adapter_le_is_discovering(bool *is_discovering)
 {
        int ret = 0;
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_is_discovering() is deprecated and will be removed from next release.");
 
        BT_CHECK_LE_SUPPORT();
        BT_CHECK_INIT_STATUS();
@@ -1515,24 +1458,6 @@ int bt_adapter_le_remove_white_list(const char *address, bt_device_address_type_
        return error_code;
 }
 
-int bt_adapter_le_clear_white_list(void)
-{
-       int error_code = BT_ERROR_NONE;
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_clear_white_list() is deprecated and will be removed from next release.");
-
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-
-       error_code = _bt_get_error_code(bluetooth_clear_white_list());
-       if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
-                                       error_code); /* LCOV_EXCL_LINE */
-       } /* LCOV_EXCL_LINE */
-
-       return error_code;
-}
-
 int bt_adapter_le_set_scan_mode(bt_adapter_le_scan_mode_e scan_mode)
 {
        int ret = BT_ERROR_NONE;
@@ -1696,29 +1621,24 @@ static int __bt_remove_ad_data_by_type(char *in_data, unsigned int in_len,
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_add_advertising_data(bt_advertiser_h advertiser,
+static int bt_adapter_le_add_advertising_data(bt_advertiser_h advertiser,
                bt_adapter_le_packet_type_e pkt_type,
-               bt_adapter_le_packet_data_type_e data_type,
+               bt_adapter_le_advertising_data_type_e data_type,
                void *data, unsigned int data_size)
 {
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_add_advertising_data() is deprecated and will be removed from next release.");
-
        bt_advertiser_s *__adv = (bt_advertiser_s *)advertiser;
        char **p;
        unsigned int *len;
        unsigned int *system_data_len;
        char *new_p;
-       bt_adapter_le_advertising_data_type_e adv_type;
        int adv_flag_len = 0;
        int adv_ext_len = 0;
 
-       adv_type = (bt_adapter_le_advertising_data_type_e)data_type;
-
        BT_CHECK_LE_SUPPORT();
        BT_CHECK_INIT_STATUS();
        if ((data == NULL || data_size == 0) &&
-               (adv_type != BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME &&
-               adv_type != BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)) {
+               (data_type != BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME &&
+               data_type != BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)) {
                BT_ERR("empty data for packet type %d",
                                        pkt_type); /* LCOV_EXCL_LINE */
                return BT_ERROR_INVALID_PARAMETER; /* LCOV_EXCL_LINE */
@@ -1738,8 +1658,8 @@ int bt_adapter_le_add_advertising_data(bt_advertiser_h advertiser,
        } else
                return BT_ERROR_INVALID_PARAMETER;
 
-       if (adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
-               adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
+       if (data_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
+               data_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
                adv_ext_len = *system_data_len + 1;
 
        /* 2 bytes are required for Length and AD Type */
@@ -1756,26 +1676,24 @@ int bt_adapter_le_add_advertising_data(bt_advertiser_h advertiser,
                return BT_ERROR_OUT_OF_MEMORY;
 
        new_p[*len] = data_size + 1;
-       new_p[*len + 1] = adv_type;
+       new_p[*len + 1] = data_type;
        if ((data != NULL) && (data_size != 0))
                memcpy(new_p + (*len + 2), data, data_size);
 
        *p = new_p;
        *len += data_size + 2;
 
-       if (adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
-               adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
+       if (data_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
+               data_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
                *system_data_len += 1;
 
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
+static int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
                bt_adapter_le_packet_type_e pkt_type,
-               bt_adapter_le_packet_data_type_e data_type)
+               bt_adapter_le_advertising_data_type_e data_type)
 {
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_remove_advertising_data() is deprecated and will be removed from next release.");
-
        int ret = BT_ERROR_NONE;
        bt_advertiser_s *__adv = (bt_advertiser_s *)advertiser;
        char **p;
@@ -1783,9 +1701,6 @@ int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
        unsigned int *system_data_len;
        char *new_p = NULL;
        unsigned int new_len = 0;
-       bt_adapter_le_advertising_data_type_e adv_type;
-
-       adv_type = (bt_adapter_le_advertising_data_type_e)data_type;
 
        BT_CHECK_LE_SUPPORT();
        BT_CHECK_INIT_STATUS();
@@ -1810,7 +1725,7 @@ int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
                return BT_ERROR_INVALID_PARAMETER; /* LCOV_EXCL_LINE */
        }
 
-       ret = __bt_remove_ad_data_by_type(*p, *len, adv_type, &new_p, &new_len);
+       ret = __bt_remove_ad_data_by_type(*p, *len, data_type, &new_p, &new_len);
        if (ret != BT_ERROR_NONE)
                return ret;
 
@@ -1818,8 +1733,8 @@ int bt_adapter_le_remove_advertising_data(bt_advertiser_h advertiser,
        *p = new_p;
        *len = new_len;
 
-       if (adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
-               adv_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
+       if (data_type == BT_ADAPTER_LE_ADVERTISING_DATA_LOCAL_NAME ||
+               data_type == BT_ADAPTER_LE_ADVERTISING_DATA_TX_POWER_LEVEL)
                *system_data_len -= 1; /* LCOV_EXCL_LINE */
 
        return ret;
@@ -2372,74 +2287,6 @@ int bt_adapter_le_clear_advertising_data(bt_advertiser_h advertiser,
        return ret;
 }
 
-int bt_adapter_le_start_advertising(bt_advertiser_h advertiser,
-               bt_adapter_le_advertising_params_s *adv_params,
-               bt_adapter_le_advertising_state_changed_cb cb,
-               void *user_data)
-{
-       BT_INFO("DEPRECATION WARNING: bt_adapter_le_start_advertising() is deprecated and will be removed from next release. Use bt_adapter_le_start_advertising_new() instead");
-
-       int ret = BT_ERROR_NONE;
-       int error_code;
-       bt_advertiser_s *__adv = (bt_advertiser_s *)advertiser;
-       bluetooth_advertising_data_t adv = { {0} };
-       bluetooth_scan_resp_data_t resp = { {0} };
-       bluetooth_advertising_params_t param;
-
-       BT_CHECK_LE_SUPPORT();
-       BT_CHECK_INIT_STATUS();
-       BT_CHECK_INPUT_PARAMETER(advertiser);
-
-       if (__adv->adv_data_len > 0 &&
-               __adv->adv_data) { /* LCOV_EXCL_START */
-               memcpy(adv.data, __adv->adv_data, __adv->adv_data_len);
-               error_code = bluetooth_set_advertising_data(__adv->handle,
-                                       &adv, __adv->adv_data_len);
-               ret = _bt_get_error_code(error_code);
-               if (ret != BT_ERROR_NONE) {
-                       BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret),
-                                                                       ret);
-                       return ret; /* LCOV_EXCL_STOP */
-               }
-       }
-
-       if (__adv->scan_rsp_data_len > 0 &&
-               __adv->scan_rsp_data) { /* LCOV_EXCL_START */
-               memcpy(resp.data, __adv->scan_rsp_data, __adv->scan_rsp_data_len);
-               error_code = bluetooth_set_scan_response_data(__adv->handle,
-                                       &resp, __adv->scan_rsp_data_len);
-               ret = _bt_get_error_code(error_code);
-               if (ret != BT_ERROR_NONE) {
-                       BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret),
-                                                                       ret);
-                       return ret; /* LCOV_EXCL_STOP */
-               }
-       }
-
-       if (adv_params == NULL) {
-               error_code = bluetooth_set_advertising(__adv->handle,
-                                               TRUE); /* LCOV_EXCL_LINE */
-       } else {
-               param.interval_min = adv_params->interval_min;
-               param.interval_max = adv_params->interval_max;
-               param.filter_policy = BT_ADAPTER_LE_ADVERTISING_FILTER_DEFAULT;
-               param.type = BT_ADAPTER_LE_ADVERTISING_CONNECTABLE;
-               error_code = bluetooth_set_custom_advertising(__adv->handle,
-                                       TRUE, &param);
-       }
-
-       ret = _bt_get_error_code(error_code);
-       if (ret != BT_ERROR_NONE) {
-               BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret),
-                                               ret); /* LCOV_EXCL_LINE */
-               return ret;
-       }
-
-       _bt_set_cb(BT_EVENT_ADVERTISING_STATE_CHANGED, cb, user_data);
-
-       return ret;
-}
-
 int bt_adapter_le_stop_advertising(bt_advertiser_h advertiser)
 {
        int ret = BT_ERROR_NONE;
index b969f7ed7d5e7f89bdd2f5f07c2db66324624180..32598c1e244c511108bed189af8bf3a167e91086 100644 (file)
@@ -55,9 +55,6 @@ static void __bt_free_bt_adapter_le_device_scan_info_s(bt_adapter_le_device_scan
 /* TDS Forward declarations */
 static void __bt_free_tds_scan_result_info_s(bt_tds_transport_block_list_s *discovery_info);
 
-static int __bt_get_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device_discovery_info_s **le_discovery_info, bluetooth_le_device_info_t *source_info);
-static void __bt_free_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device_discovery_info_s *discovery_info);
-
 /*
  *  Public Functions
  */
@@ -162,8 +159,7 @@ int _bt_le_adapter_deinit(void)
                return BT_ERROR_NOT_INITIALIZED;
        }
 
-       if (!_bt_check_cb(BT_EVENT_LE_STATE_CHANGED) &&
-           !_bt_check_cb(BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED)) {
+       if (!_bt_check_cb(BT_EVENT_LE_STATE_CHANGED)) {
                if (bluetooth_le_unregister_callback() != BLUETOOTH_ERROR_NONE) { /* LCOV_EXCL_LINE */
                        BT_ERR("OPERATION_FAILED(0x%08x)", BT_ERROR_OPERATION_FAILED); /* LCOV_EXCL_LINE */
                        return BT_ERROR_OPERATION_FAILED; /* LCOV_EXCL_LINE */
@@ -2544,12 +2540,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                BT_INFO("BLUETOOTH_EVENT_ADVERTISING_STARTED");
                adv_handle = (int *)(param->param_data);
 
-               if (bt_event_slot_container[event_index].callback != NULL) {
-                       ((bt_adapter_le_advertising_state_changed_cb)bt_event_slot_container[event_index].callback)
-                               (_bt_get_error_code(param->result), NULL, BT_ADAPTER_LE_ADVERTISING_STARTED,
-                               bt_event_slot_container[event_index].user_data);
-               }
-
                _bt_adapter_le_invoke_advertising_state_cb(*adv_handle,
                                _bt_get_error_code(param->result), BT_ADAPTER_LE_ADVERTISING_STARTED);
 
@@ -2558,12 +2548,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                BT_INFO("BLUETOOTH_EVENT_ADVERTISING_STOPPED"); /* LCOV_EXCL_START */
                adv_handle = (int *)(param->param_data);
 
-               if (bt_event_slot_container[event_index].callback != NULL) {
-                       ((bt_adapter_le_advertising_state_changed_cb)bt_event_slot_container[event_index].callback)
-                               (_bt_get_error_code(param->result), NULL, BT_ADAPTER_LE_ADVERTISING_STOPPED,
-                               bt_event_slot_container[event_index].user_data);
-               }
-
                _bt_adapter_le_invoke_advertising_state_cb(*adv_handle,
                                _bt_get_error_code(param->result), BT_ADAPTER_LE_ADVERTISING_STOPPED); /* LCOV_EXCL_STOP */
 
@@ -3163,7 +3147,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
 static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void *user_data)
 {
        bt_adapter_le_device_scan_result_info_s *scan_info = NULL;
-       bt_adapter_le_device_discovery_info_s *discovery_info = NULL;
        int event_index = -1;
 
        event_index = __bt_get_cb_index(event);
@@ -3183,25 +3166,6 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                ((bt_adapter_le_state_changed_cb) bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
                    (_bt_get_error_code(param->result), BT_ADAPTER_LE_DISABLED, bt_event_slot_container[event_index].user_data);
                break;
-
-       case BLUETOOTH_EVENT_LE_DISCOVERY_STARTED:
-               if (!TIZEN_PROFILE_WEARABLE_IVI) {
-                       BT_INFO("BLUETOOTH_EVENT_LE_DISCOVERY_STARTED"); /* LCOV_EXCL_LINE */
-                       ((bt_adapter_le_device_discovery_state_changed_cb) bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
-                               (_bt_get_error_code(param->result), BT_ADAPTER_LE_DEVICE_DISCOVERY_STARTED, NULL, bt_event_slot_container[event_index].user_data);
-                       break;
-               } else {
-                       break; /* goto default */
-               }
-       case BLUETOOTH_EVENT_LE_DISCOVERY_FINISHED:
-               if (!TIZEN_PROFILE_WEARABLE_IVI) {
-                       BT_INFO("BLUETOOTH_EVENT_LE_DISCOVERY_FINISHED"); /* LCOV_EXCL_LINE */
-                       ((bt_adapter_le_device_discovery_state_changed_cb)bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
-                               (_bt_get_error_code(param->result), BT_ADAPTER_LE_DEVICE_DISCOVERY_FINISHED, NULL, bt_event_slot_container[event_index].user_data);
-                       break;
-               } else {
-                       break; /* goto default */
-               }
        case BLUETOOTH_EVENT_REMOTE_LE_DEVICE_FOUND: /* LCOV_EXCL_START */
                BT_INFO("BLUETOOTH_EVENT_REMOTE_LE_DEVICE_FOUND");
                event_index = BT_EVENT_LE_SCAN_RESULT_UPDATED;
@@ -3214,19 +3178,6 @@ static void __bt_le_event_proxy(int event, bluetooth_event_param_t *param, void
                                        (_bt_get_error_code(param->result), NULL, bt_event_slot_container[event_index].user_data);
                        }
                }
-               if (!TIZEN_PROFILE_WEARABLE_IVI) {
-                       event_index = BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED;
-                       if (bt_event_slot_container[event_index].callback != NULL) {
-                               if (__bt_get_bt_adapter_le_device_discovery_info_s(&discovery_info, (bluetooth_le_device_info_t *)(param->param_data)) == BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
-                                       ((bt_adapter_le_device_discovery_state_changed_cb)bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
-                                               (_bt_get_error_code(param->result), BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND, discovery_info, bt_event_slot_container[event_index].user_data);
-                                       __bt_free_bt_adapter_le_device_discovery_info_s(discovery_info); /* LCOV_EXCL_LINE */
-                               } else {
-                                       ((bt_adapter_le_device_discovery_state_changed_cb)bt_event_slot_container[event_index].callback) /* LCOV_EXCL_LINE */
-                                               (_bt_get_error_code(param->result), BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND, NULL, bt_event_slot_container[event_index].user_data);
-                               }
-                       }
-               }
                /* TDS Provider Search: Uses Scan Info */
                if (bt_event_slot_container[BT_EVENT_TDS_PROVIDER_FOUND_RESULT].callback != NULL) {
                        char *data = NULL;
@@ -3419,57 +3370,6 @@ static void __bt_free_tds_scan_result_info_s(bt_tds_transport_block_list_s *disc
 
 }
 
-static int __bt_get_bt_adapter_le_device_discovery_info_s(
-                       bt_adapter_le_device_discovery_info_s **le_discovery_info,
-                       bluetooth_le_device_info_t *source_info)
-{
-
-       BT_CHECK_INPUT_PARAMETER(source_info);
-
-       *le_discovery_info = (bt_adapter_le_device_discovery_info_s *)malloc(sizeof(bt_adapter_le_device_discovery_info_s));
-       if (*le_discovery_info == NULL)
-               return BT_ERROR_OUT_OF_MEMORY;
-
-       _bt_convert_address_to_string(&((*le_discovery_info)->remote_address), &(source_info->device_address));
-
-       (*le_discovery_info)->address_type = (int)source_info->addr_type;
-       (*le_discovery_info)->rssi = (int)source_info->rssi;
-       (*le_discovery_info)->adv_data_len = source_info->adv_ind_data.data_len;
-       if ((*le_discovery_info)->adv_data_len > 0) {
-               (*le_discovery_info)->adv_data = malloc(source_info->adv_ind_data.data_len);
-               memcpy((*le_discovery_info)->adv_data, source_info->adv_ind_data.data.data, source_info->adv_ind_data.data_len);
-       } else {
-               (*le_discovery_info)->adv_data = NULL;
-       }
-
-       (*le_discovery_info)->scan_data_len = source_info->scan_resp_data.data_len;
-       if ((*le_discovery_info)->scan_data_len > 0) {
-               (*le_discovery_info)->scan_data = malloc(source_info->scan_resp_data.data_len);
-               memcpy((*le_discovery_info)->scan_data, source_info->scan_resp_data.data.data, source_info->scan_resp_data.data_len);
-       } else {
-               (*le_discovery_info)->scan_data = NULL;
-       }
-
-       return BT_ERROR_NONE;
-}
-
-static void __bt_free_bt_adapter_le_device_discovery_info_s(bt_adapter_le_device_discovery_info_s *discovery_info)
-{
-       if (discovery_info == NULL)
-               return;
-
-       if (discovery_info->remote_address != NULL)
-               free(discovery_info->remote_address);
-
-       if (discovery_info->adv_data != NULL)
-               free(discovery_info->adv_data);
-       if (discovery_info->scan_data != NULL)
-               free(discovery_info->scan_data);
-
-       free(discovery_info);
-       discovery_info = NULL;
-}
-
 static int __bt_get_gatt_client_cb_index(int event)
 {
        switch (event) {
@@ -3512,10 +3412,6 @@ static int __bt_get_cb_index(int event)
        case BLUETOOTH_EVENT_DISCOVERY_FINISHED:
        case BLUETOOTH_EVENT_REMOTE_DEVICE_NAME_UPDATED:
                return BT_EVENT_DEVICE_DISCOVERY_STATE_CHANGED;
-       case BLUETOOTH_EVENT_LE_DISCOVERY_STARTED:
-       case BLUETOOTH_EVENT_LE_DISCOVERY_FINISHED:
-       case BLUETOOTH_EVENT_REMOTE_LE_DEVICE_FOUND:
-               return BT_EVENT_LE_DEVICE_DISCOVERY_STATE_CHANGED;
        case BLUETOOTH_EVENT_BONDING_FINISHED:
                return BT_EVENT_BOND_CREATED; /* LCOV_EXCL_LINE */
                /* LCOV_EXCL_START */
@@ -3681,9 +3577,6 @@ static int __bt_get_cb_index(int event)
                /* LCOV_EXCL_STOP */
        case BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED:
                return BT_EVENT_GATT_ATT_MTU_CHANGE_STATUS;
-       case BLUETOOTH_EVENT_ADVERTISING_STARTED:
-       case BLUETOOTH_EVENT_ADVERTISING_STOPPED:
-               return BT_EVENT_ADVERTISING_STATE_CHANGED;
        case BLUETOOTH_EVENT_MANUFACTURER_DATA_CHANGED:
                return BT_EVENT_MANUFACTURER_DATA_CHANGED; /* LCOV_EXCL_LINE */
        case BLUETOOTH_EVENT_PASSKEY_NOTIFICATION:
index 8b296bb8c5c8f90dc461bf0c80b1883fc64c0b57..41dac18c1fe3f8b0a7963c1d16b494a22124982a 100644 (file)
@@ -297,12 +297,6 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_SCAN},
        {"bt_adapter_le_stop_scan"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_SCAN},
-       {"bt_adapter_le_start_device_discovery"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY},
-       {"bt_adapter_le_stop_device_discovery"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_DEVICE_DISCOVERY},
-       {"bt_adapter_le_add_advertising_data"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ADVERTISING_DATA},
        {"bt_adapter_le_set_advertising_mode"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_MODE},
        {"bt_adapter_le_set_advertising_filter_policy"
@@ -311,16 +305,12 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_CONNECTABLE},
        {"bt_adapter_le_start_advertising_new"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING_NEW},
-       {"bt_adapter_le_start_advertising"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING},
        {"bt_adapter_le_stop_advertising"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_ADVERTISING},
        {"bt_adapter_le_add_white_list"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST},
        {"bt_adapter_le_remove_white_list"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST},
-       {"bt_adapter_le_clear_white_list"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST},
        {"bt_adapter_le_enable_privacy"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE_PRIVACY},
        {"bt_adapter_le_set_remote_oob_ext_data"
@@ -335,10 +325,6 @@ tc_table_t tc_adapter_le[] = {
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_IBEACON_DATA},
        {"Unregister all scan filters"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNREGISTER_ALL_SCAN_FILTERS},
-       {"bt_adapter_le_set_device_discovery_state_changed_cb"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_DEVICE_DISCOVERY_STATE_CHANGED_CB},
-       {"bt_adapter_le_unset_device_discovery_state_changed_cb"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNSET_DEVICE_DISCOVERY_STATE_CHANGED_CB},
        {"bt_adater_le_read_maximum_data_length"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_READ_MAXIMUM_DATA_LENGTH},
        {"bt_adater_le_wite_host_suggested_def_data_length"
@@ -1789,66 +1775,6 @@ void __bt_gatt_server_notification_state_change_cb(bool notify,
        TC_PRT("gatt_handle %s", (char *)gatt_handle);
 }
 
-
-static void __bt_adapter_le_device_discovery_state_changed_cb(int result,
-               bt_adapter_le_device_discovery_state_e discovery_state,
-               bt_adapter_le_device_discovery_info_s *discovery_info,
-               void *user_data)
-{
-       if (discovery_info == NULL &&
-                       discovery_state == BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND) {
-               TC_PRT("No discovery_info!");
-               return;
-       }
-
-       if (discovery_state != BT_ADAPTER_LE_DEVICE_DISCOVERY_FOUND) {
-               TC_PRT("LE discovery %s",
-                       discovery_state == BT_ADAPTER_LE_DEVICE_DISCOVERY_STARTED ?
-                       "Started" : "Finished");
-       } else {
-               TC_PRT("%s Adv %d Scan resp %d RSSI %d Addr_type %d",
-                       discovery_info->remote_address,
-                       discovery_info->adv_data_len,
-                       discovery_info->scan_data_len,
-                       discovery_info->rssi,
-                       discovery_info->address_type);
-
-#if 0
-               /* LE ADV information */
-               int i, ret;
-               int field_len = 0;
-               unsigned char *field_data;
-
-               printf("Adv data [");
-               for (i = 0; i < discovery_info->adv_data_len; i++)
-                       printf("%02x ", discovery_info->adv_data[i]);
-               printf("]\n");
-
-               printf("Scan resp data [");
-               for (i = 0; i < discovery_info->scan_data_len; i++)
-                       printf("%02x ", discovery_info->scan_data[i]);
-               printf("]\n");
-
-               ret = bt_adapter_le_get_scan_field_data(discovery_info, BT_ADAPTER_LE_PACKET_ADVERTISING,
-                               BT_ADAPTER_LE_PACKET_DATA_MANUFACTURER_SPECIFIC_DATA, &field_data, &field_len);
-               if (ret == BT_ERROR_NONE) {
-                       printf("Manufacturer specific data [");
-                       for (i = 0; i < field_len; i++)
-                               printf("%02x ", field_data[i]);
-                       printf("]\n");
-                       g_free(field_data);
-               }
-
-               ret = bt_adapter_le_get_scan_field_data(discovery_info, BT_ADAPTER_LE_PACKET_SCAN_RESPONSE,
-                               BT_ADAPTER_LE_PACKET_DATA_LOCAL_NAME, &field_data, &field_len);
-               if (ret == BT_ERROR_NONE) {
-                       TC_PRT("%s", field_data);
-                       g_free(field_data);
-               }
-#endif
-       }
-}
-
 static void __bt_adapter_le_advertising_state_changed_cb(int result,
        bt_advertiser_h advertiser, bt_adapter_le_advertising_state_e adv_state,
        void *user_data)
@@ -3447,12 +3373,7 @@ static void __bt_initialize_all(void)
                        __bt_adapter_device_discovery_state_changed_cb, NULL);
        if (ret != BT_ERROR_NONE)
                TC_PRT("returns %s\n", __bt_get_error_message(ret));
-       if (!TIZEN_PROFILE_WEARABLE_IVI) {
-               ret = bt_adapter_le_set_device_discovery_state_changed_cb(
-                       __bt_adapter_le_device_discovery_state_changed_cb, NULL);
-               if (ret != BT_ERROR_NONE)
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-       } else {
+       if (TIZEN_PROFILE_WEARABLE_IVI) {
                ret = bt_pbap_client_set_connection_state_changed_cb(__bt_pbap_connection_state_changed_cb,
                                NULL);
                if (ret != BT_ERROR_NONE)
@@ -5778,20 +5699,6 @@ int test_input_callback(void *data)
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
 
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY:
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       ret = bt_adapter_le_start_device_discovery();
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-                       break;
-
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_DEVICE_DISCOVERY:
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       ret = bt_adapter_le_stop_device_discovery();
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-                       break;
-
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ADVERTISING_DATA: {
                        int adv_data_type = 3; /* default all */
                        int manufacturer_id = 117;
@@ -6112,35 +6019,6 @@ int test_input_callback(void *data)
                                TC_PRT("failed with [0x%04x]", ret);
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING: {
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       bt_adapter_le_advertising_state_changed_cb cb;
-                       bt_adapter_le_advertising_params_s adv_params = { 0, };
-
-                       if (advertiser_index == 0) cb = __bt_adapter_le_advertising_state_changed_cb;
-                       else if (advertiser_index == 1) cb = __bt_adapter_le_advertising_state_changed_cb_2;
-                       else cb = __bt_adapter_le_advertising_state_changed_cb_3;
-
-                       advertiser = advertiser_list[advertiser_index];
-                       advertiser_index++;
-                       advertiser_index %= 3;
-
-                       adv_params.interval_min = 500;
-                       adv_params.interval_max = 500;
-
-                       if (advertiser == NULL) {
-                               ret = bt_adapter_le_create_advertiser(&advertiser);
-                               TC_PRT("created le advertiser(%d)", ret);
-                               advertiser_list[advertiser_index] = advertiser;
-                       }
-
-                       ret = bt_adapter_le_start_advertising(advertiser,
-                               &adv_params, cb, NULL);
-                       if (ret < BT_ERROR_NONE)
-                               TC_PRT("failed with [0x%04x]", ret);
-                       break;
-               }
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_ADVERTISING: {
                        int slot_id = 0;
 
@@ -6170,14 +6048,6 @@ int test_input_callback(void *data)
                        break;
                }
 
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST: {
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       ret = bt_adapter_le_clear_white_list();
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-                       break;
-               }
-
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE_PRIVACY: {
                        static bool enable_privacy = false;
 
@@ -6366,38 +6236,6 @@ int test_input_callback(void *data)
                        break;
                }
 
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_DEVICE_DISCOVERY_STATE_CHANGED_CB:
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       ret = bt_adapter_le_set_device_discovery_state_changed_cb(
-                               __bt_adapter_le_device_discovery_state_changed_cb, NULL);
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-                       break;
-
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNSET_DEVICE_DISCOVERY_STATE_CHANGED_CB:
-                       if (TIZEN_PROFILE_WEARABLE_IVI)
-                               break;
-                       ret = bt_adapter_le_unset_device_discovery_state_changed_cb();
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-                       break;
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_READ_MAXIMUM_DATA_LENGTH: {
-
-                       TC_PRT("Read Maximum LE Data length");
-
-                       int max_tx_octects = 0;
-                       int max_rx_octects = 0;
-                       int max_tx_time = 0;
-                       int max_rx_time = 0;
-                       ret = bt_adapter_le_read_maximum_data_length(
-                               &max_tx_octects, &max_tx_time,
-                               &max_rx_octects, &max_rx_time);
-                       TC_PRT("max data length values are  %d %d %d %d",
-                               max_tx_octects, max_tx_time,
-                               max_rx_octects, max_rx_time);
-                       TC_PRT("returns %s\n", __bt_get_error_message(ret));
-
-                       break;
-               }
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_WRITE_HOST_SUGGESTED_DEFAULT_DATA_LENGTH: {
 
                        TC_PRT("Testing: Write Host suggested default LE Data length");
index a30a2ad453262304f7c395997c0c1368721efe20..4c4622c598623335171e1e8413465acba79f0cd4 100644 (file)
@@ -107,7 +107,6 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_SCAN_MODE,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_SCAN,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_SCAN,
-       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_DEVICE_DISCOVERY,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ADVERTISING_DATA,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_HOGP_ADVERTISING_DATA,