Commit b4b1c46f authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Don't call into HAL for determining max num EE.

Until we figure out how to deal with HAL binary
compatibility.

Also, do init the EE subsystem even if no SEs
are present; we still want to use the EE subsystem
on the host.

Change-Id: I17aad42e75508e2d04f53107527bce5bfe099ffe
parent b12873e7
......@@ -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
......
......@@ -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;
......
......@@ -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();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment