diff --git a/halimpl/bcm2079x/nfc_nci.c b/halimpl/bcm2079x/nfc_nci.c index 46ee6899ccdfc535e2158cd7cf6dd1631cb26f51..b401a59609f3fd3456f706c8047eb2ca7bffe0c2 100755 --- a/halimpl/bcm2079x/nfc_nci.c +++ b/halimpl/bcm2079x/nfc_nci.c @@ -149,7 +149,8 @@ static int nfc_open (const hw_module_t* module, const char* name, hw_device_t** dev->nci_device.close = hal_close; dev->nci_device.control_granted = hal_control_granted; dev->nci_device.power_cycle = hal_power_cycle; - dev->nci_device.get_max_ee = hal_get_max_nfcee; + // TODO maco commented out for binary HAL compatibility + // dev->nci_device.get_max_ee = hal_get_max_nfcee; // Copy in diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp index d9c0d02f969ef840d7ea457c5571359807053d9a..3eb55ea114ff9310d299d426d5899461da6a416e 100755 --- a/src/adaptation/NfcAdaptation.cpp +++ b/src/adaptation/NfcAdaptation.cpp @@ -523,10 +523,10 @@ UINT8 NfcAdaptation::HalGetMaxNfcee() { const char* func = "NfcAdaptation::HalPowerCycle"; UINT8 maxNfcee = 0; - ALOGD ("%s", func); if (mHalDeviceContext) { - mHalDeviceContext->get_max_ee (mHalDeviceContext, &maxNfcee); + // TODO maco call into HAL when we figure out binary compatibility. + return nfa_ee_max_ee_cfg; } return maxNfcee; diff --git a/src/nfa/dm/nfa_dm_api.c b/src/nfa/dm/nfa_dm_api.c index 4d65e4adca99beab4bef00916a2cca4960a588e0..a34580b0f7ef371fcdf60ed1ff9ca202c5c1908a 100644 --- a/src/nfa/dm/nfa_dm_api.c +++ b/src/nfa/dm/nfa_dm_api.c @@ -61,10 +61,10 @@ void NFA_Init(tHAL_NFC_ENTRY *p_hal_entry_tbl) nfa_snep_init(FALSE); nfa_rw_init(); nfa_ce_init(); + nfa_ee_init(); if (nfa_ee_max_ee_cfg != 0) { nfa_dm_cb.get_max_ee = p_hal_entry_tbl->get_max_ee; - nfa_ee_init(); nfa_hci_init(); }