Remove data_types.h

27 files changed, 50 insertions, 80 deletions

diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index 7b6f094ea..f494eb5da 100644
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -25,7 +25,6 @@
 #ifndef BTA_API_H
 #define BTA_API_H
 
-#include "data_types.h"
 #include "bt_target.h"
 #include "bt_types.h"
 #include "btm_api.h"
diff --git a/bta/include/bta_jv_api.h b/bta/include/bta_jv_api.h
index c4fed5582..a61588a16 100644
--- a/bta/include/bta_jv_api.h
+++ b/bta/include/bta_jv_api.h
@@ -24,7 +24,6 @@
 #ifndef BTA_JV_API_H
 #define BTA_JV_API_H
 
-#include "data_types.h"
 #include "bt_target.h"
 #include "bt_types.h"
 #include "bta_api.h"
diff --git a/bta/include/bta_mce_api.h b/bta/include/bta_mce_api.h
index b781ef991..c97811508 100644
--- a/bta/include/bta_mce_api.h
+++ b/bta/include/bta_mce_api.h
@@ -25,7 +25,6 @@
 #ifndef BTA_MCE_API_H
 #define BTA_MCE_API_H
 
-#include "data_types.h"
 #include "bt_target.h"
 #include "bt_types.h"
 #include "bta_api.h"
