From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Fri, 31 Jul 2015 18:05:30 +0000 (+0200)
Subject: fix: avoid USB Speed Test timeout in case of slow transfer speeds
X-Git-Tag: v2.3.0~28
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/67b7d6fa31f4426f18d223faa06c7b1f3c59fa97?hp=bfb01844fb0ce48e960374c3bc6ecf208b6c6bb0
fix: avoid USB Speed Test timeout in case of slow transfer speeds
fix: don't add CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K commands into command buffer
---
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 99776a98..38afd85d 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -301,39 +301,42 @@ void SendVersion(void)
// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
-void printUSBSpeed(uint32_t SpeedTestBufferSize)
+void printUSBSpeed(void)
{
Dbprintf("USB Speed:");
- Dbprintf(" Sending %d bytes payload...", SpeedTestBufferSize);
+ Dbprintf(" Sending USB packets to client...");
+ #define USB_SPEED_TEST_MIN_TIME 1500 // in milliseconds
uint8_t *test_data = BigBuf_get_addr();
+ uint32_t end_time;
- uint32_t start_time = GetTickCount();
-
+ uint32_t start_time = end_time = GetTickCount();
+ uint32_t bytes_transferred = 0;
+
LED_B_ON();
- for(size_t i=0; i<SpeedTestBufferSize; i += USB_CMD_DATA_SIZE) {
- size_t len = MIN((SpeedTestBufferSize - i), USB_CMD_DATA_SIZE);
- cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,0,len,0,test_data,len);
+ while(end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+ cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+ end_time = GetTickCount();
+ bytes_transferred += USB_CMD_DATA_SIZE;
}
LED_B_OFF();
- uint32_t end_time = GetTickCount();
-
- Dbprintf(" Time elapsed: %dms, USB Transfer Speed PM3 -> Client = %d Bytes/s",
- end_time - start_time,
- 1000* SpeedTestBufferSize / (end_time - start_time));
+ Dbprintf(" Time elapsed: %dms", end_time - start_time);
+ Dbprintf(" Bytes transferred: %d", bytes_transferred);
+ Dbprintf(" USB Transfer Speed PM3 -> Client = %d Bytes/s",
+ 1000 * bytes_transferred / (end_time - start_time));
}
/**
* Prints runtime information about the PM3.
**/
-void SendStatus(uint32_t SpeedTestBufferSize)
+void SendStatus(void)
{
BigBuf_print_status();
Fpga_print_status();
printConfig(); //LF Sampling config
- printUSBSpeed(SpeedTestBufferSize);
+ printUSBSpeed();
Dbprintf("Various");
Dbprintf(" MF_DBGLEVEL......%d", MF_DBGLEVEL);
Dbprintf(" ToSendMax........%d",ToSendMax);
@@ -1242,7 +1245,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
SendVersion();
break;
case CMD_STATUS:
- SendStatus(c->arg[0]);
+ SendStatus();
break;
case CMD_PING:
cmd_send(CMD_ACK,0,0,0,0,0);
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 44f878af..33dc78ae 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -431,12 +431,11 @@ int CmdStatus(const char *Cmd)
{
uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
sample_buf = speed_test_buffer;
- #define USB_SPEED_TEST_SIZE (1000*USB_CMD_DATA_SIZE)
clearCommandBuffer();
- UsbCommand c = {CMD_STATUS, {USB_SPEED_TEST_SIZE}};
+ UsbCommand c = {CMD_STATUS};
SendCommand(&c);
- if (!WaitForResponseTimeout(CMD_ACK,&c,1500)) {
+ if (!WaitForResponseTimeout(CMD_ACK,&c,1900)) {
PrintAndLog("Status command failed. USB Speed Test timed out");
}
return 0;
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 9298360d..deced558 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -97,8 +97,9 @@ void storeCommand(UsbCommand *command)
memcpy(destination, command, sizeof(UsbCommand));
cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap
-
}
+
+
/**
* @brief getCommand gets a command from an internal circular buffer.
* @param response location to write command
@@ -117,9 +118,9 @@ int getCommand(UsbCommand* response)
cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
return 1;
-
}
+
/**
* Waits for a certain response type. This method waits for a maximum of
* ms_timeout milliseconds for a specified response command.
@@ -133,9 +134,9 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
UsbCommand resp;
- if (response == NULL)
+ if (response == NULL) {
response = &resp;
-
+ }
// Wait until the command is received
for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
@@ -144,19 +145,21 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
return true;
}
}
- msleep(10); // XXX ugh
- if (dm_seconds == 200) { // Two seconds elapsed
+ msleep(10); // XXX ugh
+ if (dm_seconds == 200) { // Two seconds elapsed
PrintAndLog("Waiting for a response from the proxmark...");
PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
- }
+ }
}
- return false;
+ return false;
}
+
bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
return WaitForResponseTimeout(cmd,response,-1);
}
+
//-----------------------------------------------------------------------------
// Entry point into our code: called whenever the user types a command and
// then presses Enter, which the full command line that they typed.
@@ -165,6 +168,7 @@ void CommandReceived(char *Cmd) {
CmdsParse(CommandTable, Cmd);
}
+
//-----------------------------------------------------------------------------
// Entry point into our code: called whenever we received a packet over USB
// that we weren't necessarily expecting, for example a debug print.
@@ -188,12 +192,13 @@ void UsbCommandReceived(UsbCommand *UC)
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
+ return;
} break;
default:
+ storeCommand(UC);
break;
}
- storeCommand(UC);
}