X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/12d708fec157dfde6f94d61e5fdc265713a71578..d8c927bcecd62e67da420f73ee9d6620c30bde1f:/armsrc/lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 887e8404..59bbb8a6 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -16,6 +16,7 @@
 #include "string.h"
 #include "lfdemod.h"
 #include "lfsampling.h"
+#include "usb_cdc.h"
 
 
 /**
@@ -399,7 +400,7 @@ void SimulateTagLowFrequency(uint16_t period, uint32_t gap, uint8_t ledcontrol)
     for(;;) {
         //wait until SSC_CLK goes HIGH
         while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
-            if(BUTTON_PRESS()) {
+			if(BUTTON_PRESS() || usb_poll()) {
                 DbpString("Stopped");
                 return;
             }
@@ -1465,7 +1466,7 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
 int DemodPCF7931(uint8_t **outBlocks) {
 
     uint8_t BitStream[256] = {0x00};
-	uint8_t Blocks[8][16] = [0x00};
+	uint8_t Blocks[8][16];
     uint8_t *dest = BigBuf_get_addr();
     int GraphTraceLen = BigBuf_max_traceLen();
     int i, j, lastval, bitidx, half_switch;
@@ -1496,7 +1497,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
     }
     else {
         while(i < GraphTraceLen) {
-            if( !(dest[i] < dest[i-1]) && v[i] < lmin)
+            if( !(dest[i] < dest[i-1]) && dest[i] < lmin)
                 break;
             i++;
         }