forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-03-10 09:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefix defines.h, messages.h and types.h headers by "nfc-"

Browse Source 
Rename dev_info struct to nfc_device_t
Some code cleanup
Rename pn531.h/c to pn531_usb.h/c
Rename pn533.h/c to pn533_usb.h/c
This commit is contained in:
Romuald Conty
2009-11-09 11:23:33 +00:00
parent 9ce99b80d3
commit 854dc3aceb
31 changed files with 419 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/drivers/pn532_uart.c
View File

@@ -24,7 +24,7 @@
#include "pn532_uart.h"
#include "uart.h"
#include "messages.h"
#include "nfc-messages.h"
#ifdef _WIN32
#define SERIAL_STRING "COM"
@@ -47,12 +47,12 @@
#define SERIAL_DEFAULT_PORT_SPEED 115200
dev_info* pn532_uart_connect(const nfc_device_desc_t* pndd)
nfc_device_t* pn532_uart_connect(const nfc_device_desc_t* pndd)
{
uint32_t uiDevNr;
serial_port sp;
char acConnect[BUFFER_LENGTH];
dev_info* pdi = INVALID_DEVICE_INFO;
nfc_device_t* pnd = INVALID_DEVICE_INFO;
if( pndd == NULL ) {
#ifdef DISABLE_SERIAL_AUTOPROBE
@@ -114,21 +114,21 @@ dev_info* pn532_uart_connect(const nfc_device_desc_t* pndd)
DBG("Successfully connected to: %s",acConnect);
// We have a connection
pdi = malloc(sizeof(dev_info));
strcpy(pdi->acName,"PN532_UART");
pdi->ct = CT_PN532;
pdi->ds = (dev_spec)sp;
pdi->bActive = true;
pdi->bCrc = true;
pdi->bPar = true;
pdi->ui8TxBits = 0;
return pdi;
pnd = malloc(sizeof(nfc_device_t));
strcpy(pnd->acName,"PN532_UART");
pnd->ct = CT_PN532;
pnd->ds = (dev_spec)sp;
pnd->bActive = true;
pnd->bCrc = true;
pnd->bPar = true;
pnd->ui8TxBits = 0;
return pnd;
}
void pn532_uart_disconnect(dev_info* pdi)
void pn532_uart_disconnect(nfc_device_t* pnd)
{
uart_close((serial_port)pdi->ds);
free(pdi);
uart_close((serial_port)pnd->ds);
free(pnd);
}
bool pn532_uart_transceive(const dev_spec ds, const byte_t* pbtTx, const size_t szTxLen, byte_t* pbtRx, size_t* pszRxLen)