diff options
| author | Nick Pelly <npelly@google.com> | 2011-06-27 09:01:51 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-06-27 09:30:36 -0700 |
| commit | 34ff48f6cd6595a899e05fbd56f4c84891840d3f (patch) | |
| tree | 2157358fa3ddd5309f102185c8cf278fbb078d2c /src/phFriNfc_Llcp.c | |
| parent | d4cb91ee6f74f187cc0e7ba9dc073b0a77c27dfa (diff) | |
| download | external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.zip external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.gz external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.bz2 | |
libnfc spring cleaning
o Fix most libnfc warnings, from 360 to 18
o Make DAL_DEBUG much less verbose and more useful
o Clean up Android.mk
Done with minimal textual diff to minimize merge conflicts.
Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
Diffstat (limited to 'src/phFriNfc_Llcp.c')
| -rw-r--r-- | src/phFriNfc_Llcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/phFriNfc_Llcp.c b/src/phFriNfc_Llcp.c index ac38311..337c31a 100644 --- a/src/phFriNfc_Llcp.c +++ b/src/phFriNfc_Llcp.c @@ -423,7 +423,7 @@ static NFCSTATUS phFriNfc_Llcp_ParseLinkParams( phNfc_sData_t break; } /* Get MIU */ - sParams.miu = PHFRINFC_LLCP_MIU_DEFAULT + ((sValueBuffer.buffer[0] << 8) | sValueBuffer.buffer[1]) & PHFRINFC_LLCP_TLV_MIUX_MASK; + sParams.miu = (PHFRINFC_LLCP_MIU_DEFAULT + ((sValueBuffer.buffer[0] << 8) | sValueBuffer.buffer[1])) & PHFRINFC_LLCP_TLV_MIUX_MASK; break; } case PHFRINFC_LLCP_TLV_TYPE_WKS: @@ -675,7 +675,7 @@ static void phFriNfc_Llcp_ChkLlcp_CB( void *pContext, static void phFriNfc_Llcp_LinkStatus_CB( void *pContext, phFriNfc_LlcpMac_eLinkStatus_t eLinkStatus, phNfc_sData_t *psParamsTLV, - phFriNfc_LlcpMac_eType_t PeerRemoteDevType) + phFriNfc_LlcpMac_ePeerType_t PeerRemoteDevType) { NFCSTATUS status; |