fix changelog conflict

[proxmark3-svn] / client / cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index 23b6ce21b5af5cb1ffb87347b0c6320df8908a78..33dc78aeb523c5731ec297e9432159336d774580 100644 (file)
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -18,6 +18,7 @@
 #include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "cmdhw.h"
 #include "cmdmain.h"
 #include "cmddata.h"

+#include "data.h"

 
 /* low-level hardware control */
 
 
 /* low-level hardware control */
 


@@ -428,11 +429,19 @@ int CmdVersion(const char *Cmd)
 
 int CmdStatus(const char *Cmd)
 {
 
 int CmdStatus(const char *Cmd)
 {

+       uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
+       sample_buf = speed_test_buffer;
+
+       clearCommandBuffer();

        UsbCommand c = {CMD_STATUS};
        SendCommand(&c);
        UsbCommand c = {CMD_STATUS};
        SendCommand(&c);

+       if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
+               PrintAndLog("Status command failed. USB Speed Test timed out");
+       }

        return 0;
 }
 
        return 0;
 }
 

+

 int CmdPing(const char *Cmd)
 {
        clearCommandBuffer();
 int CmdPing(const char *Cmd)
 {
        clearCommandBuffer();