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

Fix nfc-emulation, now works with utils/nfc-emulate-forum-tag4 and Nexus S

Browse source
This commit is contained in:
Romuald Conty 2012-05-14 21:20:26 +00:00
parent 9383fa66bf
commit a56e5f9cd7
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libnfc/nfc-emulation.c
View file

@ -31,26 +31,28 @@ int
nfc_emulate_target (nfc_device *pnd, struct nfc_emulator *emulator) nfc_emulate_target (nfc_device *pnd, struct nfc_emulator *emulator)
{ {
uint8_t abtRx[ISO7816_SHORT_R_APDU_MAX_LEN]; uint8_t abtRx[ISO7816_SHORT_R_APDU_MAX_LEN];
int szRx;
uint8_t abtTx[ISO7816_SHORT_C_APDU_MAX_LEN]; uint8_t abtTx[ISO7816_SHORT_C_APDU_MAX_LEN];
int res = 0;
if ((szRx = nfc_target_init (pnd, emulator->target, abtRx, sizeof(abtRx), 0)) < 0) { int res;
return -1; if ((res = nfc_target_init (pnd, emulator->target, abtRx, sizeof(abtRx), 0)) < 0) {
return res;
} }
while (res >= 0) { size_t szRx = res;
res = emulator->state_machine->io (emulator, abtRx, sizeof(abtRx), abtTx, sizeof (abtTx)); int io_res = res;
if (res > 0) { while (io_res >= 0) {
if (nfc_target_send_bytes(pnd, abtTx, res, 0) < 0) { io_res = emulator->state_machine->io (emulator, abtRx, szRx, abtTx, sizeof (abtTx));
return -1; if (io_res > 0) {
if ((res = nfc_target_send_bytes(pnd, abtTx, io_res, 0)) < 0) {
return res;
} }
} }
if (res >= 0) { if (io_res >= 0) {
if ((res = nfc_target_receive_bytes(pnd, abtRx, (size_t) szRx, 0)) < 0) { if ((res = nfc_target_receive_bytes(pnd, abtRx, sizeof(abtRx), 0)) < 0) {
return -1; return res;
} }
szRx = res;
} }
} }
return (res < 0) ? res : 0; return (io_res < 0) ? io_res : 0;
} }