From 9ce76f09417c31a8fc904b67624c0f3b397c21c0 Mon Sep 17 00:00:00 2001
From: laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>
Date: Sat, 14 Oct 2006 15:04:10 +0000
Subject: - separate 'STATIC' (non-dyamic-allocation) from 'FIRMWARE' (no host
 drivers) - enhance openpcd in-firmware driver stubs - fix 15693 segfaults
 with cm5121 and openpcd (15693 is not working yet!)

git-svn-id: https://svn.gnumonks.org/trunk/librfid@1904 e0336214-984f-0b4b-a45f-81c69e1f0ede
---
 src/ccid/ccid-driver.c                    | 6 ++++++
 src/ccid/rfid_reader_cm5121_ccid_direct.c | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'src/ccid')

diff --git a/src/ccid/ccid-driver.c b/src/ccid/ccid-driver.c
index edca5ca..e440167 100644
--- a/src/ccid/ccid-driver.c
+++ b/src/ccid/ccid-driver.c
@@ -71,6 +71,10 @@
    level exchange and does fully automatic initialization.
 */
 
+#include <librfid/rfid.h>
+
+#ifndef LIBRFID_FIRMWARE
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -2446,3 +2450,5 @@ main (int argc, char **argv)
  */
 #endif /*TEST*/
 #endif /*HAVE_LIBUSB*/
+
+#endif /* LIBRFID_FIRMWARE */
diff --git a/src/ccid/rfid_reader_cm5121_ccid_direct.c b/src/ccid/rfid_reader_cm5121_ccid_direct.c
index c6b2d15..3327a08 100644
--- a/src/ccid/rfid_reader_cm5121_ccid_direct.c
+++ b/src/ccid/rfid_reader_cm5121_ccid_direct.c
@@ -3,6 +3,10 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include <librfid/rfid.h>
+
+#ifndef LIBRFID_FIRMWARE
+
 #include <librfid/rfid_asic.h>
 
 #include "ccid-driver.h"
@@ -34,3 +38,5 @@ int cm5121_source_init(struct rfid_asic_transport_handle *rath)
         }
 	return 0;
 }
+
+#endif /* LIBRFID_FIRMWARE */
-- 
cgit v1.2.3