diff options
| author | Colin Cross <ccross@android.com> | 2014-04-09 02:12:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 02:12:41 +0000 |
| commit | 3791e815e3a1d4e0bb6e2551f895d83ed8d6102f (patch) | |
| tree | d63eb54cf22fb70353a2fb77aed5dea700b6c64d /nxp | |
| parent | b13ea1d815c63e3929b7fb93e1528f7dafc743e9 (diff) | |
| parent | 0c6df1db51d02fcaaa2dbf81dafd3455d87876cb (diff) | |
| download | android_packages_apps_Nfc-3791e815e3a1d4e0bb6e2551f895d83ed8d6102f.tar.gz android_packages_apps_Nfc-3791e815e3a1d4e0bb6e2551f895d83ed8d6102f.tar.bz2 android_packages_apps_Nfc-3791e815e3a1d4e0bb6e2551f895d83ed8d6102f.zip | |
am 0c6df1db: am 6f6e8bf6: Merge "nfc: use uintptr_t to cast between pointer and uint8_t"
* commit '0c6df1db51d02fcaaa2dbf81dafd3455d87876cb':
nfc: use uintptr_t to cast between pointer and uint8_t
Diffstat (limited to 'nxp')
| -rw-r--r-- | nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp index 86607b5c..74f07642 100644 --- a/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp +++ b/nxp/jni/com_android_nfc_NativeLlcpConnectionlessSocket.cpp @@ -32,7 +32,7 @@ static void nfc_jni_receive_callback(void* pContext, uint8_t ssap, NFCSTATUS sta if(status == NFCSTATUS_SUCCESS) { - pCallbackData->pContext = (void*)ssap; + pCallbackData->pContext = (void*)(uintptr_t)ssap; TRACE("RECEIVE UI_FRAME FROM SAP %d OK \n", ssap); } @@ -185,7 +185,7 @@ static jobject com_android_nfc_NativeLlcpConnectionlessSocket_doReceiveFrom(JNIE goto clean_and_return; } - ssap = (uint32_t)cb_data.pContext; + ssap = (uintptr_t)cb_data.pContext; TRACE("Data Received From SSAP = %d\n, length = %d", ssap, sReceiveBuffer.length); /* Set Llcp Packet remote SAP */ |