From: Martin Holst Swende <martin@swende.se>
Date: Thu, 12 Mar 2015 17:15:08 +0000 (+0100)
Subject: Merge pull request #77 from Proxmark/usb_check
X-Git-Tag: show~4
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/aaa9f05e31b416cfee3e022fd5ed0e69498cc575?hp=04bc1c660b1c74672ed7535b0a79fece45e5e571

Merge pull request #77 from Proxmark/usb_check

Implemented usb_poll() within LF sim.
---

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 468f5830..16c42855 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"
 
 
 /**
@@ -401,7 +402,7 @@ void SimulateTagLowFrequency(int period, int gap, int 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;
             }