github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "TRACE_BUFFER_SIZE" to reflect actual length of trace buffer to the proxmark client - fixes issue with printing large recorded traces

Browse source
This commit is contained in:
Peter Fillmore 2014-11-15 16:31:48 +11:00
commit 4e20973b8d
5 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cmdhf14a.c
View file

@ -31,7 +31,6 @@ int CmdHF14AList(const char *Cmd)
{
bool ShowWaitCycles = false;
char param = param_getchar(Cmd, 0);
if (param == 'h' || (param != 0 && param != 'f')) {
PrintAndLog("List data in trace buffer.");
PrintAndLog("Usage: hf 14a list [f]");
@ -44,7 +43,8 @@ int CmdHF14AList(const char *Cmd)
ShowWaitCycles = true;
}
uint8_t got[1920];
//uint8_t got[1920];
uint8_t got[TRACE_BUFFER_SIZE]; //changed to retrieve actual trace buffer size in apps.h in armsrc
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
@ -62,7 +62,7 @@ int CmdHF14AList(const char *Cmd)
uint32_t EndOfTransmissionTimestamp = 0;
for (;;) {
if(i >= 1900) {
if(i >= TRACE_BUFFER_SIZE) {
break;
}
@ -86,7 +86,7 @@ int CmdHF14AList(const char *Cmd)
if (len > 100) {
break;
}
if (i + len >= 1900) {
if (i + len >= TRACE_BUFFER_SIZE) {
break;
}

8
client/cmdhf14b.c
View file

@ -145,7 +145,7 @@ demodError:
int CmdHF14BList(const char *Cmd)
{
uint8_t got[960];
uint8_t got[TRACE_BUFFER_SIZE];
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
@ -157,7 +157,8 @@ int CmdHF14BList(const char *Cmd)
int prev = -1;
for(;;) {
if(i >= 900) {
//if(i >= 900) {
if(i >= TRACE_BUFFER_SIZE) {
break;
}
@ -176,7 +177,8 @@ int CmdHF14BList(const char *Cmd)
if(len > 100) {
break;
}
if(i + len >= 900) {
//if(i + len >= 900) {
if(i + len >= TRACE_BUFFER_SIZE) {
break;
}

5
client/cmdhficlass.c
View file

@ -56,7 +56,8 @@ int CmdHFiClassList(const char *Cmd)
return 0;
}
uint8_t got[1920];
//uint8_t got[1920];
uint8_t got[TRACE_BUFFER_SIZE];
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
@ -78,7 +79,7 @@ int CmdHFiClassList(const char *Cmd)
uint32_t EndOfTransmissionTimestamp = 0;
for( i=0; i < 1900;)
for( i=0; i < TRACE_BUFFER_SIZE;)
{
//First 32 bits contain
// isResponse (1 bit)

8
client/cmdlfhitag.c
View file

@ -30,7 +30,7 @@ size_t nbytes(size_t nbits) {
int CmdLFHitagList(const char *Cmd)
{
uint8_t got[3000];
uint8_t got[TRACE_BUFFER_SIZE];
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
@ -42,7 +42,8 @@ int CmdLFHitagList(const char *Cmd)
int prev = -1;
for (;;) {
if(i >= 1900) {
//if(i >= 1900) {
if(i >= TRACE_BUFFER_SIZE) {
break;
}
@ -69,7 +70,8 @@ int CmdLFHitagList(const char *Cmd)
if (len > 100) {
break;
}
if (i + len >= 1900) {
//if (i + len >= 1900) {
if (i + len >= TRACE_BUFFER_SIZE) {
break;
}

4
client/data.h
View file

@ -12,9 +12,9 @@
#define DATA_H__
#include <stdint.h>
//trace buffer size as defined in armsrc/apps.h TRACE_SIZE
#define TRACE_BUFFER_SIZE 3000
#define SAMPLE_BUFFER_SIZE 64
extern uint8_t* sample_buf;
extern size_t sample_buf_len;
#define arraylen(x) (sizeof(x)/sizeof((x)[0]))