laforge
/
librfid
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

updated win32 support for MINGW32-compiler/cross-compiler 

git-svn-id: https://svn.gnumonks.org/trunk/librfid@1990 e0336214-984f-0b4b-a45f-81c69e1f0ede
This commit is contained in:
meri 2007-05-02 01:46:14 +00:00
parent 1870e3694d
commit 855cc21b1a
6 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
SUBDIRS = etc include src utils
SUBDIRS = etc include src utils win32
DEFAULT_AM_CFLAGS = -std=gnu99
if ENABLE_WIN32

6
configure.in
View File

@ -1,12 +1,14 @@
dnl Process this file with autoconf to create configure.
AC_INIT
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(librfid, 0.1.0)
AC_PROG_CC
AM_PROG_CC_C_O
AC_C_CONST
AC_EXEEXT
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
@ -67,4 +69,4 @@ AC_CHECK_LIB(usb, usb_close,,)
AM_CONDITIONAL(HAVE_LIBUSB, test "x$have_libusb" = "xyes")
dnl Output the makefile
AC_OUTPUT(Makefile etc/Makefile etc/udev/Makefile src/Makefile include/Makefile include/librfid/Makefile utils/Makefile src/librfid.pc)
AC_OUTPUT(Makefile etc/Makefile etc/udev/Makefile src/Makefile include/Makefile include/librfid/Makefile utils/Makefile src/librfid.pc win32/Makefile)

4
include/librfid/rfid_protocol_mifare_classic.h
View File

@ -33,7 +33,9 @@ extern const struct rfid_protocol rfid_protocol_mfcl;
#define MIFARE_CL_RESP_ACK 0x0a
#define MIFARE_CL_RESP_NAK 0x00
#endif /* __LIBRFID__ */
extern int mfcl_set_key(struct rfid_protocol_handle *ph, unsigned char *key);
extern int mfcl_auth(struct rfid_protocol_handle *ph, u_int8_t cmd, u_int8_t block);
#endif /* _MIFARE_CLASSIC_H */

16
include/librfid/rfid_reader.h
View File

