detect usb or no usb for standalone mode [ryan]

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 74448fe508fb395b8fa6443e169342ea67c11574..33df93c47e1708758351da7d55223c3e917e682e 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -13,7 +13,6 @@
 #include "LCD.h"
 #endif
 
 #include "LCD.h"
 #endif
 

-int usbattached = 0;

 
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for


@@ -64,8 +63,8 @@ void ToSendStuffBit(int b)
 void DbpString(char *str)
 {
        /* this holds up stuff unless we're connected to usb */
 void DbpString(char *str)
 {
        /* this holds up stuff unless we're connected to usb */

-//     if (!usbattached)
-//             return;
+       if (!UsbConnected())
+               return;

 
        UsbCommand c;
        c.cmd = CMD_DEBUG_PRINT_STRING;
 
        UsbCommand c;
        c.cmd = CMD_DEBUG_PRINT_STRING;


@@ -80,8 +79,8 @@ void DbpString(char *str)
 void DbpIntegers(int x1, int x2, int x3)
 {
        /* this holds up stuff unless we're connected to usb */
 void DbpIntegers(int x1, int x2, int x3)
 {
        /* this holds up stuff unless we're connected to usb */

-//     if (!usbattached)
-//             return;
+       if (!UsbConnected())
+               return;

 
        UsbCommand c;
        c.cmd = CMD_DEBUG_PRINT_INTEGERS;
 
        UsbCommand c;
        c.cmd = CMD_DEBUG_PRINT_INTEGERS;


@@ -266,7 +265,7 @@ void SamyRun()
 
        for (;;)
        {
 
        for (;;)
        {

-               usbattached = UsbPoll(FALSE);
+               UsbPoll(FALSE);

                WDT_HIT();
 
                // Was our button held down or pressed?
                WDT_HIT();
 
                // Was our button held down or pressed?


@@ -715,7 +714,7 @@ void AppMain(void)
 #endif
 
        for(;;) {
 #endif
 
        for(;;) {

-               usbattached = UsbPoll(FALSE);
+               UsbPoll(FALSE);

                WDT_HIT();
 
                if (BUTTON_HELD(1000) > 0)
                WDT_HIT();
 
                if (BUTTON_HELD(1000) > 0)

diff --git a/common/usb.c b/common/usb.c
index f0b9529175ad664e39d848f71c399a5008355717..50a9fc6936524810b5d254c7eb881f430086abf2 100644 (file)
--- a/common/usb.c
+++ b/common/usb.c
@@ -436,6 +436,14 @@ void UsbStart(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

+BOOL UsbConnected()\r
+{\r
+       if (UDP_GLOBAL_STATE & UDP_GLOBAL_STATE_CONFIGURED)\r
+               return TRUE;\r
+       else\r
+               return FALSE;\r
+}\r
+\r

 BOOL UsbPoll(BOOL blinkLeds)\r
 {\r
        BOOL ret = FALSE;\r
 BOOL UsbPoll(BOOL blinkLeds)\r
 {\r
        BOOL ret = FALSE;\r

diff --git a/include/proxmark3.h b/include/proxmark3.h
index a94435e81af6a5c6e8fe4a52a99654240fca5ee7..2f3b483818830942b513854a8e7e89b730580948 100644 (file)
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -52,6 +52,7 @@ typedef signed short SWORD;
 // USB declarations\r
 \r
 void UsbSendPacket(BYTE *packet, int len);\r
 // USB declarations\r
 \r
 void UsbSendPacket(BYTE *packet, int len);\r

+BOOL UsbConnected();\r

 BOOL UsbPoll(BOOL blinkLeds);\r
 void UsbStart(void);\r
 \r
 BOOL UsbPoll(BOOL blinkLeds);\r
 void UsbStart(void);\r
 \r