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

create Dbprintf convenience function

Browse source
This commit is contained in:
bushing 2010-01-01 23:36:17 +00:00
parent 4ab6281664
commit a9bc033bdd
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
armsrc/appmain.c
View file

@ -14,6 +14,12 @@
#include "LCD.h" #include "LCD.h"
#endif #endif
#define va_list __builtin_va_list
#define va_start __builtin_va_start
#define va_arg __builtin_va_arg
#define va_end __builtin_va_end
int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);
//============================================================================= //=============================================================================
// 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
@ -94,6 +100,18 @@ void DbpIntegers(int x1, int x2, int x3)
SpinDelay(50); SpinDelay(50);
} }
void Dbprintf(const char *fmt, ...) {
// should probably limit size here; oh well, let's just use a big buffer
char output_string[128];
va_list ap;
va_start(ap, fmt);
kvsprintf(fmt, output_string, 10, ap);
va_end(ap);
DbpString(output_string);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Read an ADC channel and block till it completes, then return the result // Read an ADC channel and block till it completes, then return the result
// in ADC units (0 to 1023). Also a routine to average 32 samples and // in ADC units (0 to 1023). Also a routine to average 32 samples and

2
armsrc/apps.h
View file

@ -21,6 +21,8 @@ void __attribute__((noreturn)) AppMain(void);
void SamyRun(void); void SamyRun(void);
void DbpIntegers(int a, int b, int c); void DbpIntegers(int a, int b, int c);
void DbpString(char *str); void DbpString(char *str);
void Dbprintf(const char *fmt, ...);
void ToSendStuffBit(int b); void ToSendStuffBit(int b);
void ToSendReset(void); void ToSendReset(void);
void ListenReaderField(int limit); void ListenReaderField(int limit);

24
armsrc/lfops.c
View file

@ -39,7 +39,6 @@ void DoAcquisition125k(void)
BYTE *dest = (BYTE *)BigBuf; BYTE *dest = (BYTE *)BigBuf;
int n = sizeof(BigBuf); int n = sizeof(BigBuf);
int i; int i;
char output_string[64];
memset(dest, 0, n); memset(dest, 0, n);
i = 0; i = 0;
@ -55,9 +54,7 @@ void DoAcquisition125k(void)
if (i >= n) break; if (i >= n) break;
} }
} }
sprintf(output_string, "read samples, dest[0]=%x dest[1]=%x", Dbprintf("read samples, dest[0]=%x dest[1]=%x", dest[0], dest[1]);
dest[0], dest[1]);
DbpString(output_string);
} }
void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, BYTE *command) void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, BYTE *command)
@ -251,13 +248,10 @@ void ReadTItag(void)
crc = update_crc16(crc, (shift1>>16)&0xff); crc = update_crc16(crc, (shift1>>16)&0xff);
crc = update_crc16(crc, (shift1>>24)&0xff); crc = update_crc16(crc, (shift1>>24)&0xff);
char output_string[64]; Dbprintf("Info: Tag data_hi=%x, data_lo=%x, crc=%x",
sprintf(output_string, "Info: Tag data_hi=%x, data_lo=%x, crc=%x",
(unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF); (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
DbpString(output_string);
if (crc != (shift2&0xffff)) { if (crc != (shift2&0xffff)) {
sprintf(output_string, "Error: CRC mismatch, expected %x", (unsigned int)crc); Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);
DbpString(output_string);
} else { } else {
DbpString("Info: CRC is good"); DbpString("Info: CRC is good");
} }
@ -380,10 +374,8 @@ void WriteTItag(DWORD idhi, DWORD idlo, WORD crc)
crc = update_crc16(crc, (idhi>>16)&0xff); crc = update_crc16(crc, (idhi>>16)&0xff);
crc = update_crc16(crc, (idhi>>24)&0xff); crc = update_crc16(crc, (idhi>>24)&0xff);
} }
char output_string[64]; Dbprintf("Writing the following data to tag: %x, %x, %x",
sprintf(output_string, "Writing the following data to tag: %x, %x, %x",
(unsigned int) idhi, (unsigned int) idlo, crc); (unsigned int) idhi, (unsigned int) idlo, crc);
DbpString(output_string);
// TI tags charge at 134.2Khz // TI tags charge at 134.2Khz
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz
@ -927,10 +919,8 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
found=1; found=1;
idx+=6; idx+=6;
if (found && (hi|lo)) { if (found && (hi|lo)) {
char output_string[64]; Dbprintf("TAG ID: %x %x %x",
sprintf(output_string, "TAG ID: %x %x %x",
(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
DbpString(output_string);
/* if we're only looking for one tag */ /* if we're only looking for one tag */
if (findone) if (findone)
{ {
@ -962,10 +952,8 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
found=1; found=1;
idx+=6; idx+=6;
if (found && (hi|lo)) { if (found && (hi|lo)) {
char output_string[64]; Dbprintf("TAG ID: %x %x %x",
sprintf(output_string, "TAG ID: %x %x %x",
(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
DbpString(output_string);
/* if we're only looking for one tag */ /* if we're only looking for one tag */
if (findone) if (findone)
{ {