@ -12,6 +12,22 @@ struct rfid_reader {
unsigned int l2_supported;
unsigned int proto_supported;
int (*get_api_version)(
struct rfid_reader_handle *h,
u_int8_t *version);
int (*get_environment)(
struct rfid_reader_handle *rh,
unsigned char num_bytes,
unsigned char *buf);
int (*set_environment)(
struct rfid_reader_handle *rh,
unsigned char num_bytes,
const unsigned char *buf);
int (*reset)(struct rfid_reader_handle *h);
int (*transceive)(struct rfid_reader_handle *h,
enum rfid_frametype frametype,
const unsigned char *tx_buf, unsigned int tx_len,

11
src/rfid_layer2_iso14443a.c
View File

@ -23,8 +23,9 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
// #define DEBUG_LIBRFID
#ifdef __MINGW32__
#include <windows.h>
#endif/*__MINGW32__*/
#include <librfid/rfid.h>
#include <librfid/rfid_layer2.h>
@ -350,6 +351,12 @@ iso14443a_init(struct rfid_reader_handle *rh)
memset(h, 0, sizeof(*h));
#ifdef __MINGW32__
randctx[0] ^= GetTickCount();
#endif/*__MINGW32__*/
for(ret=0;ret<23;ret++)
random_bit();
h->l2 = &rfid_layer2_iso14443a;
h->rh = rh;
h->priv.iso14443a.state = ISO14443A_STATE_NONE;

96
src/rfid_reader_openpcd.c
View File

@ -80,7 +80,7 @@ static int openpcd_send_command(u_int8_t cmd, u_int8_t reg, u_int8_t val,
cur = sizeof(*snd_hdr) + len;
return usb_bulk_write(hdl, OPENPCD_OUT_EP, (char *)snd_hdr, cur, 0);
return usb_bulk_write(hdl, OPENPCD_OUT_EP, (char *)snd_hdr, cur, 1000);
}
static int openpcd_recv_reply(void)
@ -120,7 +120,7 @@ static struct usb_device *find_opcd_device(void)
{
struct usb_bus *bus;
for (bus = usb_busses; bus; bus = bus->next) {
for (bus = usb_get_busses(); bus; bus = bus->next) {
struct usb_device *dev;
for (dev = bus->devices; dev; dev = dev->next) {
int i;
@ -225,6 +225,83 @@ const struct rfid_asic_transport openpcd_rat = {
},
};
static int openpcd_get_api_version(struct rfid_reader_handle *rh, u_int8_t *version)
{
int ret;
// preset version result to zero
rcv_hdr->val=0;
ret = openpcd_xcv(OPENPCD_CMD_GET_API_VERSION, 0, 0, 0, NULL);
if (ret < 0) {
DEBUGPC("ERROR sending command [%i]\n", ret);
return ret;
}
if (ret < sizeof(struct openpcd_hdr)) {
DEBUGPC("ERROR: short packet [%i]\n", ret);
return -EINVAL;
}
*version = rcv_hdr->val;
return ret;
}
static int openpcd_get_environment(
struct rfid_reader_handle *rh,
unsigned char num_bytes,
unsigned char *buf)
{
int ret;
DEBUGP(" ");
ret = openpcd_xcv(OPENPCD_CMD_GET_ENVIRONMENT, 0x00, num_bytes, 0, NULL);
if (ret < 0) {
DEBUGPC("ERROR sending command [%i]\n",ret);
return ret;
}
DEBUGPC("ret = %d\n", ret);
memcpy(buf, rcv_hdr->data, ret - sizeof(struct openpcd_hdr));
DEBUGPC("len=%d val=%s: OK\n", ret - sizeof(struct openpcd_hdr),
rfid_hexdump(rcv_hdr->data, ret - sizeof(struct openpcd_hdr)));
return ret;
}
static int openpcd_set_environment(
struct rfid_reader_handle *rh,
const unsigned char num_bytes,
unsigned char *buf)
{
int ret;
ret = openpcd_xcv(OPENPCD_CMD_SET_ENVIRONMENT, 0, 0, num_bytes, buf);
if (ret < 0) {
DEBUGPC("ERROR sending command [%i]\n",ret);
return ret;
}
if (ret < sizeof(struct openpcd_hdr)) {
DEBUGPC("ERROR: short packet [%i]\n", ret);
return -EINVAL;
}
return rcv_hdr->val;
}
static int openpcd_reset(struct rfid_reader_handle *rh)
{
int ret;
DEBUGP("reset ");
ret = openpcd_xcv(OPENPCD_CMD_RESET, 0, 0, 0, 0);
return ret;
}
#else
/* RC632 access primitives for librfid inside reader firmware */
@ -325,7 +402,7 @@ openpcd_14443a_set_speed(struct rfid_reader_handle *rh,
break;
case RFID_14443A_SPEED_424K:
rate = 0x02;
DEBUGPC("424K\n");
DEBUGPC("424K\n");
break;
case RFID_14443A_SPEED_848K:
rate = 0x03;
@ -393,6 +470,13 @@ openpcd_open(void *data)
return NULL;
}
if(usb_set_configuration(hdl, 1 ) < 0)
{
DEBUGP("setting config failed\n");
usb_close( hdl );
return NULL;
}
if (usb_claim_interface(hdl, 0) < 0) {
DEBUGP("Can't claim interface\n");
usb_close(hdl);
@ -447,6 +531,12 @@ const struct rfid_reader rfid_reader_openpcd = {
.id = RFID_READER_OPENPCD,
.open = &openpcd_open,
.close = &openpcd_close,
.get_api_version = &openpcd_get_api_version,
.get_environment = &openpcd_get_environment,
.set_environment = &openpcd_set_environment,
.reset = &openpcd_reset,
.transceive = &openpcd_transceive,
.l2_supported = (1 << RFID_LAYER2_ISO14443A) |
(1 << RFID_LAYER2_ISO14443B) |