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

preserve PCSC device name

Browse source
This commit is contained in:
Adam Laurie 2009-12-13 17:38:50 +00:00
parent a0cdc3e0d4
commit 6a97e694ec
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lib/drivers/acr122.c
View file

@ -200,6 +200,7 @@ nfc_device_t* acr122_connect(const nfc_device_desc_t* pndd)
SCARDCONTEXT *pscc; SCARDCONTEXT *pscc;
DBG("Connecting to %s",pndd->acDevice);
// We no longer support connecting with a NULL // We no longer support connecting with a NULL
if(pndd == NULL) return NULL; if(pndd == NULL) return NULL;
// Test if context succeeded // Test if context succeeded
@ -211,6 +212,7 @@ nfc_device_t* acr122_connect(const nfc_device_desc_t* pndd)
if (SCardConnect(*pscc,pndd->acDevice,SCARD_SHARE_DIRECT,0,&(as.hCard),(void*)&(as.ioCard.dwProtocol)) != SCARD_S_SUCCESS) if (SCardConnect(*pscc,pndd->acDevice,SCARD_SHARE_DIRECT,0,&(as.hCard),(void*)&(as.ioCard.dwProtocol)) != SCARD_S_SUCCESS)
{ {
// We can not connect to this device. // We can not connect to this device.
DBG("%s","PCSC connect failed");
return NULL; return NULL;
} }
} }
@ -227,8 +229,9 @@ nfc_device_t* acr122_connect(const nfc_device_desc_t* pndd)
// Done, we found the reader we are looking for // Done, we found the reader we are looking for
pnd = malloc(sizeof(nfc_device_t)); pnd = malloc(sizeof(nfc_device_t));
strncpy(pnd->acName,pcFirmware, DEVICE_NAME_LENGTH - 1); strcpy(pnd->acName,pndd->acDevice);
pnd->acName[DEVICE_NAME_LENGTH - 1] = '\0'; strcpy(pnd->acName + strlen(pnd->acName)," / ");
strcpy(pnd->acName + strlen(pnd->acName),pcFirmware);
pnd->nc = NC_PN532; pnd->nc = NC_PN532;
pnd->nds = (nfc_device_spec_t)pas; pnd->nds = (nfc_device_spec_t)pas;
pnd->bActive = true; pnd->bActive = true;

2
src/lib/nfc.c
View file

@ -157,7 +157,7 @@ nfc_device_t* nfc_connect(nfc_device_desc_t* pndd)
if (!pnd->pdc->transceive(pnd->nds,pncmd_get_firmware_version,2,abtFw,&szFwLen)) if (!pnd->pdc->transceive(pnd->nds,pncmd_get_firmware_version,2,abtFw,&szFwLen))
{ {
// Failed to get firmware revision??, whatever...let's disconnect and clean up and return err // Failed to get firmware revision??, whatever...let's disconnect and clean up and return err
ERR("Failed to get firmware revision for: %s", pnd->acName); DBG("Failed to get firmware revision for: %s", pnd->acName);
pnd->pdc->disconnect(pnd); pnd->pdc->disconnect(pnd);
return NULL; return NULL;
} }