Modify scan filtering API names

Change-Id: I11fa5da08a67be71e7a75cb9c95b15ed82455b95
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/include/mobile/bluetooth_internal.h b/include/mobile/bluetooth_internal.h
index a163909132f6742fac7e4e462ecfd2094a9ed116..44c1acbfdfc77d468124cdcb50736dbbe5887a03 100644 (file)
--- a/include/mobile/bluetooth_internal.h
+++ b/include/mobile/bluetooth_internal.h
@@ -756,9 +756,9 @@ int bt_adapter_le_enable_privacy(bool enable_privacy);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_destroy_scan_filter()
+ * @see bt_adapter_le_scan_filter_destroy()
  */
-int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
+int bt_adapter_le_scan_filter_create(bt_scan_filter_h *scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -775,9 +775,9 @@ int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_create_scan_filter()
+ * @see bt_adapter_le_scan_filter_create()
  */
-int bt_adapter_le_destroy_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_destroy(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1016,7 +1016,7 @@ int bt_adapter_le_scan_filter_set_manufacturer_data_with_mask(bt_scan_filter_h s
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_register(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1035,7 +1035,7 @@ int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_unregister(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1051,7 +1051,7 @@ int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_all_scan_filters(void);
+int bt_adapter_le_scan_filter_unregister_all(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE

diff --git a/include/tv/bluetooth_internal.h b/include/tv/bluetooth_internal.h
index a163909132f6742fac7e4e462ecfd2094a9ed116..44c1acbfdfc77d468124cdcb50736dbbe5887a03 100644 (file)
--- a/include/tv/bluetooth_internal.h
+++ b/include/tv/bluetooth_internal.h
@@ -756,9 +756,9 @@ int bt_adapter_le_enable_privacy(bool enable_privacy);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_destroy_scan_filter()
+ * @see bt_adapter_le_scan_filter_destroy()
  */
-int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
+int bt_adapter_le_scan_filter_create(bt_scan_filter_h *scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -775,9 +775,9 @@ int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_create_scan_filter()
+ * @see bt_adapter_le_scan_filter_create()
  */
-int bt_adapter_le_destroy_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_destroy(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1016,7 +1016,7 @@ int bt_adapter_le_scan_filter_set_manufacturer_data_with_mask(bt_scan_filter_h s
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_register(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1035,7 +1035,7 @@ int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_unregister(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1051,7 +1051,7 @@ int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_all_scan_filters(void);
+int bt_adapter_le_scan_filter_unregister_all(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE

diff --git a/include/wearable/bluetooth_internal.h b/include/wearable/bluetooth_internal.h
index 4d2dcc2a8495d754ebbb57573be9ef7100c0f998..057310cc617d6c9d15986757f3f6fa1dbccebf48 100644 (file)
--- a/include/wearable/bluetooth_internal.h
+++ b/include/wearable/bluetooth_internal.h
@@ -726,9 +726,9 @@ int bt_adapter_le_enable_privacy(bool enable_privacy);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_destroy_scan_filter()
+ * @see bt_adapter_le_scan_filter_destroy()
  */
-int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
+int bt_adapter_le_scan_filter_create(bt_scan_filter_h *scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -745,9 +745,9 @@ int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter);
  *
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
- * @see bt_adapter_le_create_scan_filter()
+ * @see bt_adapter_le_scan_filter_create()
  */
-int bt_adapter_le_destroy_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_destroy(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -986,7 +986,7 @@ int bt_adapter_le_scan_filter_set_manufacturer_data_with_mask(bt_scan_filter_h s
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_register(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1005,7 +1005,7 @@ int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
+int bt_adapter_le_scan_filter_unregister(bt_scan_filter_h scan_filter);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE
@@ -1021,7 +1021,7 @@ int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter);
  * @pre The Bluetooth service must be initialized with bt_initialize().
  *
  */
-int bt_adapter_le_unregister_all_scan_filters(void);
+int bt_adapter_le_scan_filter_unregister_all(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index ca358dd7f4dacce0d3b74083a23f259a6e5e2a23..49dae006357e584bf0b0daaec54b029ad54d7051 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -3339,7 +3339,7 @@ int bt_adapter_le_get_scan_result_ibeacon_report(const bt_adapter_le_device_scan
 
 
 /* LCOV_EXCL_START */
-int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter)
+int bt_adapter_le_scan_filter_create(bt_scan_filter_h *scan_filter)
 {
        bt_le_scan_filter_s *__filter = NULL;
 
@@ -3360,7 +3360,7 @@ int bt_adapter_le_create_scan_filter(bt_scan_filter_h *scan_filter)
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_destroy_scan_filter(bt_scan_filter_h scan_filter)
+int bt_adapter_le_scan_filter_destroy(bt_scan_filter_h scan_filter)
 {
        bt_le_scan_filter_s *__filter = (bt_le_scan_filter_s *)scan_filter;
 
@@ -3648,7 +3648,7 @@ int bt_adapter_le_scan_filter_set_manufacturer_data_with_mask(bt_scan_filter_h s
        return BT_ERROR_NONE;
 }
 
-int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter)
+int bt_adapter_le_scan_filter_register(bt_scan_filter_h scan_filter)
 {
        int error_code = BT_ERROR_NONE;
        bt_le_scan_filter_s *__filter = (bt_le_scan_filter_s *)scan_filter;
@@ -3675,7 +3675,7 @@ int bt_adapter_le_register_scan_filter(bt_scan_filter_h scan_filter)
        return error_code;
 }
 
-int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter)
+int bt_adapter_le_scan_filter_unregister(bt_scan_filter_h scan_filter)
 {
        int error_code = BT_ERROR_NONE;
        bt_le_scan_filter_s *__filter = (bt_le_scan_filter_s *)scan_filter;
@@ -3698,7 +3698,7 @@ int bt_adapter_le_unregister_scan_filter(bt_scan_filter_h scan_filter)
        return error_code;
 }
 
-int bt_adapter_le_unregister_all_scan_filters(void)
+int bt_adapter_le_scan_filter_unregister_all(void)
 {
        int error_code = BT_ERROR_NONE;
 
@@ -3864,14 +3864,14 @@ int bt_adapter_le_scan_filter_set_proximity_uuid(bt_scan_filter_h scan_filter)
        BT_CHECK_INPUT_PARAMETER(scan_filter);
 
        /* register Linkloss alert scan filter */
-       ret = bt_adapter_le_create_scan_filter(&pxp_linkloss_alert_filter);
+       ret = bt_adapter_le_scan_filter_create(&pxp_linkloss_alert_filter);
        if (ret == BT_ERROR_NONE) {
 
                ret = bt_adapter_le_scan_filter_set_service_uuid(pxp_linkloss_alert_filter, PXP_LINK_LOSS_SVC_UUID);
                if (ret == BT_ERROR_NONE)
-                       ret = bt_adapter_le_register_scan_filter(pxp_linkloss_alert_filter);
+                       ret = bt_adapter_le_scan_filter_register(pxp_linkloss_alert_filter);
                if (ret != BT_ERROR_NONE) {
-                       bt_adapter_le_unregister_scan_filter(pxp_linkloss_alert_filter);
+                       bt_adapter_le_scan_filter_unregister(pxp_linkloss_alert_filter);
                        pxp_linkloss_alert_filter = NULL;
                }
        } else {
@@ -3879,14 +3879,14 @@ int bt_adapter_le_scan_filter_set_proximity_uuid(bt_scan_filter_h scan_filter)
        }
 
        /* register Immediate alert scan filter */
-       ret = bt_adapter_le_create_scan_filter(&pxp_immediate_alert_filter);
+       ret = bt_adapter_le_scan_filter_create(&pxp_immediate_alert_filter);
        if (ret == BT_ERROR_NONE) {
 
                ret = bt_adapter_le_scan_filter_set_service_uuid(pxp_immediate_alert_filter, PXP_IMMEDIATE_ALERT_SVC_UUID);
                if (ret == BT_ERROR_NONE)
-                       ret = bt_adapter_le_register_scan_filter(pxp_immediate_alert_filter);
+                       ret = bt_adapter_le_scan_filter_register(pxp_immediate_alert_filter);
                if (ret != BT_ERROR_NONE) {
-                       bt_adapter_le_unregister_scan_filter(pxp_immediate_alert_filter);
+                       bt_adapter_le_scan_filter_unregister(pxp_immediate_alert_filter);
                        pxp_immediate_alert_filter = NULL;
                }
        } else {
@@ -3894,14 +3894,14 @@ int bt_adapter_le_scan_filter_set_proximity_uuid(bt_scan_filter_h scan_filter)
        }
 
        /* register Signal loss scan filter */
-       ret = bt_adapter_le_create_scan_filter(&pxp_signal_loss_filter);
+       ret = bt_adapter_le_scan_filter_create(&pxp_signal_loss_filter);
        if (ret == BT_ERROR_NONE) {
 
                ret = bt_adapter_le_scan_filter_set_service_uuid(pxp_signal_loss_filter, PXP_TX_POWER_SVC_UUID);
                if (ret == BT_ERROR_NONE)
-                       ret = bt_adapter_le_register_scan_filter(pxp_signal_loss_filter);
+                       ret = bt_adapter_le_scan_filter_register(pxp_signal_loss_filter);
                if (ret != BT_ERROR_NONE) {
-                       bt_adapter_le_unregister_scan_filter(pxp_signal_loss_filter);
+                       bt_adapter_le_scan_filter_unregister(pxp_signal_loss_filter);
                        pxp_signal_loss_filter = NULL;
                }
        } else {
@@ -3920,19 +3920,19 @@ int bt_adapter_le_scan_filter_unset_proximity_uuid(bt_scan_filter_h scan_filter)
 
        /* unregister Linkloss alert scan filter */
        if (pxp_linkloss_alert_filter) {
-               ret = bt_adapter_le_unregister_scan_filter(pxp_linkloss_alert_filter);
+               ret = bt_adapter_le_scan_filter_unregister(pxp_linkloss_alert_filter);
                pxp_linkloss_alert_filter = NULL;
        }
 
        /* unregister Immediate alert scan filter */
        if (pxp_immediate_alert_filter) {
-               ret = bt_adapter_le_unregister_scan_filter(pxp_immediate_alert_filter);
+               ret = bt_adapter_le_scan_filter_unregister(pxp_immediate_alert_filter);
                pxp_immediate_alert_filter = NULL;
        }
 
        /* unregister Signal loss scan filter */
        if (pxp_signal_loss_filter) {
-               ret = bt_adapter_le_unregister_scan_filter(pxp_signal_loss_filter);
+               ret = bt_adapter_le_scan_filter_unregister(pxp_signal_loss_filter);
                pxp_signal_loss_filter = NULL;
        }
 

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 0cc131a64c27d61d1377385dbdc6b7f7f7d2aa06..2097dfdbfd1f2835b6325b88efadb57692c2418b 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -5365,7 +5365,7 @@ int test_input_callback(void *data)
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_DEVICE_ADDRESS: {
                        bt_scan_filter_h scan_filter;
 
-                       ret = bt_adapter_le_create_scan_filter(&scan_filter);
+                       ret = bt_adapter_le_scan_filter_create(&scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5373,11 +5373,11 @@ int test_input_callback(void *data)
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_register_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_register(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_destroy_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_destroy(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5387,7 +5387,7 @@ int test_input_callback(void *data)
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_SERVICE_UUID: {
                        bt_scan_filter_h scan_filter;
 
-                       ret = bt_adapter_le_create_scan_filter(&scan_filter);
+                       ret = bt_adapter_le_scan_filter_create(&scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5395,11 +5395,11 @@ int test_input_callback(void *data)
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_register_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_register(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_destroy_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_destroy(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5409,7 +5409,7 @@ int test_input_callback(void *data)
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_SERVICE_SOLICITATION_UUID: {
                        bt_scan_filter_h scan_filter;
 
-                       ret = bt_adapter_le_create_scan_filter(&scan_filter);
+                       ret = bt_adapter_le_scan_filter_create(&scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5417,11 +5417,11 @@ int test_input_callback(void *data)
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_register_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_register(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_destroy_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_destroy(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5431,7 +5431,7 @@ int test_input_callback(void *data)
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_IBEACON_DATA: {
                        bt_scan_filter_h scan_filter;
 
-                       ret = bt_adapter_le_create_scan_filter(&scan_filter);
+                       ret = bt_adapter_le_scan_filter_create(&scan_filter);
                        if (ret != BT_ERROR_NONE)
                           TC_PRT("failed with [0x%04x]", ret);
 
@@ -5439,7 +5439,7 @@ int test_input_callback(void *data)
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
-                       ret = bt_adapter_le_register_scan_filter(scan_filter);
+                       ret = bt_adapter_le_scan_filter_register(scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -5447,7 +5447,7 @@ int test_input_callback(void *data)
                }
 
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_UNREGISTER_ALL_SCAN_FILTERS: {
-                       ret = bt_adapter_le_unregister_all_scan_filters();
+                       ret = bt_adapter_le_scan_filter_unregister_all();
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -9108,17 +9108,17 @@ int test_input_callback(void *data)
                                ret = bt_adapter_le_scan_filter_unset_proximity_uuid(pxp_scan_filter);
                                TC_PRT("returns %s\n", __bt_get_error_message(ret));
 
-                               ret = bt_adapter_le_destroy_scan_filter(pxp_scan_filter);
+                               ret = bt_adapter_le_scan_filter_destroy(pxp_scan_filter);
                                TC_PRT("returns %s\n", __bt_get_error_message(ret));
                                pxp_scan_filter = NULL;
                        }
-                       ret = bt_adapter_le_create_scan_filter(&pxp_scan_filter);
+                       ret = bt_adapter_le_scan_filter_create(&pxp_scan_filter);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
 
                        ret = bt_adapter_le_scan_filter_set_proximity_uuid(pxp_scan_filter);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
 
-                       ret = bt_adapter_le_register_scan_filter(pxp_scan_filter);
+                       ret = bt_adapter_le_scan_filter_register(pxp_scan_filter);
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -9128,7 +9128,7 @@ int test_input_callback(void *data)
                        ret = bt_adapter_le_scan_filter_unset_proximity_uuid(pxp_scan_filter);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
 
-                       ret = bt_adapter_le_destroy_scan_filter(pxp_scan_filter);
+                       ret = bt_adapter_le_scan_filter_destroy(pxp_scan_filter);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        pxp_scan_filter = NULL;