forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-02-27 04:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flush input hardware buffer on serial port opening (WARNING: Had to be done in Windows part.)

Browse Source 
Make sure that returned RX buffer length of rs232_receive() is set in each case. (WARNING: Had to be done in Windows part.)
Clean up dev_arygon.c to fit with coding conventions.
This commit is contained in:
Romuald Conty
2009-09-17 08:48:05 +00:00
parent 61760cc853
commit 84fd09c281
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dev_arygon.c
View File

@@ -68,14 +68,14 @@ static byte_t abtTxBuf[BUFFER_LENGTH] = { DEV_ARYGON_PROTOCOL_TAMA, 0x00, 0x00,
* @note ARYGON-APDB2UA33 (PN532 + ARYGON µC): 9600,n,8,1
*/
dev_info* dev_arygon_connect(const nfc_device_desc_t* device_desc)
dev_info* dev_arygon_connect(const nfc_device_desc_t* pndd)
{
uint32_t uiDevNr;
serial_port sp;
char acConnect[BUFFER_LENGTH];
dev_info* pdi = INVALID_DEVICE_INFO;
if( device_desc == NULL ) {
if( pndd == NULL ) {
#ifdef DISABLE_SERIAL_AUTOPROBE
INFO("Sorry, serial auto-probing have been disabled at compile time.");
return INVALID_DEVICE_INFO;
@@ -105,14 +105,14 @@ dev_info* dev_arygon_connect(const nfc_device_desc_t* device_desc)
// Test if we have found a device
if (uiDevNr == MAX_DEVICES) return INVALID_DEVICE_INFO;
} else {
DBG("Connecting to: %s at %d bauds.",device_desc->port, device_desc->speed);
strcpy(acConnect,device_desc->port);
DBG("Connecting to: %s at %d bauds.",pndd->port, pndd->speed);
strcpy(acConnect,pndd->port);
sp = rs232_open(acConnect);
if (sp == INVALID_SERIAL_PORT) ERR("Invalid serial port: %s",acConnect);
if (sp == CLAIMED_SERIAL_PORT) ERR("Serial port already claimed: %s",acConnect);
if ((sp == CLAIMED_SERIAL_PORT) || (sp == INVALID_SERIAL_PORT)) return INVALID_DEVICE_INFO;
rs232_set_speed(sp, device_desc->speed);
rs232_set_speed(sp, pndd->speed);
}
DBG("Successfully connected to: %s",acConnect);