github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: print_result - now prints correct len.

Browse source 
FIX: DOWNLOAD_BUFFER -  now with correct result logic
This commit is contained in:
Chris 2018-08-28 21:15:28 +02:00
commit 42e883f67b
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
armsrc/appmain.c
View file

@ -33,6 +33,10 @@
#include "i2c.h" #include "i2c.h"
#endif #endif
#ifdef WITH_FPC
#include "usart.h"
#endif
//============================================================================= //=============================================================================
// 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
// any purpose (fake tag, as reader, whatever). We go MSB first, since that // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@ -74,24 +78,26 @@ void PrintToSendBuffer(void) {
} }
void print_result(char *name, uint8_t *buf, size_t len) { void print_result(char *name, uint8_t *buf, size_t len) {
uint8_t *p = buf;
if ( len % 16 == 0 ) { uint8_t *p = buf;
for(; p-buf < len; p += 16) uint16_t tmp = len & 0xFFF0;
Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
for(; p-buf < tmp; p += 16) {
Dbprintf("[%s: %02d/%02d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
name, name,
p-buf, p-buf,
len, len,
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15] p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
); );
} }
else { if (len % 16 != 0) {
for(; p-buf < len; p += 8) char s[46] = {0};
Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", char *sp = s;
name, for (; p-buf < len; p++ ) {
p-buf, sprintf(sp, "%02x ", p[0] );
len, sp += 3;
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); }
Dbprintf("[%s: %02d/%02d] %s", name, p-buf, len, s);
} }
} }
@ -101,7 +107,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
void DbpStringEx(char *str, uint32_t cmd) { void DbpStringEx(char *str, uint32_t cmd) {
#if DEBUG #if DEBUG
byte_t len = strlen(str); uint8_t len = strlen(str);
cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (byte_t*)str, len); cmd_send(CMD_DEBUG_PRINT_STRING, len, cmd, 0, (byte_t*)str, len);
#endif #endif
} }
@ -442,6 +448,7 @@ void printStandAloneModes(void) {
//DbpString("Running "); //DbpString("Running ");
//Dbprintf(" Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No"); //Dbprintf(" Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
//Dbprintf(" Is Device attached to FPC| %s", 0 ? "Yes" : "No");
//Dbprintf(" Is USB_reconnect value | %d", GetUSBreconnect() ); //Dbprintf(" Is USB_reconnect value | %d", GetUSBreconnect() );
//Dbprintf(" Is USB_configured value | %d", GetUSBconfigured() ); //Dbprintf(" Is USB_configured value | %d", GetUSBconfigured() );
@ -1106,8 +1113,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) { for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE); len = MIN( (numofbytes - i), USB_CMD_DATA_SIZE);
isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len); isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), mem + startidx + i, len);
if (!isok) if (isok != 0)
Dbprintf("transfer to client failed :: | bytes between %d - %d", i, len); Dbprintf("transfer to client failed :: | bytes between %d - %d (%d)", i, i+len, len);
} }
// Trigger a finish downloading signal with an ACK frame // Trigger a finish downloading signal with an ACK frame
// iceman, when did sending samplingconfig array got attached here?!? // iceman, when did sending samplingconfig array got attached here?!?
@ -1152,8 +1159,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) { for (size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
len = MIN((numofbytes - i), USB_CMD_DATA_SIZE); len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);
isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len); isok = cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, 0, mem + startidx + i, len);
if (!isok) if (isok != 0)
Dbprintf("transfer to client failed :: | bytes between %d - %d", i, len); Dbprintf("transfer to client failed :: | bytes between %d - %d (%d)", i, i+len, len);
} }
// Trigger a finish downloading signal with an ACK frame // Trigger a finish downloading signal with an ACK frame
cmd_send(CMD_ACK, 1, 0, 0, 0, 0); cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
@ -1180,6 +1187,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
for(size_t i = 0; i < len; i += size) { for(size_t i = 0; i < len; i += size) {
len = MIN((len - i), size); len = MIN((len - i), size);
memset(mem, 0, len);
Dbprintf("FlashMem reading | %d | %d | %d", startidx + i, i, len); Dbprintf("FlashMem reading | %d | %d | %d", startidx + i, i, len);
isok = Flash_ReadData(startidx + i, mem, len); isok = Flash_ReadData(startidx + i, mem, len);
@ -1273,8 +1282,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
Dbprintf("reading flash memory failed :: | bytes between %d - %d", i, len); Dbprintf("reading flash memory failed :: | bytes between %d - %d", i, len);
isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len); isok = cmd_send(CMD_DOWNLOADED_FLASHMEM, i, len, 0, mem, len);
if (!isok) if (isok != 0)
Dbprintf("transfer to client failed :: | bytes between %d - %d", i, len); Dbprintf("transfer to client failed :: | bytes between %d - %d (%d)", i, i+len, len);
} }
cmd_send(CMD_ACK, 1, 0, 0, 0, 0); cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
@ -1455,10 +1464,6 @@ void __attribute__((noreturn)) AppMain(void) {
RunMod(); RunMod();
#endif #endif
// when here, we are no longer in standalone mode.
// reseting the variables which keeps track of usb re-attached/configured
//SetUSBreconnect(0);
//SetUSBconfigured(0);
} }
} }
} }