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 <dh79.pyun@samsung.com>

diff --git a/include/mobile/bluetooth_type.h b/include/mobile/bluetooth_type.h
index aa81ff5bd4b4828078a029f1902ee12364830022..e4d9ecd7ff77c5a34ad570d24b01b08d61be2e13 100644 (file)
--- 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 a73ac367c0f86cbede98aa69ac3a3ad998b4658f..98523bb0bc0e11f1126d8773343ece95e11390e0 100644 (file)
--- 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 f71fd37fc1ca36f2612dcbe94ecd01b1077b4868..e933f7a19826d46bf6c637f054b68de396e21312 100644 (file)
--- 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 52fe53ccb87e78d45cf03fe255283ea680259273..76e3e3d36ac4183471e4f302b6655eaed963eb61 100644 (file)
--- 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 9c4402d72e091fef843155cbcba33f853d0294ad..69caa879681959f2823efe964c7c2f9817a33f9f 100644 (file)
--- 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 86049ae21fadd207881027011e52bfbe4f3b4140..0572908a7d243303dd25f36da0aeef009bdda13b 100644 (file)
--- 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
  */