From e675cea6a83ea46fc23529658760f2c790fa9685 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 15 Dec 2016 14:44:40 +0900 Subject: [PATCH] Move ibeacon structure to the internal header In previously ibeacon structure was applied into bluetooth_type.h But ibeacon type provided as internal API, and there was no public ACR process. So we should remove it from bluetooth_type.h for 3.0 official release. Change-Id: I446186491453a854e75ff85a4955198c74eebb53 Signed-off-by: DoHyun Pyun --- include/mobile/bluetooth_type.h | 16 ---------------- include/mobile/bluetooth_type_internal.h | 16 ++++++++++++++++ include/tv/bluetooth_type.h | 16 ---------------- include/tv/bluetooth_type_internal.h | 16 ++++++++++++++++ include/wearable/bluetooth_type.h | 16 ---------------- include/wearable/bluetooth_type_internal.h | 16 ++++++++++++++++ 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/include/mobile/bluetooth_type.h b/include/mobile/bluetooth_type.h index aa81ff5..e4d9ecd 100644 --- a/include/mobile/bluetooth_type.h +++ b/include/mobile/bluetooth_type.h @@ -878,22 +878,6 @@ typedef struct { char *scan_data; /**< scan response data */ } bt_adapter_le_device_scan_result_info_s; -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE - * @brief Structure of le iBeacon scan result information. - * @since_tizen 3.0 - * - * @see bt_adapter_le_start_scan() - */ -typedef struct { - int company_id; /**< company ID */ - int ibeacon_type; /**< Ibeacon type */ - char *uuid; /**< UUID */ - int major_id; /**< Major ID */ - int minor_id; /**< Minor ID */ - int measured_power; /**< measured Power */ -} bt_adapter_ibeacon_scan_result_info_s; - /** * @deprecated Deprecated since 2.3.1 * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE diff --git a/include/mobile/bluetooth_type_internal.h b/include/mobile/bluetooth_type_internal.h index a73ac36..98523bb 100644 --- a/include/mobile/bluetooth_type_internal.h +++ b/include/mobile/bluetooth_type_internal.h @@ -335,6 +335,22 @@ typedef struct { unsigned int time_out; /**< Supervision timeout (msec) */ } bt_le_conn_update_s; +/** + * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE + * @brief Structure of le iBeacon scan result information. + * @since_tizen 3.0 + * + * @see bt_adapter_le_start_scan() + */ +typedef struct { + int company_id; /**< company ID */ + int ibeacon_type; /**< Ibeacon type */ + char *uuid; /**< UUID */ + int major_id; /**< Major ID */ + int minor_id; /**< Minor ID */ + int measured_power; /**< measured Power */ +} bt_adapter_ibeacon_scan_result_info_s; + /** * Structure to DPM device list */ diff --git a/include/tv/bluetooth_type.h b/include/tv/bluetooth_type.h index f71fd37..e933f7a 100644 --- a/include/tv/bluetooth_type.h +++ b/include/tv/bluetooth_type.h @@ -878,22 +878,6 @@ typedef struct { char *scan_data; /**< scan response data */ } bt_adapter_le_device_scan_result_info_s; -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE - * @brief Structure of le iBeacon scan result information. - * @since_tizen 3.0 - * - * @see bt_adapter_le_start_scan() - */ -typedef struct { - int company_id; /**< company ID */ - int ibeacon_type; /**< Ibeacon type */ - char *uuid; /**< UUID */ - int major_id; /**< Major ID */ - int minor_id; /**< Minor ID */ - int measured_power; /**< measured Power */ -} bt_adapter_ibeacon_scan_result_info_s; - /** * @deprecated Deprecated since 2.3.1 * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE diff --git a/include/tv/bluetooth_type_internal.h b/include/tv/bluetooth_type_internal.h index 52fe53c..76e3e3d 100644 --- a/include/tv/bluetooth_type_internal.h +++ b/include/tv/bluetooth_type_internal.h @@ -335,6 +335,22 @@ typedef struct { unsigned int time_out; /**< Supervision timeout (msec) */ } bt_le_conn_update_s; +/** + * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE + * @brief Structure of le iBeacon scan result information. + * @since_tizen 3.0 + * + * @see bt_adapter_le_start_scan() + */ +typedef struct { + int company_id; /**< company ID */ + int ibeacon_type; /**< Ibeacon type */ + char *uuid; /**< UUID */ + int major_id; /**< Major ID */ + int minor_id; /**< Minor ID */ + int measured_power; /**< measured Power */ +} bt_adapter_ibeacon_scan_result_info_s; + /** * Structure to DPM device list */ diff --git a/include/wearable/bluetooth_type.h b/include/wearable/bluetooth_type.h index 9c4402d..69caa87 100644 --- a/include/wearable/bluetooth_type.h +++ b/include/wearable/bluetooth_type.h @@ -905,22 +905,6 @@ typedef struct { char *scan_data; /**< scan response data */ } bt_adapter_le_device_scan_result_info_s; -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE - * @brief Structure of le iBeacon scan result information. - * @since_tizen 3.0 - * - * @see bt_adapter_le_start_scan() - */ -typedef struct { - int company_id; /**< company ID */ - int ibeacon_type; /**< Ibeacon type */ - char *uuid; /**< UUID */ - int major_id; /**< Major ID */ - int minor_id; /**< Minor ID */ - int measured_power; /**< measured Power */ -} bt_adapter_ibeacon_scan_result_info_s; - /** * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE * @brief LE service data structure. diff --git a/include/wearable/bluetooth_type_internal.h b/include/wearable/bluetooth_type_internal.h index 86049ae..0572908 100644 --- a/include/wearable/bluetooth_type_internal.h +++ b/include/wearable/bluetooth_type_internal.h @@ -497,6 +497,22 @@ typedef struct { unsigned int time_out; /**< Supervision timeout (msec) */ } bt_le_conn_update_s; +/** + * @ingroup CAPI_NETWORK_BLUETOOTH_ADAPTER_LE_MODULE + * @brief Structure of le iBeacon scan result information. + * @since_tizen 3.0 + * + * @see bt_adapter_le_start_scan() + */ +typedef struct { + int company_id; /**< company ID */ + int ibeacon_type; /**< Ibeacon type */ + char *uuid; /**< UUID */ + int major_id; /**< Major ID */ + int minor_id; /**< Minor ID */ + int measured_power; /**< measured Power */ +} bt_adapter_ibeacon_scan_result_info_s; + /** * Structure to DPM device list */ -- 2.34.1