- disable debug statements

- cleanly initialize pps[2]

git-svn-id: https://svn.gnumonks.org/trunk/librfid@1672 e0336214-984f-0b4b-a45f-81c69e1f0ede

diff --git a/include/librfid/rfid.h b/include/librfid/rfid.h
index 6717ef8..76e86e3 100644 (file)
--- a/include/librfid/rfid.h
+++ b/include/librfid/rfid.h
@@ -11,8 +11,14 @@ enum rfid_frametype {
        RFID_MIFARE_FRAME,
 };
 
+#if 0
 #define DEBUGP(x, args ...) fprintf(stderr, "%s(%d):%s: " x, __FILE__, __LINE__, __FUNCTION__, ## args)
 #define DEBUGPC(x, args ...) fprintf(stderr, x, ## args)
+#else
+#define DEBUGP(x, args ...)
+#define DEBUGPC(x, args ...)
+#endif
+
 extern const char *rfid_hexdump(const void *data, unsigned int len);
 
 #ifndef ARRAY_SIZE

diff --git a/src/rfid_proto_tcl.c b/src/rfid_proto_tcl.c
index 13fba08..901e42c 100644 (file)
--- a/src/rfid_proto_tcl.c
+++ b/src/rfid_proto_tcl.c
@@ -36,17 +36,6 @@
 
 #include "rfid_iso14443_common.h"
 
-#if 0
-#ifdef DEBUGP
-#undef DEBUGP
-#define DEBUGP(x, ...)
-#endif
-#ifdef DEBUGPC
-#undef DEBUGPC
-#define DEBUGPC(x, ...)
-#endif
-#endif
-
 static enum rfid_frametype l2_to_frame(unsigned int layer2)
 {
        switch (layer2) {
@@ -281,6 +270,7 @@ tcl_do_pps(struct rfid_protocol_handle *h)
 
        ppss[0] = 0xd0 | (h->priv.tcl.cid & 0x0f);
        ppss[1] = 0x11;
+       ppss[2] = 0x00;
 
        /* FIXME: deal with different speed for each direction */
        DrI = d_to_di(h, Dr);

diff --git a/src/rfid_reader_cm5121.c b/src/rfid_reader_cm5121.c
index 5ccce98..5bc9d99 100644 (file)
--- a/src/rfid_reader_cm5121.c
+++ b/src/rfid_reader_cm5121.c
@@ -45,14 +45,6 @@
 #define SENDBUF_LEN    100
 #define RECVBUF_LEN    40
 
-#if 0
-#ifdef DEBUGP
-#undef DEBUGP
-#define DEBUGP(x, ...)
-#define DEBUGPC(x, ...)
-#endif
-#endif
-
 static
 int Write1ByteToReg(struct rfid_asic_transport_handle *rath,
                    unsigned char reg, unsigned char value)