forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-07-19 18:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge the includes-revamp branch into trunk.

Browse Source
This commit is contained in:
Romain Tartiere
2009-12-01 14:23:00 +00:00
parent b29860a93c
commit 2b8232b9ab
42 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/drivers/Makefile.am
View File

@@ -1,5 +1,5 @@
# set the include path found by configure
INCLUDES= $(all_includes)
INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
noinst_HEADERS = arygon.h pn532_uart.h
noinst_LTLIBRARIES = libnfcdrivers.la

2
src/lib/drivers/acr122.c
View File

@@ -38,7 +38,7 @@
#endif
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
// WINDOWS: #define IOCTL_CCID_ESCAPE_SCARD_CTL_CODE SCARD_CTL_CODE(3500)
#define IOCTL_CCID_ESCAPE_SCARD_CTL_CODE (((0x31) << 16) | ((3500) << 2))

2
src/lib/drivers/acr122.h
View File

@@ -28,7 +28,7 @@
#include <stdbool.h>
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define ACR122_DRIVER_NAME "ACR122"

4
src/lib/drivers/arygon.c
View File

@@ -25,12 +25,12 @@
#include "arygon.h"
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "../drivers.h"
#include "../bitutils.h"
// Bus
#include "uart.h"
#include "../buses/uart.h"
#ifdef _WIN32
#define SERIAL_STRING "COM"

2
src/lib/drivers/arygon.h
View File

@@ -24,7 +24,7 @@
#ifndef __NFC_DRIVER_ARYGON_H__
#define __NFC_DRIVER_ARYGON_H__
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define ARYGON_DRIVER_NAME "ARYGON"

2
src/lib/drivers/pn531_usb.c
View File

@@ -35,7 +35,7 @@ Thanks to d18c7db and Okko for example code
#include "pn531_usb.h"
#include "../drivers.h"
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "../bitutils.h"
#define BUFFER_LENGTH 256

2
src/lib/drivers/pn531_usb.h
View File

@@ -27,7 +27,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define PN531_USB_DRIVER_NAME "PN531_USB"

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

@@ -25,7 +25,7 @@
#include "pn532_uart.h"
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#include "../drivers.h"
#include "../bitutils.h"

2
src/lib/drivers/pn532_uart.h
View File

@@ -24,7 +24,7 @@
#ifndef __NFC_DRIVER_PN532_UART_H__
#define __NFC_DRIVER_PN532_UART_H__
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define PN532_UART_DRIVER_NAME "PN532_UART"

2
src/lib/drivers/pn533_usb.c
View File

@@ -33,7 +33,7 @@ Thanks to d18c7db and Okko for example code
#include "pn533_usb.h"
#include "../drivers.h"
#include "nfc-messages.h"
#include <nfc/nfc-messages.h>
#define BUFFER_LENGTH 256
#define USB_TIMEOUT 30000

2
src/lib/drivers/pn533_usb.h
View File

@@ -24,7 +24,7 @@
#ifndef __NFC_DRIVER_PN533_USB_H__
#define __NFC_DRIVER_PN533_USB_H__
#include "nfc-types.h"
#include <nfc/nfc-types.h>
#define PN533_USB_DRIVER_NAME "PN533_USB"