From a91cd3d9e2a4e985c63850679e8242c6d08fed08 Mon Sep 17 00:00:00 2001
From: meri <meri@e0336214-984f-0b4b-a45f-81c69e1f0ede>
Date: Thu, 3 May 2007 09:11:50 +0000
Subject: fixed automake/autoconf files to allow clean firmware compilation

git-svn-id: https://svn.gnumonks.org/trunk/librfid@1996 e0336214-984f-0b4b-a45f-81c69e1f0ede
---
 src/Makefile.am           | 2 +-
 src/rfid_reader_openpcd.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 13f7a85..b3c1c24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 LIBVERSION= 0:0:0
 
 if ENABLE_FIRMWARE
-INCLUDES_FIRMWARE = -I$(FIRMWARE_PATH)/include -I$(GNUARM_PATH)/arm-elf/include
+INCLUDES_FIRMWARE = -I$(FIRMWARE_PATH)/include -I$(FIRMWARE_PATH)/src -I$(GNUARM_PATH)/arm-elf/include
 AM_CFLAGS_FIRMWARE = -DLIBRFID_FIRMWARE -DLIBRFID_STATIC -D__MS_types__
 endif
 
diff --git a/src/rfid_reader_openpcd.c b/src/rfid_reader_openpcd.c
index 49d915f..b885d9f 100644
--- a/src/rfid_reader_openpcd.c
+++ b/src/rfid_reader_openpcd.c
@@ -25,14 +25,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-//#define DEBUG
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
-
 #include <librfid/rfid.h>
 #include <librfid/rfid_reader.h>
 #include <librfid/rfid_asic.h>
@@ -53,7 +50,6 @@ static char rcv_buf[RECVBUF_LEN];
 static struct openpcd_hdr *snd_hdr;
 static struct openpcd_hdr *rcv_hdr;
 
-
 #ifndef LIBRFID_FIRMWARE
 
 #ifdef  __MINGW32__
@@ -532,10 +528,12 @@ const struct rfid_reader rfid_reader_openpcd = {
 	.open = &openpcd_open,
 	.close = &openpcd_close,
 	
+#ifndef LIBRFID_FIRMWARE
         .get_api_version = &openpcd_get_api_version,
 	.get_environment = &openpcd_get_environment,
 	.set_environment = &openpcd_set_environment,
         .reset = &openpcd_reset,
+#endif
 					
 	.transceive = &openpcd_transceive,
 	.l2_supported = (1 << RFID_LAYER2_ISO14443A) |
-- 
cgit v1.2.3