diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2016-10-18 01:03:15 -0700 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2016-10-18 01:03:15 -0700 |
| commit | a4d43ca913ec4ffaa9df95ad2ce820498f7a52b9 (patch) | |
| tree | 8d3dbe9b658165de6ac527c3a61e189e1aa4ffb4 /halimpl/bcm2079x | |
| parent | f702c8cac612d7aed7110bbdec8a392215ec0423 (diff) | |
| download | android_hardware_broadcom_nfc-a4d43ca913ec4ffaa9df95ad2ce820498f7a52b9.tar.gz android_hardware_broadcom_nfc-a4d43ca913ec4ffaa9df95ad2ce820498f7a52b9.tar.bz2 android_hardware_broadcom_nfc-a4d43ca913ec4ffaa9df95ad2ce820498f7a52b9.zip | |
Remove DYNAMIC_MEMORY_* compile flags
Unused and adding unecessary complexity. Also step 1 in removing GKI*.
Test: compiles
Change-Id: I338ce3041f5c928924a9dcc8ad4e73bc1c914163
Diffstat (limited to 'halimpl/bcm2079x')
| -rw-r--r-- | halimpl/bcm2079x/gki/common/gki_common.h | 1 | ||||
| -rw-r--r-- | halimpl/bcm2079x/gki/ulinux/gki_int.h | 5 | ||||
| -rw-r--r-- | halimpl/bcm2079x/gki/ulinux/gki_ulinux.c | 4 | ||||
| -rw-r--r-- | halimpl/bcm2079x/hal/hal/nfc_hal_main.c | 2 |
4 files changed, 1 insertions, 11 deletions
diff --git a/halimpl/bcm2079x/gki/common/gki_common.h b/halimpl/bcm2079x/gki/common/gki_common.h index 2bd9f8f..ded2855 100644 --- a/halimpl/bcm2079x/gki/common/gki_common.h +++ b/halimpl/bcm2079x/gki/common/gki_common.h @@ -19,7 +19,6 @@ #define GKI_COMMON_H #include "gki.h" -#include "dyn_mem.h" #ifndef GKI_DEBUG #define GKI_DEBUG FALSE diff --git a/halimpl/bcm2079x/gki/ulinux/gki_int.h b/halimpl/bcm2079x/gki/ulinux/gki_int.h index c59ac32..b558c51 100644 --- a/halimpl/bcm2079x/gki/ulinux/gki_int.h +++ b/halimpl/bcm2079x/gki/ulinux/gki_int.h @@ -64,12 +64,7 @@ typedef struct extern "C" { #endif -#if GKI_DYNAMIC_MEMORY == FALSE GKI_API extern tGKI_CB gki_cb; -#else -GKI_API extern tGKI_CB *gki_cb_ptr; -#define gki_cb (*gki_cb_ptr) -#endif #ifdef __cplusplus } diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c index df58e27..aac5944 100644 --- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c +++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c @@ -46,9 +46,7 @@ /* Define the structure that holds the GKI variables */ -#if GKI_DYNAMIC_MEMORY == FALSE tGKI_CB gki_cb; -#endif #define NANOSEC_PER_MILLISEC (1000000) #define NSEC_PER_SEC (1000*NANOSEC_PER_MILLISEC) @@ -1121,7 +1119,7 @@ void GKI_register_mempool (void *p_mem) ** Returns the address of the memory allocated, or NULL if failed ** ** NOTE This function is called by the Widcomm stack when -** dynamic memory allocation is used. (see dyn_mem.h) +** dynamic memory allocation is used. ** *******************************************************************************/ void *GKI_os_malloc (UINT32 size) diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_main.c b/halimpl/bcm2079x/hal/hal/nfc_hal_main.c index c353b5f..c31e944 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_main.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_main.c @@ -41,9 +41,7 @@ NFC_HAL_TRANS_CFG_QUALIFIER tNFC_HAL_TRANS_CFG nfc_hal_trans_cfg = }; /* Control block for NFC HAL NCI transport */ -#if NFC_DYNAMIC_MEMORY == FALSE tNFC_HAL_CB nfc_hal_cb; -#endif extern tNFC_HAL_CFG *p_nfc_hal_cfg; /**************************************************************************** |