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

Commit 31133150 authored by Hansong Zhang's avatar Hansong Zhang Committed by Gerrit Code Review
Browse files

Merge "Get rid of unused _DYNAMIC_MEMORY"

parents 97dffda4 95a20365

system/bta/hd/bta_hd_int.h

+0 −5
Original line number Diff line number Diff line
@@ -141,12 +141,7 @@ typedef struct { 
  bool disable_w4_close;

} tBTA_HD_CB;



#if BTA_DYNAMIC_MEMORY == FALSE

extern tBTA_HD_CB bta_hd_cb;

#else

extern tBTA_HD_CB* bta_hd_cb_ptr;

#define bta_hd_cb (*bta_hd_cb_ptr)

#endif



/*****************************************************************************

 *  Function prototypes

system/bta/hd/bta_hd_main.cc

+0 −2
Original line number Diff line number Diff line
@@ -219,9 +219,7 @@ const tBTA_HD_ST_TBL bta_hd_st_tbl[] = {bta_hd_st_init, bta_hd_st_idle, 
/*****************************************************************************

 * Global data

 ****************************************************************************/

#if BTA_DYNAMIC_MEMORY == FALSE

tBTA_HD_CB bta_hd_cb;

#endif



static const char* bta_hd_evt_code(tBTA_HD_INT_EVT evt_code);

static const char* bta_hd_state_code(tBTA_HD_STATE state_code);

system/stack/hid/hidd_api.cc

+0 −2
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ 
#include "hidd_int.h"

#include "hiddefs.h"



#if HID_DYNAMIC_MEMORY == FALSE

tHID_DEV_CTB hd_cb;

#endif



/*******************************************************************************

 *

system/stack/hid/hidd_int.h

+0 −5
Original line number Diff line number Diff line
@@ -80,12 +80,7 @@ extern "C" { 
/******************************************************************************

 * Main Control Block

 ******************************************************************************/

#if HID_DYNAMIC_MEMORY == FALSE

extern tHID_DEV_CTB hd_cb;

#else

extern tHID_DEV_CTB* hidd_cb_ptr;

#define hd_cb (*hidd_cb_ptr)

#endif



#ifdef __cplusplus

}