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

Decode supported modulation from PN53x

Browse source
This commit is contained in:
Romuald Conty 2010-10-18 14:26:49 +00:00
parent bfb49b594f
commit b5d85fc6e1
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nfc/nfc-types.h
View file

@ -76,6 +76,8 @@ typedef struct {
uint8_t ui8TxBits;
/** Register cache for SetParameters function. */
uint8_t ui8Parameters;
/** Supported modulation encoded in a byte */
byte_t btSupportByte;
/** Last error reported by the PCD / encountered by the PCD driver
* MSB LSB
* | 00 | 00 |

18
libnfc/chips/pn53x.c
View file

@ -173,7 +173,8 @@ pn53x_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, b
// Call the tranceive callback function of the current device
if (!pnd->pdc->transceive (pnd, pbtTx, szTx, pbtRx, pszRx))
return false;
// XXX Should we put all these numbers behind a human-readable #define ?
// TODO Put all these hex-coded command behind a human-readable #define (1.6.x)
// Should be proceed while we will fix Issue 110 (Rework the way that pn53x commands are built)
switch (pbtTx[1]) {
case 0x16: // PowerDown
case 0x40: // InDataExchange
@ -563,7 +564,7 @@ pn53x_InListPassiveTarget (nfc_device_t * pnd,
abtCmd[2] = szMaxTargets; // MaxTg
// XXX Is there is a better way to do this ?
// XXX Is there is a better way to do handle supported modulations ?
switch(pmInitModulation) {
case PM_ISO14443A_106:
case PM_FELICA_212:
@ -571,7 +572,12 @@ pn53x_InListPassiveTarget (nfc_device_t * pnd,
// all gone fine.
break;
case PM_ISO14443B_106:
// FIXME Some PN532 doesn't support type B !
if (!(pnd->btSupportByte & SUPPORT_ISO14443B)) {
// Eg. Some PN532 doesn't support type B!
pnd->iLastError = DENOTSUP;
return false;
}
break;
case PM_JEWEL_106:
if(pnd->nc == NC_PN531) {
// These modulations are not supported by pn531
@ -582,7 +588,7 @@ pn53x_InListPassiveTarget (nfc_device_t * pnd,
case PM_ISO14443B_212:
case PM_ISO14443B_424:
case PM_ISO14443B_847:
if(pnd->nc != NC_PN533) {
if((pnd->nc != NC_PN533) || (!(pnd->btSupportByte & SUPPORT_ISO14443B))) {
// These modulations are not supported by pn531 neither pn532
pnd->iLastError = DENOTSUP;
return false;
@ -772,14 +778,18 @@ pn53x_get_firmware_version (nfc_device_t * pnd, char abtFirmwareText[18])
switch (pnd->nc) {
case NC_PN531:
snprintf (abtFirmwareText, 18, "PN531 v%d.%d", abtFw[0], abtFw[1]);
pnd->btSupportByte = SUPPORT_ISO14443A | SUPPORT_ISO18092;
break;
case NC_PN532:
snprintf (abtFirmwareText, 18, "PN532 v%d.%d (0x%02x)", abtFw[1], abtFw[2], abtFw[3]);
pnd->btSupportByte = abtFw[3];
break;
case NC_PN533:
snprintf (abtFirmwareText, 18, "PN533 v%d.%d (0x%02x)", abtFw[1], abtFw[2], abtFw[3]);
pnd->btSupportByte = abtFw[3];
break;
}
// Be sure to have a null end of string
abtFirmwareText[17] = '\0';
return true;
}

5
libnfc/chips/pn53x.h
View file

@ -64,6 +64,11 @@
# define REG_CIU_BIT_FRAMING 0x633D
# define SYMBOL_TX_LAST_BITS 0x07
// PN53X Support Byte flags
#define SUPPORT_ISO14443A 0x01
#define SUPPORT_ISO14443B 0x02
#define SUPPORT_ISO18092 0x04
// Internal parameters flags
# define PARAM_NONE 0x00
# define PARAM_NAD_USED 0x01