diff --git a/bta/include/utl.h b/bta/include/utl.h
index e26cded3f..ff8591fc7 100644
--- a/bta/include/utl.h
+++ b/bta/include/utl.h
@@ -24,7 +24,7 @@
 #ifndef UTL_H
 #define UTL_H
 
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_utils.h"
 
 /*****************************************************************************
diff --git a/btif/include/btif_common.h b/btif/include/btif_common.h
index a5d099713..4b1f480d4 100644
--- a/btif/include/btif_common.h
+++ b/btif/include/btif_common.h
@@ -24,7 +24,6 @@
 
 #include "bt_types.h"
 #include "bta_api.h"
-#include "data_types.h"
 #include "osi.h"
 
 #ifndef LOG_TAG
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
index 30628a1ca..14bb26574 100644
--- a/btif/include/btif_storage.h
+++ b/btif/include/btif_storage.h
@@ -19,7 +19,6 @@
 #ifndef BTIF_STORAGE_H
 #define BTIF_STORAGE_H
 
-#include "data_types.h"
 #include "bt_types.h"
 
 #include <utils/Log.h>
diff --git a/btif/include/btif_util.h b/btif/include/btif_util.h
index 8b2cdaaf0..49b54c926 100644
--- a/btif/include/btif_util.h
+++ b/btif/include/btif_util.h
@@ -26,7 +26,6 @@
 #include <stdbool.h>
 #include <sys/time.h>
 
-#include "data_types.h"
 #include "bt_types.h"
 #include "bt_utils.h"
 
diff --git a/embdrv/sbc/encoder/include/sbc_types.h b/embdrv/sbc/encoder/include/sbc_types.h
index d1610519a..991fc7dcc 100644
--- a/embdrv/sbc/encoder/include/sbc_types.h
+++ b/embdrv/sbc/encoder/include/sbc_types.h
@@ -29,7 +29,7 @@
 #include "bt_target.h"
 #endif
 
-#include "data_types.h"
+#include "bt_types.h"
 
 typedef short SINT16;
 typedef long SINT32;
diff --git a/gki/ulinux/data_types.h b/gki/ulinux/data_types.h
deleted file mode 100644
index d73d14ed8..000000000
--- a/gki/ulinux/data_types.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- *
- *  Copyright (C) 1999-2012 Broadcom Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at:
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-
-#ifndef DATA_TYPES_H
-#define DATA_TYPES_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#ifndef FALSE
-#  define FALSE  false
-#endif
-
-#ifndef TRUE
-#  define TRUE   true
-#endif
-
-typedef uint8_t UINT8;
-typedef uint16_t UINT16;
-typedef uint32_t UINT32;
-typedef uint64_t UINT64;
-
-typedef int8_t INT8;
-typedef int16_t INT16;
-typedef int32_t INT32;
-typedef bool BOOLEAN;
-
-#ifdef __arm
-#  define PACKED  __packed
-#  define INLINE  __inline
-#else
-#  define PACKED
-#  define INLINE
-#endif
-
-#define BCM_STRCPY_S(x1,x2,x3)      strcpy((x1),(x3))
-#define BCM_STRNCPY_S(x1,x2,x3,x4)  strncpy((x1),(x3),(x4))
-
-#endif
diff --git a/include/bt_target.h b/include/bt_target.h
index fe9a40e1d..fa9a77a41 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -23,7 +23,7 @@
 #ifndef BUILDCFG
 #define BUILDCFG
 #endif
-#include "data_types.h"
+#include "bt_types.h"
 
 #ifdef BUILDCFG
 
diff --git a/stack/avct/avct_api.c b/stack/avct/avct_api.c
index 5b27cc879..5ee928228 100644
--- a/stack/avct/avct_api.c
+++ b/stack/avct/avct_api.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "gki.h"
diff --git a/stack/avct/avct_ccb.c b/stack/avct/avct_ccb.c
index f2c821c13..e0f87de6a 100644
--- a/stack/avct/avct_ccb.c
+++ b/stack/avct/avct_ccb.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "avct_api.h"
 #include "avct_int.h"
diff --git a/stack/avct/avct_l2c.c b/stack/avct/avct_l2c.c
index bb01e89b0..815fa4b33 100644
--- a/stack/avct/avct_l2c.c
+++ b/stack/avct/avct_l2c.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avct_api.h"
diff --git a/stack/avct/avct_lcb.c b/stack/avct/avct_lcb.c
index 6c8fd2e74..eabb8aa2b 100644
--- a/stack/avct/avct_lcb.c
+++ b/stack/avct/avct_lcb.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avct_api.h"
diff --git a/stack/avct/avct_lcb_act.c b/stack/avct/avct_lcb_act.c
index 063b16f20..3b281469d 100644
--- a/stack/avct/avct_lcb_act.c
+++ b/stack/avct/avct_lcb_act.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avct_api.h"
diff --git a/stack/avdt/avdt_ad.c b/stack/avdt/avdt_ad.c
index 46868878e..3266d342f 100644
--- a/stack/avdt/avdt_ad.c
+++ b/stack/avdt/avdt_ad.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_api.c b/stack/avdt/avdt_api.c
index 9652cbc05..19fbb1c16 100644
--- a/stack/avdt/avdt_api.c
+++ b/stack/avdt/avdt_api.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "avdt_api.h"
 #include "avdtc_api.h"
diff --git a/stack/avdt/avdt_ccb.c b/stack/avdt/avdt_ccb.c
index 130d91ce7..09ed39af2 100644
--- a/stack/avdt/avdt_ccb.c
+++ b/stack/avdt/avdt_ccb.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_ccb_act.c b/stack/avdt/avdt_ccb_act.c
index d87dbb1cf..b1ef12ebd 100644
--- a/stack/avdt/avdt_ccb_act.c
+++ b/stack/avdt/avdt_ccb_act.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_l2c.c b/stack/avdt/avdt_l2c.c
index 2721ecd16..dbdfc082d 100644
--- a/stack/avdt/avdt_l2c.c
+++ b/stack/avdt/avdt_l2c.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_msg.c b/stack/avdt/avdt_msg.c
index e4980d818..4a28b0dfc 100644
--- a/stack/avdt/avdt_msg.c
+++ b/stack/avdt/avdt_msg.c
@@ -27,7 +27,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_scb.c b/stack/avdt/avdt_scb.c
index 2e653bd61..f5f5b5a79 100644
--- a/stack/avdt/avdt_scb.c
+++ b/stack/avdt/avdt_scb.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/avdt/avdt_scb_act.c b/stack/avdt/avdt_scb_act.c
index 12b94e235..3ab1c2689 100644
--- a/stack/avdt/avdt_scb_act.c
+++ b/stack/avdt/avdt_scb_act.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include <string.h>
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_target.h"
 #include "bt_utils.h"
 #include "avdt_api.h"
diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h
index a203dd5c1..ce7b4c677 100644
--- a/stack/include/bt_types.h
+++ b/stack/include/bt_types.h
@@ -19,7 +19,37 @@
 #ifndef BT_TYPES_H
 #define BT_TYPES_H
 
-#include "data_types.h"
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifndef FALSE
+#  define FALSE  false
+#endif
+
+#ifndef TRUE
+#  define TRUE   true
+#endif
+
+typedef uint8_t UINT8;
+typedef uint16_t UINT16;
+typedef uint32_t UINT32;
+typedef uint64_t UINT64;
+
+typedef int8_t INT8;
+typedef int16_t INT16;
+typedef int32_t INT32;
+typedef bool BOOLEAN;
+
+#ifdef __arm
+#  define PACKED  __packed
+#  define INLINE  __inline
+#else
+#  define PACKED
+#  define INLINE
+#endif
+
+#define BCM_STRCPY_S(x1,x2,x3)      strcpy((x1),(x3))
+#define BCM_STRNCPY_S(x1,x2,x3,x4)  strncpy((x1),(x3),(x4))
 
 /* READ WELL !!
 **
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index a389c9538..7619d2cb9 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -45,7 +45,7 @@
 
 
 #include "gki.h"
-#include "data_types.h"
+#include "bt_types.h"
 #include "uipc.h"
 
 #include <cutils/sockets.h>
diff --git a/utils/Android.mk b/utils/Android.mk
index 4bbeaea85..24308a1e0 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -5,8 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/../btcore/include \
-	$(LOCAL_PATH)/../gki/ulinux \
 	$(LOCAL_PATH)/../osi/include \
+	$(LOCAL_PATH)/../stack/include \
 	$(bdroid_C_INCLUDES)
 
 LOCAL_CFLAGS += $(bdroid_CFLAGS) -std=c99
diff --git a/utils/src/bt_utils.c b/utils/src/bt_utils.c
index cf9fab730..06f5ac202 100644
--- a/utils/src/bt_utils.c
+++ b/utils/src/bt_utils.c
@@ -39,7 +39,7 @@
 
 #include <utils/Log.h>
 
-#include "data_types.h"
+#include "bt_types.h"
 #include "bt_utils.h"
 #include "module.h"