diff options
| author | Evan Chu <evanchu@broadcom.com> | 2012-10-05 10:48:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-05 10:48:44 -0700 |
| commit | f4c1767b90eb6c256743d653e3ec451959bd399f (patch) | |
| tree | 1732dda1ddd80bca265a2f6bd8530952074ff466 | |
| parent | 98f3f63fa680fed66507399210ace05d64bf1d6c (diff) | |
| parent | 10dd44d39824fbccd8bf26871cb118b1475eb2f1 (diff) | |
| download | packages_apps_nfc-f4c1767b90eb6c256743d653e3ec451959bd399f.zip packages_apps_nfc-f4c1767b90eb6c256743d653e3ec451959bd399f.tar.gz packages_apps_nfc-f4c1767b90eb6c256743d653e3ec451959bd399f.tar.bz2 | |
am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changed
* commit '10dd44d39824fbccd8bf26871cb118b1475eb2f1':
NFA_HciAddStaticPipe()'s parameters changed
| -rwxr-xr-x | nci/jni/SecureElement.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp index 2522e35..1004bb4 100755 --- a/nci/jni/SecureElement.cpp +++ b/nci/jni/SecureElement.cpp @@ -677,7 +677,9 @@ bool SecureElement::connectEE () // If the .conf file had a static pipe to use, just use it. if (mNewPipeId != 0) { - nfaStat = NFA_HciAddStaticPipe(mNfaHciHandle, mNewPipeId); + UINT8 host = (mNewPipeId == STATIC_PIPE_0x70) ? 0x02 : 0x03; + UINT8 gate = (mNewPipeId == STATIC_PIPE_0x70) ? 0xF0 : 0xF1; + nfaStat = NFA_HciAddStaticPipe(mNfaHciHandle, host, gate, mNewPipeId); if (nfaStat != NFA_STATUS_OK) { ALOGE ("%s: fail create static pipe; error=0x%X", fn, nfaStat); @@ -1627,8 +1629,10 @@ bool SecureElement::getSeVerInfo(int seIndex, char * verInfo, int verInfoSz, UIN verInfo[verInfoSz-1] = '\0'; UINT8 pipe = (mEeInfo[seIndex].ee_handle == EE_HANDLE_0xF3) ? 0x70 : 0x71; + UINT8 host = (pipe == STATIC_PIPE_0x70) ? 0x02 : 0x03; + UINT8 gate = (pipe == STATIC_PIPE_0x70) ? 0xF0 : 0xF1; - tNFA_STATUS nfaStat = NFA_HciAddStaticPipe(mNfaHciHandle, pipe); + tNFA_STATUS nfaStat = NFA_HciAddStaticPipe(mNfaHciHandle, host, gate, pipe); if (nfaStat != NFA_STATUS_OK) { ALOGE ("%s: NFA_HciAddStaticPipe() failed, pipe = 0x%x, error=0x%X", __FUNCTION__, pipe, nfaStat); |