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_TopazDynamicMap.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_TopazDynamicMap.c')
| -rw-r--r-- | src/phFriNfc_TopazDynamicMap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/phFriNfc_TopazDynamicMap.c b/src/phFriNfc_TopazDynamicMap.c index 697604d..2aa29ea 100644 --- a/src/phFriNfc_TopazDynamicMap.c +++ b/src/phFriNfc_TopazDynamicMap.c @@ -1010,7 +1010,7 @@ phFriNfc_Tpz_H_UpdateAndWriteLockBits ( lock_byte_index = (uint8_t)(lock_byte_index + 1); byte_index = (uint8_t)(byte_index + 1); } - } /* else of /* if (mod_value) */ + } /* else of if (mod_value) */ ps_tpz_info->lock_bytes_written = remaining_lock_bits; } else /* if (no_of_bits_left_in_block >= remaining_lock_bits) */ @@ -3848,7 +3848,7 @@ phFriNfc_Tpz_H_CopySendWrData ( #endif /* #ifdef TOPAZ_RAW_SUPPORT */ psNdefMap->State = (uint8_t)PH_FRINFC_TOPAZ_STATE_WRITE; - if ((write_len - psNdefMap->ApduBuffIndex) >= TOPAZ_WRITE_8_DATA_LENGTH) + if ((write_len - psNdefMap->ApduBuffIndex) >= (uint16_t)TOPAZ_WRITE_8_DATA_LENGTH) { copy_length = (uint8_t)TOPAZ_WRITE_8_DATA_LENGTH; (void)memcpy ((void *)write_buf, |