summaryrefslogtreecommitdiff
path: root/src/ccid
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2006-10-14 15:04:10 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2006-10-14 15:04:10 +0000
commit9ce76f09417c31a8fc904b67624c0f3b397c21c0 (patch)
tree16ba04843e3797cb6018cc02d670566eb5535694 /src/ccid
parente404cccecd20a2418c2429cd182c18218e54bd28 (diff)
- 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
Diffstat (limited to 'src/ccid')
-rw-r--r--src/ccid/ccid-driver.c6
-rw-r--r--src/ccid/rfid_reader_cm5121_ccid_direct.c6
2 files changed, 12 insertions, 0 deletions
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 */
personal git repositories of Harald Welte. Your mileage may vary