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

Attempt to fix ARYGON driver

Browse source
This commit is contained in:
Romuald Conty 2010-10-20 16:14:53 +00:00
parent 0abdf67b8b
commit 97cf9e925b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnfc/buses/uart.c
View file

@ -99,7 +99,7 @@ uart_open (const char *pcPortName)
return INVALID_SERIAL_PORT; return INVALID_SERIAL_PORT;
} }
tcflush (sp->fd, TCIFLUSH); tcflush (sp->fd, TCIOFLUSH);
return sp; return sp;
} }

8
libnfc/drivers/arygon.c
View file

@ -70,7 +70,7 @@
#define SERIAL_DEFAULT_PORT_SPEED 9600 #define SERIAL_DEFAULT_PORT_SPEED 9600
// TODO Move this one level up for libnfc-1.6 // TODO Move this one level up for libnfc-1.6
static const byte_t ack_frame[] = { 0x00, 0x00, 0xff, 0x00, 0xff, 0x00 }; static const byte_t ack_frame[] = { DEV_ARYGON_PROTOCOL_TAMA, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00 };
void arygon_ack (const nfc_device_spec_t nds); void arygon_ack (const nfc_device_spec_t nds);
bool arygon_check_communication (const nfc_device_spec_t nds); bool arygon_check_communication (const nfc_device_spec_t nds);
@ -172,9 +172,6 @@ arygon_connect (const nfc_device_desc_t * pndd)
DBG ("Attempt to connect to: %s at %d bauds.", pndd->pcPort, pndd->uiSpeed); DBG ("Attempt to connect to: %s at %d bauds.", pndd->pcPort, pndd->uiSpeed);
sp = uart_open (pndd->pcPort); sp = uart_open (pndd->pcPort);
// Send ACK frame to cancel a previous command
arygon_ack ((nfc_device_spec_t) sp);
if (sp == INVALID_SERIAL_PORT) if (sp == INVALID_SERIAL_PORT)
ERR ("Invalid serial port: %s", pndd->pcPort); ERR ("Invalid serial port: %s", pndd->pcPort);
if (sp == CLAIMED_SERIAL_PORT) if (sp == CLAIMED_SERIAL_PORT)
@ -184,6 +181,9 @@ arygon_connect (const nfc_device_desc_t * pndd)
uart_set_speed (sp, pndd->uiSpeed); uart_set_speed (sp, pndd->uiSpeed);
// Send ACK frame to cancel a previous command
arygon_ack ((nfc_device_spec_t) sp);
DBG ("Successfully connected to: %s", pndd->pcPort); DBG ("Successfully connected to: %s", pndd->pcPort);
// We have a connection // We have a connection