From: Myles Watson <mylesgw@google.com>
Date: Tue, 3 Oct 2017 20:04:28 +0000 (-0700)
Subject: Allocate tSDBP_DISCOVERY_DB instead of bytes
X-Git-Tag: android-x86-9.0-r1~186^2~4^2~2^2~19^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=188d7aca6022b2d491654f1769b8d7a5d8228ab4;p=android-x86%2Fsystem-bt.git

Allocate tSDBP_DISCOVERY_DB instead of bytes

Test: build
Change-Id: Ib7a33cf7cb89715da781b4e93d0bfe3f74490cea
---

diff --git a/bta/jv/bta_jv_cfg.cc b/bta/jv/bta_jv_cfg.cc
index b43b03569..672bea375 100644
--- a/bta/jv/bta_jv_cfg.cc
+++ b/bta/jv/bta_jv_cfg.cc
@@ -43,16 +43,16 @@
  * BTA_JvStartDiscovery
  * it can be de-allocated after the last call to access the database */
 static uint8_t bta_jv_sdp_raw_data[BTA_JV_SDP_RAW_DATA_SIZE];
-static uint8_t __attribute__((aligned(4)))
-bta_jv_sdp_db_data[BTA_JV_SDP_DB_SIZE];
+static tSDP_DISCOVERY_DB
+    bta_jv_sdp_db_data[BTA_JV_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)];
 
 /* JV configuration structure */
 const tBTA_JV_CFG bta_jv_cfg = {
     BTA_JV_SDP_RAW_DATA_SIZE, /* The size of p_sdp_raw_data */
-    BTA_JV_SDP_DB_SIZE,       /* The size of p_sdp_db_data */
-    bta_jv_sdp_raw_data,      /* The data buffer to keep raw data */
-    (tSDP_DISCOVERY_DB*)
-        bta_jv_sdp_db_data /* The data buffer to keep SDP database */
+    (BTA_JV_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)) *
+        sizeof(tSDP_DISCOVERY_DB), /* The size of p_sdp_db_data */
+    bta_jv_sdp_raw_data,           /* The data buffer to keep raw data */
+    bta_jv_sdp_db_data             /* The data buffer to keep SDP database */
 };
 
-tBTA_JV_CFG* p_bta_jv_cfg = (tBTA_JV_CFG*)&bta_jv_cfg;
+const tBTA_JV_CFG* p_bta_jv_cfg = &bta_jv_cfg;
diff --git a/bta/mce/bta_mce_cfg.cc b/bta/mce/bta_mce_cfg.cc
index 3beb265fb..1ff6c62fa 100644
--- a/bta/mce/bta_mce_cfg.cc
+++ b/bta/mce/bta_mce_cfg.cc
@@ -32,14 +32,14 @@
 #define BTA_MCE_SDP_DB_SIZE 4500
 #endif
 
-static uint8_t __attribute__((aligned(4)))
-bta_mce_sdp_db_data[BTA_MCE_SDP_DB_SIZE];
+static tSDP_DISCOVERY_DB
+    bta_mce_sdp_db_data[BTA_MCE_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)];
 
 /* MCE configuration structure */
 const tBTA_MCE_CFG bta_mce_cfg = {
-    BTA_MCE_SDP_DB_SIZE,
-    (tSDP_DISCOVERY_DB*)
-        bta_mce_sdp_db_data /* The data buffer to keep SDP database */
+    (BTA_MCE_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)) *
+        sizeof(tSDP_DISCOVERY_DB),
+    bta_mce_sdp_db_data /* The data buffer to keep SDP database */
 };
 
-tBTA_MCE_CFG* p_bta_mce_cfg = (tBTA_MCE_CFG*)&bta_mce_cfg;
+const tBTA_MCE_CFG* p_bta_mce_cfg = &bta_mce_cfg;
diff --git a/bta/sdp/bta_sdp_cfg.cc b/bta/sdp/bta_sdp_cfg.cc
index 5be6755df..be51459e1 100644
--- a/bta/sdp/bta_sdp_cfg.cc
+++ b/bta/sdp/bta_sdp_cfg.cc
@@ -28,13 +28,13 @@
 #define BTA_SDP_DB_SIZE 4500
 #endif
 
-static uint8_t __attribute__((aligned(4))) bta_sdp_db_data[BTA_SDP_DB_SIZE];
+static tSDP_DISCOVERY_DB
+    bta_sdp_db_data[BTA_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)];
 
 /* SDP configuration structure */
 const tBTA_SDP_CFG bta_sdp_cfg = {
-    BTA_SDP_DB_SIZE,
-    (tSDP_DISCOVERY_DB*)
-        bta_sdp_db_data /* The data buffer to keep SDP database */
+    (BTA_SDP_DB_SIZE / sizeof(tSDP_DISCOVERY_DB)) * sizeof(tSDP_DISCOVERY_DB),
+    bta_sdp_db_data /* The data buffer to keep SDP database */
 };
 
-tBTA_SDP_CFG* p_bta_sdp_cfg = (tBTA_SDP_CFG*)&bta_sdp_cfg;
+const tBTA_SDP_CFG* p_bta_sdp_cfg = &bta_sdp_cfg;