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

Oups, r534 was not a joke... just a mistake ;-) This commit fix my r534.

Browse source
This commit is contained in:
Romuald Conty 2010-08-17 13:50:49 +00:00
parent 88002bf977
commit c021a50768
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnfc/drivers/arygon.c
View file

@ -109,11 +109,11 @@ arygon_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *p
*pszDeviceFound = 0; *pszDeviceFound = 0;
serial_port sp; serial_port sp;
const char** pcPorts = UNIX_SERIAL_PORT_DEVS; const char* pcPorts[] = DEFAULT_SERIAL_PORTS;
const char* pcPort; const char* pcPort;
int iDevice = 0; int iDevice = 0;
while( pcPort = pcPorts[i++] ) { while( pcPort = pcPorts[iDevice++] ) {
sp = uart_open(pcPort); sp = uart_open(pcPort);
DBG("Trying to find ARYGON device on serial port: %s at %d bauds.", pcPort, SERIAL_DEFAULT_PORT_SPEED); DBG("Trying to find ARYGON device on serial port: %s at %d bauds.", pcPort, SERIAL_DEFAULT_PORT_SPEED);
@ -124,7 +124,7 @@ arygon_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_t *p
uart_close(sp); uart_close(sp);
// ARYGON reader is found // ARYGON reader is found
snprintf(pnddDevices[*pszDeviceFound].acDevice, DEVICE_NAME_LENGTH - 1, "%s (%s)", "ARYGON", acPort); snprintf(pnddDevices[*pszDeviceFound].acDevice, DEVICE_NAME_LENGTH - 1, "%s (%s)", "ARYGON", pcPort);
pnddDevices[*pszDeviceFound].acDevice[DEVICE_NAME_LENGTH - 1] = '\0'; pnddDevices[*pszDeviceFound].acDevice[DEVICE_NAME_LENGTH - 1] = '\0';
pnddDevices[*pszDeviceFound].pcDriver = ARYGON_DRIVER_NAME; pnddDevices[*pszDeviceFound].pcDriver = ARYGON_DRIVER_NAME;
pnddDevices[*pszDeviceFound].pcPort = strdup(pcPort); pnddDevices[*pszDeviceFound].pcPort = strdup(pcPort);

8
libnfc/drivers/pn532_uart.c
View file

@ -83,11 +83,11 @@ pn532_uart_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_
*pszDeviceFound = 0; *pszDeviceFound = 0;
serial_port sp; serial_port sp;
const char** pcPorts = UNIX_SERIAL_PORT_DEVS; const char* pcPorts[] = DEFAULT_SERIAL_PORTS;
const char* pcPort; const char* pcPort;
int iDevice = 0; int iDevice = 0;
while( pcPort = pcPorts[i++] ) { while( pcPort = pcPorts[iDevice++] ) {
sp = uart_open(pcPort); sp = uart_open(pcPort);
DBG("Trying to find PN532 device on serial port: %s at %d bauds.", pcPort, SERIAL_DEFAULT_PORT_SPEED); DBG("Trying to find PN532 device on serial port: %s at %d bauds.", pcPort, SERIAL_DEFAULT_PORT_SPEED);
@ -113,8 +113,8 @@ pn532_uart_list_devices(nfc_device_desc_t pnddDevices[], size_t szDevices, size_
if((*pszDeviceFound) >= szDevices) break; if((*pszDeviceFound) >= szDevices) break;
} }
#ifdef DEBUG #ifdef DEBUG
if (sp == INVALID_SERIAL_PORT) DBG("Invalid serial port: %s",acPort); if (sp == INVALID_SERIAL_PORT) DBG("Invalid serial port: %s", pcPort);
if (sp == CLAIMED_SERIAL_PORT) DBG("Serial port already claimed: %s",acPort); if (sp == CLAIMED_SERIAL_PORT) DBG("Serial port already claimed: %s", pcPort);
#endif /* DEBUG */ #endif /* DEBUG */
} }
#endif /* SERIAL_AUTOPROBE_ENABLED */ #endif /* SERIAL_AUTOPROBE_ENABLED */

3
libnfc/nfc.c
View file

@ -520,7 +520,8 @@ nfc_initiator_select_passive_target(const nfc_device_t* pnd,
return true; return true;
} }
bool nfc_initiator_list_passive_targets(nfc_device_t* pnd, const nfc_modulation_t nmInitModulation, nfc_target_info_t anti[], const size_t szTargets, size_t *pszTargetFound ) bool
nfc_initiator_list_passive_targets(nfc_device_t* pnd, const nfc_modulation_t nmInitModulation, nfc_target_info_t anti[], const size_t szTargets, size_t *pszTargetFound)
{ {
nfc_target_info_t nti; nfc_target_info_t nti;
size_t szTargetFound = 0; size_t szTargetFound = 0;