diff options
| author | Evan Chu <evanchu@broadcom.com> | 2013-07-11 15:12:33 -0400 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-08-05 08:56:45 -0700 |
| commit | d23e0531b6835ab75b543dd51cfe5edec8edefe4 (patch) | |
| tree | 06068d450f87021923e375a697af8e558ac48f81 /halimpl | |
| parent | e75b11bfe42c06a4ae95e947b04fdf09f1869fbd (diff) | |
| download | android_hardware_broadcom_nfc-d23e0531b6835ab75b543dd51cfe5edec8edefe4.tar.gz android_hardware_broadcom_nfc-d23e0531b6835ab75b543dd51cfe5edec8edefe4.tar.bz2 android_hardware_broadcom_nfc-d23e0531b6835ab75b543dd51cfe5edec8edefe4.zip | |
Allow HAL side to configure nfa_ee_max_ee_cfg.
Upgrade stack to allow JNI to control whether
to enable stack's secure element features.
Change-Id: Id4162d0a97a031fb1a0625f64faef90091282b3f
Diffstat (limited to 'halimpl')
| -rw-r--r--[-rwxr-xr-x] | halimpl/bcm2079x/adaptation/patchram.cpp | 3 | ||||
| -rw-r--r-- | halimpl/bcm2079x/hal/hal/nfc_hal_api.c | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/halimpl/bcm2079x/adaptation/patchram.cpp b/halimpl/bcm2079x/adaptation/patchram.cpp index 2363292..7b693ca 100755..100644 --- a/halimpl/bcm2079x/adaptation/patchram.cpp +++ b/halimpl/bcm2079x/adaptation/patchram.cpp @@ -78,9 +78,6 @@ tNFC_POST_RESET_CB nfc_post_reset_cb = /* Default tNFC_HAL_DEV_INIT_CFG (flags, num_xtal_cfg, {brcm_hw_id, xtal-freq, xtal-index} ) */ { -#if (NFC_BRCM_NOT_OPEN_INCLUDED == TRUE) - 0, -#endif 2, /* number of valid entries */ { {0x43341000, 37400, NFC_HAL_XTAL_INDEX_37400}, // All revisions of 43341 use 37,400 diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_api.c b/halimpl/bcm2079x/hal/hal/nfc_hal_api.c index 2cd95b2..896234b 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_api.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_api.c @@ -308,4 +308,19 @@ void HAL_NfcPowerCycle (void) } } +/******************************************************************************* +** +** Function HAL_NfcGetMaxNfcee +** +** Description Retrieve the maximum number of NFCEEs supported by NFCC +** +** Returns the maximum number of NFCEEs supported by NFCC +** +*******************************************************************************/ +UINT8 HAL_NfcGetMaxNfcee (void) +{ + HAL_TRACE_API1 ("HAL_NfcGetMaxNfcee: %d",nfc_hal_cb.max_ee); + return nfc_hal_cb.max_ee; +} + |