Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e85e40c9 authored by Myles Watson's avatar Myles Watson
Browse files

Allocate tSDBP_DISCOVERY_DB instead of bytes 

Test: build
Change-Id: Ib7a33cf7cb89715da781b4e93d0bfe3f74490cea
parent f4f1eacc

system/bta/jv/bta_jv_cfg.cc

+7 −7
Original line number Diff line number Diff line
@@ -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_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 */

    (tSDP_DISCOVERY_DB*)

    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;

system/bta/mce/bta_mce_cfg.cc

+6 −6
Original line number Diff line number Diff line
@@ -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_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;

system/bta/sdp/bta_sdp_cfg.cc

+5 −5
Original line number Diff line number Diff line
@@ -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_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;