Modify code to add compatibility of readers

Follow the NXP Contactless card IC rules to be compatible with Feitian new and old R502 reader.
nfc-tools · Oct 20, 2020 · 0cd314c · 0cd314c
1 parent 435e2ff
commit 0cd314c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/libnfc/drivers/pcsc.c b/libnfc/drivers/pcsc.c
@@ -351,9 +351,15 @@ static int pcsc_props_to_target(struct nfc_device *pnd, uint8_t it, const uint8_
  if (is_pcsc_reader_vendor_feitian(pnd)) {
  uint8_t atqa[2];
  pcsc_get_atqa(pnd, atqa, sizeof(atqa));
- //memcpy(pnt->nti.nai.abtAtqa,atqa,2);
- pnt->nti.nai.abtAtqa[0] = atqa[1];
- pnt->nti.nai.abtAtqa[1] = atqa[0];
+ //ATQA Coding of NXP Contactless Card ICs
+ if(ataq[0] = 0x00 || atqa[0] == 0x03)
+ {
+ memcpy(pnt->nti.nai.abtAtqa,atqa,2);
+ }else {
+ pnt->nti.nai.abtAtqa[0] = atqa[1];
+ pnt->nti.nai.abtAtqa[1] = atqa[0];
+ }
+
  uint8_t sak[1];
  pcsc_get_sak(pnd, sak, sizeof(sak));
  pnt->nti.nai.btSak = sak[0];