diff options
| author | Evan Chu <evanchu@broadcom.com> | 2013-01-18 11:02:50 -0500 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-02-04 13:49:54 -0800 |
| commit | 85b7e84f6cc61506c94e98844cac9ce50bbbe9dc (patch) | |
| tree | a5af20e6587ac730d3c889cb81a13a5154e13299 /halimpl/bcm2079x/hal | |
| parent | 808ebf88b1d5fae4556abe1f50651ab0a8e75114 (diff) | |
| download | android_hardware_broadcom_nfc-85b7e84f6cc61506c94e98844cac9ce50bbbe9dc.tar.gz android_hardware_broadcom_nfc-85b7e84f6cc61506c94e98844cac9ce50bbbe9dc.tar.bz2 android_hardware_broadcom_nfc-85b7e84f6cc61506c94e98844cac9ce50bbbe9dc.zip | |
Do not require getSystemInfo() for ISO15693 tags.
ISO15693 tags that do not respond to the
getSystemInfo() command should still be reported
to the upper stack, as getSystemInfo is not mandatory.
This also adds some code to deal with specifc ST
tag configurations, that require the prot ext bit
to be set when executing some commands.
Change-Id: I64dd9234750ea503ba5b14b2a22a46c106f61f76
Diffstat (limited to 'halimpl/bcm2079x/hal')
| -rw-r--r-- | halimpl/bcm2079x/hal/hal/nfc_hal_hci.c | 6 | ||||
| -rw-r--r-- | halimpl/bcm2079x/hal/hal/nfc_hal_prm.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c b/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c index 1504c94..3035123 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_hci.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012-2013 Broadcom Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -148,7 +148,7 @@ void nfc_hal_hci_handle_hci_netwk_info (UINT8 *p_data) } else { - NCI_TRACE_DEBUG1 ("nfc_hal_hci_handle_hci_netwk_info(): Type A Card Emulation invalid, Reset nv file: 0x%02x", p[15]); + NCI_TRACE_DEBUG1 ("nfc_hal_hci_handle_hci_netwk_info(): Type A Card Emulation invalid, Reset nv file: 0x%02x", p[12]); hci_netwk_cmd[0] = NFC_HAL_HCI_UICC0_TARGET_HANDLE; memset (&hci_netwk_cmd[1], 0xFF, NFC_HAL_HCI_SESSION_ID_LEN); nfc_hal_nv_co_write (hci_netwk_cmd, 1, HC_F3_NV_BLOCK); @@ -163,7 +163,7 @@ void nfc_hal_hci_handle_hci_netwk_info (UINT8 *p_data) } else { - NCI_TRACE_DEBUG1 ("nfc_hal_hci_handle_hci_netwk_info(): Type A Card Emulation invalid, Reset nv file: 0x%02x", p[15]); + NCI_TRACE_DEBUG1 ("nfc_hal_hci_handle_hci_netwk_info(): Type A Card Emulation invalid, Reset nv file: 0x%02x", p[12]); hci_netwk_cmd[0] = NFC_HAL_HCI_UICC1_TARGET_HANDLE; /* Reset Session ID */ memset (&hci_netwk_cmd[1], 0xFF, NFC_HAL_HCI_SESSION_ID_LEN); diff --git a/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c b/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c index 7fa9236..d928884 100644 --- a/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c +++ b/halimpl/bcm2079x/hal/hal/nfc_hal_prm.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (C) 2012 Broadcom Corporation + * Copyright (C) 2012-2013 Broadcom Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -634,6 +634,7 @@ void nfc_hal_prm_nci_command_complete_cback (tNFC_HAL_NCI_EVT event, UINT16 data } nfc_hal_cb.prm.flags |= NFC_HAL_PRM_FLAGS_NO_NVM; } + /* Get patchfile version number */ nfc_hal_cb.prm.state = NFC_HAL_PRM_ST_SPD_COMPARE_VERSION; |