projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[proxmark3-svn]
/
client
/
cmdmain.c
diff --git
a/client/cmdmain.c
b/client/cmdmain.c
index 8d590e9e6ce76ea0538cca4fa964ede1a0d79596..512aa13cc91d7e6e950de83346e9342900aef9a1 100644
(file)
--- a/
client/cmdmain.c
+++ b/
client/cmdmain.c
@@
-132,7
+132,7
@@
int getCommand(UsbCommand* response)
bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
UsbCommand resp;
bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
UsbCommand resp;
-
+
if (response == NULL)
response = &resp;
if (response == NULL)
response = &resp;
@@
-188,7
+188,6
@@
void UsbCommandReceived(UsbCommand *UC)
} break;
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
} break;
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
- sample_buf_len += UC->arg[1];
memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
} break;
memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
} break;
Impressum
,
Datenschutz