crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux

Browse source
This commit is contained in:
Philippe Teuwen 2012-05-29 15:53:43 +00:00
parent a2cd236441
commit 67522bae65
5 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libnfc/chips/pn53x.c
View file

@ -829,8 +829,7 @@ pn53x_set_property_bool (struct nfc_device *pnd, const nfc_property property, co
return NFC_SUCCESS;
break;
case NP_ACTIVATE_FIELD:
{
case NP_ACTIVATE_FIELD: {
if (pn53x_RFConfiguration__RF_field (pnd, bEnable) == 0)
return NFC_SUCCESS;
}
@ -841,8 +840,7 @@ pn53x_set_property_bool (struct nfc_device *pnd, const nfc_property property, co
return pn53x_write_register (pnd, PN53X_REG_CIU_Status2, SYMBOL_MF_CRYPTO1_ON, btValue);
break;
case NP_INFINITE_SELECT:
{
case NP_INFINITE_SELECT: {
// TODO Made some research around this point:
// timings could be tweak better than this, and maybe we can tweak timings
// to "gain" a sort-of hardware polling (ie. like PN532 does)
@ -1045,8 +1043,7 @@ pn53x_initiator_select_passive_target_ext (struct nfc_device *pnd,
return res;
}
szTargetsData = (size_t)res;
}
else if (nm.nmt == NMT_ISO14443B2CT) {
} else if (nm.nmt == NMT_ISO14443B2CT) {
// Some work to do before getting the UID...
const uint8_t abtReqt[]= { 0x10 };
// Getting product code / fab code & store it in output buffer after the serial nr we'll obtain later
@ -2860,8 +2857,7 @@ pn53x_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, c
case NMT_ISO14443B:
case NMT_ISO14443BI:
case NMT_ISO14443B2SR:
case NMT_ISO14443B2CT:
{
case NMT_ISO14443B2CT: {
if ((CHIP_DATA(pnd)->type != PN533)) {
*supported_br = (nfc_baud_rate*)pn532_iso14443b_supported_baud_rates;
} else {

7
libnfc/drivers/acr122s.c
View file

@ -249,8 +249,8 @@ acr122s_send_frame(nfc_device *pnd, uint8_t *frame, int timeout)
static int
acr122s_recv_frame(nfc_device *pnd, uint8_t *frame, size_t frame_size, void *abort_p, int timeout)
{
if (frame_size < 13)
{ pnd->last_error = NFC_EINVARG;
if (frame_size < 13) {
pnd->last_error = NFC_EINVARG;
return pnd->last_error;
}
int ret;
@ -285,7 +285,8 @@ acr122s_recv_frame(nfc_device *pnd, uint8_t *frame, size_t frame_size, void *abo
* Convert host uint32 to litle endian uint32
*/
static uint32_t
le32(uint32_t val) {
le32(uint32_t val)
{
uint32_t res;
uint8_t *p = (uint8_t *) &res;
p[0] = val;