From a4d43ca913ec4ffaa9df95ad2ce820498f7a52b9 Mon Sep 17 00:00:00 2001 From: Andre Eisenbach Date: Tue, 18 Oct 2016 01:03:15 -0700 Subject: Remove DYNAMIC_MEMORY_* compile flags Unused and adding unecessary complexity. Also step 1 in removing GKI*. Test: compiles Change-Id: I338ce3041f5c928924a9dcc8ad4e73bc1c914163 --- halimpl/bcm2079x/gki/common/gki_common.h | 1 - halimpl/bcm2079x/gki/ulinux/gki_int.h | 5 - halimpl/bcm2079x/gki/ulinux/gki_ulinux.c | 4 +- halimpl/bcm2079x/hal/hal/nfc_hal_main.c | 2 - src/gki/common/gki_common.h | 1 - src/gki/ulinux/gki_int.h | 5 - src/gki/ulinux/gki_ulinux.c | 4 +- src/hal/int/nfc_hal_int.h | 7 +- src/include/bt_target.h | 1 - src/include/dyn_mem.h | 195 ------------------------------- src/include/nfc_target.h | 11 -- src/nfa/ee/nfa_ee_main.c | 2 - src/nfa/int/nfa_cho_int.h | 5 - src/nfa/int/nfa_dm_int.h | 5 - src/nfa/int/nfa_ee_int.h | 5 - src/nfa/int/nfa_hci_int.h | 6 - src/nfa/int/nfa_p2p_int.h | 5 - src/nfa/int/nfa_snep_int.h | 10 -- src/nfa/int/nfa_sys_int.h | 6 - src/nfa/p2p/nfa_p2p_main.c | 2 - src/nfa/sys/nfa_sys_main.c | 2 - src/nfc/int/ce_int.h | 5 - src/nfc/int/llcp_int.h | 5 - src/nfc/int/nfc_int.h | 5 - src/nfc/int/rw_int.h | 5 - src/nfc/llcp/llcp_main.c | 2 - src/nfc/nfc/nfc_main.c | 2 - 27 files changed, 4 insertions(+), 304 deletions(-) delete mode 100644 src/include/dyn_mem.h 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; /**************************************************************************** diff --git a/src/gki/common/gki_common.h b/src/gki/common/gki_common.h index 2bd9f8f..ded2855 100644 --- a/src/gki/common/gki_common.h +++ b/src/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/src/gki/ulinux/gki_int.h b/src/gki/ulinux/gki_int.h index c59ac32..b558c51 100644 --- a/src/gki/ulinux/gki_int.h +++ b/src/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/src/gki/ulinux/gki_ulinux.c b/src/gki/ulinux/gki_ulinux.c index 3a377bf..e7aaa84 100644 --- a/src/gki/ulinux/gki_ulinux.c +++ b/src/gki/ulinux/gki_ulinux.c @@ -45,9 +45,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) @@ -1098,7 +1096,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/src/hal/int/nfc_hal_int.h b/src/hal/int/nfc_hal_int.h index d4f0272..6892e0b 100644 --- a/src/hal/int/nfc_hal_int.h +++ b/src/hal/int/nfc_hal_int.h @@ -447,13 +447,10 @@ typedef struct } tNFC_HAL_CB; /* Global NCI data */ -#if NFC_DYNAMIC_MEMORY == FALSE extern tNFC_HAL_CB nfc_hal_cb; -#else -#define nfc_hal_cb (*nfc_hal_cb_ptr) -extern tNFC_HAL_CB *nfc_hal_cb_ptr; -#endif + extern UINT8 *p_nfc_hal_pre_discover_cfg; + /**************************************************************************** ** Internal nfc functions ****************************************************************************/ diff --git a/src/include/bt_target.h b/src/include/bt_target.h index f751548..65bdb99 100644 --- a/src/include/bt_target.h +++ b/src/include/bt_target.h @@ -28,7 +28,6 @@ #include "gki_target.h" #include "bt_types.h" /* This must be defined AFTER buildcfg.h */ -#include "dyn_mem.h" /* defines static and/or dynamic memory for components */ /* #define BYPASS_AVDATATRACE */ diff --git a/src/include/dyn_mem.h b/src/include/dyn_mem.h deleted file mode 100644 index 2a478b2..0000000 --- a/src/include/dyn_mem.h +++ /dev/null @@ -1,195 +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 DYN_MEM_H -#define DYN_MEM_H - -/**************************************************************************** -** Define memory usage for GKI (if not defined in buildcfg.h) -** The default for GKI is to use static memory allocation for its control -** block. -*/ -#ifndef GKI_DYNAMIC_MEMORY -#define GKI_DYNAMIC_MEMORY FALSE -#endif - -/**************************************************************************** -** Define memory usage for each CORE component (if not defined in buildcfg.h) -** The default for each component is to use static memory allocations. -*/ -#ifndef BTU_DYNAMIC_MEMORY -#define BTU_DYNAMIC_MEMORY FALSE -#endif - -#ifndef BTM_DYNAMIC_MEMORY -#define BTM_DYNAMIC_MEMORY FALSE -#endif - -#ifndef SDP_DYNAMIC_MEMORY -#define SDP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef L2C_DYNAMIC_MEMORY -#define L2C_DYNAMIC_MEMORY FALSE -#endif - -#ifndef A2MP_DYNAMIC_MEMORY -#define A2MP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef RFC_DYNAMIC_MEMORY -#define RFC_DYNAMIC_MEMORY FALSE -#endif - -#ifndef TCS_DYNAMIC_MEMORY -#define TCS_DYNAMIC_MEMORY FALSE -#endif - -#ifndef OBX_DYNAMIC_MEMORY -#define OBX_DYNAMIC_MEMORY FALSE -#endif - -#ifndef BNEP_DYNAMIC_MEMORY -#define BNEP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef AVDT_DYNAMIC_MEMORY -#define AVDT_DYNAMIC_MEMORY FALSE -#endif - -#ifndef AVCT_DYNAMIC_MEMORY -#define AVCT_DYNAMIC_MEMORY FALSE -#endif - -#ifndef MCA_DYNAMIC_MEMORY -#define MCA_DYNAMIC_MEMORY FALSE -#endif - -#ifndef GATT_DYNAMIC_MEMORY -#define GATT_DYNAMIC_MEMORY FALSE -#endif - -#ifndef SMP_DYNAMIC_MEMORY -#define SMP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef BRCM_DYNAMIC_MEMORY -#define BRCM_DYNAMIC_MEMORY FALSE -#endif - -/**************************************************************************** -** Define memory usage for each PROFILE component (if not defined in buildcfg.h) -** The default for each component is to use static memory allocations. -*/ -#ifndef A2D_DYNAMIC_MEMORY -#define A2D_DYNAMIC_MEMORY FALSE -#endif - -#ifndef VDP_DYNAMIC_MEMORY -#define VDP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef AVRC_DYNAMIC_MEMORY -#define AVRC_DYNAMIC_MEMORY FALSE -#endif - -#ifndef BIP_DYNAMIC_MEMORY -#define BIP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef BPP_DYNAMIC_MEMORY -#define BPP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef CTP_DYNAMIC_MEMORY -#define CTP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef DUN_DYNAMIC_MEMORY -#define DUN_DYNAMIC_MEMORY FALSE -#endif - -#ifndef FTP_DYNAMIC_MEMORY -#define FTP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef GAP_DYNAMIC_MEMORY -#define GAP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef GOEP_DYNAMIC_MEMORY -#define GOEP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef HCRP_DYNAMIC_MEMORY -#define HCRP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef HFP_DYNAMIC_MEMORY -#define HFP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef HID_DYNAMIC_MEMORY -#define HID_DYNAMIC_MEMORY FALSE -#endif - -#ifndef HSP2_DYNAMIC_MEMORY -#define HSP2_DYNAMIC_MEMORY FALSE -#endif - -#ifndef ICP_DYNAMIC_MEMORY -#define ICP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef OPP_DYNAMIC_MEMORY -#define OPP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef PAN_DYNAMIC_MEMORY -#define PAN_DYNAMIC_MEMORY FALSE -#endif - -#ifndef SPP_DYNAMIC_MEMORY -#define SPP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef SLIP_DYNAMIC_MEMORY -#define SLIP_DYNAMIC_MEMORY FALSE -#endif - -#ifndef LLCP_DYNAMIC_MEMORY -#define LLCP_DYNAMIC_MEMORY FALSE -#endif - -/**************************************************************************** -** Define memory usage for BTA (if not defined in buildcfg.h) -** The default for each component is to use static memory allocations. -*/ -#ifndef BTA_DYNAMIC_MEMORY -#define BTA_DYNAMIC_MEMORY FALSE -#endif - -/**************************************************************************** -** Define memory usage for BT Trace (if not defined in buildcfg.h) -** The default is to use static memory allocations. -*/ -#ifndef BTTRC_DYNAMIC_MEMORY -#define BTTRC_DYNAMIC_MEMORY FALSE -#endif - -#endif /* #ifdef DYN_MEM_H */ - diff --git a/src/include/nfc_target.h b/src/include/nfc_target.h index dc7dd70..f5ec817 100644 --- a/src/include/nfc_target.h +++ b/src/include/nfc_target.h @@ -29,7 +29,6 @@ #include "gki_target.h" #include "bt_types.h" /* This must be defined AFTER buildcfg.h */ -#include "dyn_mem.h" /* defines static and/or dynamic memory for components */ #ifndef LMP_TEST #include "bt_trace.h" #endif @@ -191,13 +190,6 @@ #define NFC_RW_ONLY FALSE #endif -/* Define to TRUE to use dynamic memory allocation. - * The default is FALSE - to use static memory allocations. -*/ -#ifndef NFC_DYNAMIC_MEMORY -#define NFC_DYNAMIC_MEMORY FALSE -#endif - /* Timeout for receiving response to NCI command */ #ifndef NFC_CMD_CMPL_TIMEOUT #define NFC_CMD_CMPL_TIMEOUT 2 @@ -504,9 +496,6 @@ ** NFA ** ******************************************************************************/ -#ifndef NFA_DYNAMIC_MEMORY -#define NFA_DYNAMIC_MEMORY FALSE -#endif #ifndef NFA_INCLUDED #define NFA_INCLUDED TRUE diff --git a/src/nfa/ee/nfa_ee_main.c b/src/nfa/ee/nfa_ee_main.c index 70b87d4..2cf0704 100644 --- a/src/nfa/ee/nfa_ee_main.c +++ b/src/nfa/ee/nfa_ee_main.c @@ -35,9 +35,7 @@ extern void nfa_ee_vs_cback (tNFC_VS_EVT event, BT_HDR *p_data); *****************************************************************************/ /* system manager control block definition */ -#if NFA_DYNAMIC_MEMORY == FALSE tNFA_EE_CB nfa_ee_cb; -#endif /***************************************************************************** ** Constants diff --git a/src/nfa/int/nfa_cho_int.h b/src/nfa/int/nfa_cho_int.h index eaeebf5..41c4c50 100644 --- a/src/nfa/int/nfa_cho_int.h +++ b/src/nfa/int/nfa_cho_int.h @@ -248,12 +248,7 @@ typedef struct *****************************************************************************/ /* NFA Connection Handover control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_CHO_CB nfa_cho_cb; -#else -extern tNFA_CHO_CB *nfa_cho_cb_ptr; -#define nfa_cho_cb (*nfa_cho_cb_ptr) -#endif /***************************************************************************** ** External functions diff --git a/src/nfa/int/nfa_dm_int.h b/src/nfa/int/nfa_dm_int.h index f22dcf6..0094f3e 100644 --- a/src/nfa/int/nfa_dm_int.h +++ b/src/nfa/int/nfa_dm_int.h @@ -544,12 +544,7 @@ extern UINT8 nfa_dm_num_dm_interface_mapping; extern BOOLEAN nfa_poll_bail_out_mode; /* NFA device manager control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_DM_CB nfa_dm_cb; -#else -extern tNFA_DM_CB *nfa_dm_cb_ptr; -#define nfa_dm_cb (*nfa_dm_cb_ptr) -#endif void nfa_dm_init (void); void nfa_p2p_init (void); diff --git a/src/nfa/int/nfa_ee_int.h b/src/nfa/int/nfa_ee_int.h index c2014d3..8165c13 100644 --- a/src/nfa/int/nfa_ee_int.h +++ b/src/nfa/int/nfa_ee_int.h @@ -426,12 +426,7 @@ typedef struct *****************************************************************************/ /* NFA EE control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_EE_CB nfa_ee_cb; -#else -extern tNFA_EE_CB *nfa_ee_cb_ptr; -#define nfa_ee_cb (*nfa_ee_cb_ptr) -#endif /***************************************************************************** ** External functions diff --git a/src/nfa/int/nfa_hci_int.h b/src/nfa/int/nfa_hci_int.h index fe77a5c..4395414 100644 --- a/src/nfa/int/nfa_hci_int.h +++ b/src/nfa/int/nfa_hci_int.h @@ -425,13 +425,7 @@ typedef struct *****************************************************************************/ /* NFA HCI control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_HCI_CB nfa_hci_cb; -#else -extern tNFA_HCI_CB *nfa_hci_cb_ptr; -#define nfa_hci_cb (*nfa_hci_cb_ptr) -#endif - /***************************************************************************** ** External functions diff --git a/src/nfa/int/nfa_p2p_int.h b/src/nfa/int/nfa_p2p_int.h index 0296ec5..0964747 100644 --- a/src/nfa/int/nfa_p2p_int.h +++ b/src/nfa/int/nfa_p2p_int.h @@ -275,12 +275,7 @@ typedef struct *****************************************************************************/ /* NFA P2P control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_P2P_CB nfa_p2p_cb; -#else -extern tNFA_P2P_CB *nfa_p2p_cb_ptr; -#define nfa_p2p_cb (*nfa_p2p_cb_ptr) -#endif /***************************************************************************** ** External functions diff --git a/src/nfa/int/nfa_snep_int.h b/src/nfa/int/nfa_snep_int.h index 7ca5c54..ec4ddc0 100644 --- a/src/nfa/int/nfa_snep_int.h +++ b/src/nfa/int/nfa_snep_int.h @@ -234,20 +234,10 @@ typedef struct *****************************************************************************/ /* NFA SNEP control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_SNEP_CB nfa_snep_cb; -#else -extern tNFA_SNEP_CB *nfa_snep_cb_ptr; -#define nfa_snep_cb (*nfa_snep_cb_ptr) -#endif /* NFA SNEP default server control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_SNEP_DEFAULT_CB nfa_snep_default_cb; -#else -extern tNFA_SNEP_DEFAULT_CB *nfa_snep_default_cb_ptr; -#define nfa_snep_default_cb (*nfa_snep_default_cb_ptr) -#endif /***************************************************************************** ** External functions diff --git a/src/nfa/int/nfa_sys_int.h b/src/nfa/int/nfa_sys_int.h index 27d0539..70cccce 100644 --- a/src/nfa/int/nfa_sys_int.h +++ b/src/nfa/int/nfa_sys_int.h @@ -66,13 +66,7 @@ typedef struct *****************************************************************************/ /* system manager control block */ -#if NFA_DYNAMIC_MEMORY == FALSE extern tNFA_SYS_CB nfa_sys_cb; -#else -extern tNFA_SYS_CB *nfa_sys_cb_ptr; -#define nfa_sys_cb (*nfa_sys_cb_ptr) -#endif - /* system manager configuration structure */ extern tNFA_SYS_CFG *p_nfa_sys_cfg; diff --git a/src/nfa/p2p/nfa_p2p_main.c b/src/nfa/p2p/nfa_p2p_main.c index 4ec71e7..547c11f 100644 --- a/src/nfa/p2p/nfa_p2p_main.c +++ b/src/nfa/p2p/nfa_p2p_main.c @@ -37,9 +37,7 @@ *****************************************************************************/ /* system manager control block definition */ -#if NFA_DYNAMIC_MEMORY == FALSE tNFA_P2P_CB nfa_p2p_cb; -#endif /***************************************************************************** ** Static Functions diff --git a/src/nfa/sys/nfa_sys_main.c b/src/nfa/sys/nfa_sys_main.c index 1335adc..5e3e095 100644 --- a/src/nfa/sys/nfa_sys_main.c +++ b/src/nfa/sys/nfa_sys_main.c @@ -35,9 +35,7 @@ #endif /* system manager control block definition */ -#if NFA_DYNAMIC_MEMORY == FALSE tNFA_SYS_CB nfa_sys_cb = {0, }; /* nfa_sys control block. statically initialize 'flags' field to 0 */ -#endif /******************************************************************************* ** diff --git a/src/nfc/int/ce_int.h b/src/nfc/int/ce_int.h index 9f4efe2..7fb3fb2 100644 --- a/src/nfc/int/ce_int.h +++ b/src/nfc/int/ce_int.h @@ -150,12 +150,7 @@ extern "C" { #endif /* Global NFC data */ -#if NFC_DYNAMIC_MEMORY == FALSE NFC_API extern tCE_CB ce_cb; -#else -NFC_API extern tCE_CB *ce_cb_ptr; -#define ce_cb (*ce_cb_ptr) -#endif extern void ce_init (void); diff --git a/src/nfc/int/llcp_int.h b/src/nfc/int/llcp_int.h index d6aabbd..6a7f1ef 100644 --- a/src/nfc/int/llcp_int.h +++ b/src/nfc/int/llcp_int.h @@ -286,12 +286,7 @@ extern "C" { ** LLCP global data */ -#if (!defined LLCP_DYNAMIC_MEMORY) || (LLCP_DYNAMIC_MEMORY == FALSE) LLCP_API extern tLLCP_CB llcp_cb; -#else -LLCP_API extern tLLCP_CB *llcp_cb_ptr; -#define llcp_cb (*llcp_cb_ptr) -#endif /* ** Functions provided by llcp_main.c diff --git a/src/nfc/int/nfc_int.h b/src/nfc/int/nfc_int.h index 5a45072..8ceeeae 100644 --- a/src/nfc/int/nfc_int.h +++ b/src/nfc/int/nfc_int.h @@ -208,12 +208,7 @@ typedef struct *****************************************************************************/ /* Global NFC data */ -#if NFC_DYNAMIC_MEMORY == FALSE NFC_API extern tNFC_CB nfc_cb; -#else -NFC_API extern tNFC_CB *nfc_cb_ptr; -#define nfc_cb (*nfc_cb_ptr) -#endif /**************************************************************************** ** Internal nfc functions diff --git a/src/nfc/int/rw_int.h b/src/nfc/int/rw_int.h index 908fd09..1ca83e6 100644 --- a/src/nfc/int/rw_int.h +++ b/src/nfc/int/rw_int.h @@ -586,12 +586,7 @@ extern "C" { #endif /* Global NFC data */ -#if NFC_DYNAMIC_MEMORY == FALSE NFC_API extern tRW_CB rw_cb; -#else -NFC_API extern tRW_CB *rw_cb_ptr; -#define rw_cb (*rw_cb_ptr) -#endif /* from .c */ diff --git a/src/nfc/llcp/llcp_main.c b/src/nfc/llcp/llcp_main.c index 6c7560b..631f074 100644 --- a/src/nfc/llcp/llcp_main.c +++ b/src/nfc/llcp/llcp_main.c @@ -32,9 +32,7 @@ #include "llcp_defs.h" #include "nfc_int.h" -#if (LLCP_DYNAMIC_MEMORY == FALSE) tLLCP_CB llcp_cb; -#endif /******************************************************************************* ** diff --git a/src/nfc/nfc/nfc_main.c b/src/nfc/nfc/nfc_main.c index ad1b474..ab9309b 100644 --- a/src/nfc/nfc/nfc_main.c +++ b/src/nfc/nfc/nfc_main.c @@ -58,9 +58,7 @@ /**************************************************************************** ** Declarations ****************************************************************************/ -#if NFC_DYNAMIC_MEMORY == FALSE tNFC_CB nfc_cb; -#endif #if (NFC_RW_ONLY == FALSE) #define NFC_NUM_INTERFACE_MAP 2 -- cgit v1.2.3