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

appmain.c cleanup

Browse source 
* reformatting
* whitespace fixes
* replace byte_t by uint8_t
This commit is contained in:
pwpiwi 2020-01-10 08:21:07 +01:00
parent a749b1e58b
commit 1d04b933df
1 changed files with 198 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

184
armsrc/appmain.c
View file

@ -59,14 +59,12 @@ int ToSendMax;
static int ToSendBit; static int ToSendBit;
struct common_area common_area __attribute__((section(".commonarea"))); struct common_area common_area __attribute__((section(".commonarea")));
void ToSendReset(void) void ToSendReset(void) {
{
ToSendMax = -1; ToSendMax = -1;
ToSendBit = 8; ToSendBit = 8;
} }
void ToSendStuffBit(int b) void ToSendStuffBit(int b) {
{
if (ToSendBit >= 8) { if (ToSendBit >= 8) {
ToSendMax++; ToSendMax++;
ToSend[ToSendMax] = 0; ToSend[ToSendMax] = 0;
@ -89,19 +87,11 @@ void ToSendStuffBit(int b)
// Debug print functions, to go out over USB, to the usual PC-side client. // Debug print functions, to go out over USB, to the usual PC-side client.
//============================================================================= //=============================================================================
void DbpString(char *str) void DbpString(char *str) {
{ uint8_t len = strlen(str);
byte_t len = strlen(str); cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(uint8_t*)str,len);
cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
} }
#if 0
void DbpIntegers(int x1, int x2, int x3)
{
cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
}
#endif
void Dbprintf(const char *fmt, ...) { void Dbprintf(const char *fmt, ...) {
// should probably limit size here; oh well, let's just use a big buffer // should probably limit size here; oh well, let's just use a big buffer
char output_string[128]; char output_string[128];
@ -146,8 +136,7 @@ void Dbhexdump(int len, uint8_t *d, bool bAsci) {
// 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
// return that. // return that.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static int ReadAdc(int ch) static int ReadAdc(int ch) {
{
// Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value. // Note: ADC_MODE_PRESCALE and ADC_MODE_SAMPLE_HOLD_TIME are set to the maximum allowed value.
// AMPL_HI is a high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant // AMPL_HI is a high impedance (10MOhm || 1MOhm) output, the input capacitance of the ADC is 12pF (typical). This results in a time constant
// of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged. // of RC = (0.91MOhm) * 12pF = 10.9us. Even after the maximum configurable sample&hold time of 40us the input capacitor will not be fully charged.
@ -171,8 +160,7 @@ static int ReadAdc(int ch)
return AT91C_BASE_ADC->ADC_CDR[ch] & 0x3ff; return AT91C_BASE_ADC->ADC_CDR[ch] & 0x3ff;
} }
int AvgAdc(int ch) // was static - merlok int AvgAdc(int ch) { // was static - merlok{
{
int i; int i;
int a = 0; int a = 0;
@ -183,8 +171,7 @@ int AvgAdc(int ch) // was static - merlok
return (a + 15) >> 5; return (a + 15) >> 5;
} }
static int AvgAdc_Voltage_HF(void) static int AvgAdc_Voltage_HF(void) {
{
int AvgAdc_Voltage_Low, AvgAdc_Voltage_High; int AvgAdc_Voltage_Low, AvgAdc_Voltage_High;
AvgAdc_Voltage_Low= (MAX_ADC_HF_VOLTAGE_LOW * AvgAdc(ADC_CHAN_HF_LOW)) >> 10; AvgAdc_Voltage_Low= (MAX_ADC_HF_VOLTAGE_LOW * AvgAdc(ADC_CHAN_HF_LOW)) >> 10;
@ -198,13 +185,11 @@ static int AvgAdc_Voltage_HF(void)
return AvgAdc_Voltage_Low; return AvgAdc_Voltage_Low;
} }
static int AvgAdc_Voltage_LF(void) static int AvgAdc_Voltage_LF(void) {
{
return (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10; return (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10;
} }
void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv, uint8_t LF_Results[]) void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv, uint8_t LF_Results[]) {
{
int i, adcval = 0, peak = 0; int i, adcval = 0, peak = 0;
/* /*
@ -242,8 +227,7 @@ void MeasureAntennaTuningLfOnly(int *vLf125, int *vLf134, int *peakf, int *peakv
return; return;
} }
void MeasureAntennaTuningHfOnly(int *vHf) void MeasureAntennaTuningHfOnly(int *vHf) {
{
// Let the FPGA drive the high-frequency antenna around 13.56 MHz. // Let the FPGA drive the high-frequency antenna around 13.56 MHz.
LED_A_ON(); LED_A_ON();
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@ -254,8 +238,7 @@ void MeasureAntennaTuningHfOnly(int *vHf)
return; return;
} }
void MeasureAntennaTuning(int mode) void MeasureAntennaTuning(int mode) {
{
uint8_t LF_Results[256] = {0}; uint8_t LF_Results[256] = {0};
int peakv = 0, peakf = 0; int peakv = 0, peakf = 0;
int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV
@ -281,8 +264,7 @@ void MeasureAntennaTuning(int mode)
return; return;
} }
void MeasureAntennaTuningHf(void) void MeasureAntennaTuningHf(void) {
{
int vHf = 0; // in mV int vHf = 0; // in mV
DbpString("Measuring HF antenna, press button to exit"); DbpString("Measuring HF antenna, press button to exit");
@ -305,8 +287,7 @@ void MeasureAntennaTuningHf(void)
} }
void ReadMem(int addr) void ReadMem(int addr) {
{
const uint8_t *data = ((uint8_t *)addr); const uint8_t *data = ((uint8_t *)addr);
Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x", Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
@ -319,8 +300,7 @@ extern struct version_information version_information;
extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__; extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
void set_hw_capabilities(void) void set_hw_capabilities(void) {
{
if (I2C_is_available()) { if (I2C_is_available()) {
hw_capabilities |= HAS_SMARTCARD_SLOT; hw_capabilities |= HAS_SMARTCARD_SLOT;
} }
@ -331,8 +311,7 @@ void set_hw_capabilities(void)
} }
void SendVersion(void) void SendVersion(void) {
{
set_hw_capabilities(); set_hw_capabilities();
char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */ char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
@ -373,8 +352,7 @@ void SendVersion(void)
// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time. // 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. // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
void printUSBSpeed(void) void printUSBSpeed(void) {
{
Dbprintf("USB Speed:"); Dbprintf("USB Speed:");
Dbprintf(" Sending USB packets to client..."); Dbprintf(" Sending USB packets to client...");
@ -403,8 +381,7 @@ void printUSBSpeed(void)
/** /**
* Prints runtime information about the PM3. * Prints runtime information about the PM3.
**/ **/
void SendStatus(void) void SendStatus(void) {
{
BigBuf_print_status(); BigBuf_print_status();
Fpga_print_status(); Fpga_print_status();
#ifdef WITH_SMARTCARD #ifdef WITH_SMARTCARD
@ -424,8 +401,7 @@ void SendStatus(void)
#define OPTS 2 #define OPTS 2
void StandAloneMode() void StandAloneMode() {
{
DbpString("Stand-alone mode! No PC necessary."); DbpString("Stand-alone mode! No PC necessary.");
// Oooh pretty -- notify user we're in elite samy mode now // Oooh pretty -- notify user we're in elite samy mode now
LED(LED_RED, 200); LED(LED_RED, 200);
@ -437,7 +413,6 @@ void StandAloneMode()
LED(LED_GREEN, 200); LED(LED_GREEN, 200);
LED(LED_ORANGE, 200); LED(LED_ORANGE, 200);
LED(LED_RED, 200); LED(LED_RED, 200);
} }
#endif #endif
@ -445,8 +420,7 @@ void StandAloneMode()
#ifdef WITH_ISO14443a_StandAlone #ifdef WITH_ISO14443a_StandAlone
void StandAloneMode14a() void StandAloneMode14a() {
{
StandAloneMode(); StandAloneMode();
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@ -462,14 +436,12 @@ void StandAloneMode14a()
LED(selected + 1, 0); LED(selected + 1, 0);
for (;;) for (;;) {
{
usb_poll(); usb_poll();
WDT_HIT(); WDT_HIT();
SpinDelay(300); SpinDelay(300);
if (GotoRecord || !cardRead[selected]) if (GotoRecord || !cardRead[selected]) {
{
GotoRecord = false; GotoRecord = false;
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -484,28 +456,24 @@ void StandAloneMode14a()
uint32_t cuid; uint32_t cuid;
iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD); iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
for ( ; ; ) for ( ; ; ) {
{
WDT_HIT(); WDT_HIT();
if (BUTTON_PRESS()) { if (BUTTON_PRESS()) {
if (cardRead[selected]) { if (cardRead[selected]) {
Dbprintf("Button press detected -- replaying card in bank[%d]", selected); Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
break; break;
} } else if (cardRead[(selected+1)%OPTS]) {
else if (cardRead[(selected+1)%OPTS]) {
Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS); Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
selected = (selected+1)%OPTS; selected = (selected+1)%OPTS;
break; break;
} } else {
else {
Dbprintf("Button press detected but no stored tag to play. (Ignoring button)"); Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
SpinDelay(300); SpinDelay(300);
} }
} }
if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0, true)) if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid, true, 0, true))
continue; continue;
else else {
{
Dbprintf("Read UID:"); Dbhexdump(10,uid,0); Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
memcpy(readUID,uid,10*sizeof(uint8_t)); memcpy(readUID,uid,10*sizeof(uint8_t));
uint8_t *dst = (uint8_t *)&uid_tmp1; uint8_t *dst = (uint8_t *)&uid_tmp1;
@ -517,14 +485,12 @@ void StandAloneMode14a()
dst[i] = uid[7-i]; dst[i] = uid[7-i];
if (uid_1st[(selected+1) % OPTS] == uid_tmp1 && uid_2nd[(selected+1) % OPTS] == uid_tmp2) { if (uid_1st[(selected+1) % OPTS] == uid_tmp1 && uid_2nd[(selected+1) % OPTS] == uid_tmp2) {
Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping."); Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
} } else {
else {
if (uid_tmp2) { if (uid_tmp2) {
Dbprintf("Bank[%d] received a 7-byte UID", selected); Dbprintf("Bank[%d] received a 7-byte UID", selected);
uid_1st[selected] = (uid_tmp1)>>8; uid_1st[selected] = (uid_tmp1)>>8;
uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8); uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8);
} } else {
else {
Dbprintf("Bank[%d] received a 4-byte UID", selected); Dbprintf("Bank[%d] received a 4-byte UID", selected);
uid_1st[selected] = uid_tmp1; uid_1st[selected] = uid_tmp1;
uid_2nd[selected] = uid_tmp2; uid_2nd[selected] = uid_tmp2;
@ -548,10 +514,7 @@ void StandAloneMode14a()
playing = true; playing = true;
cardRead[selected] = true; cardRead[selected] = true;
} } else if (GotoClone) { /* MF Classic UID clone */
/* MF Classic UID clone */
else if (GotoClone)
{
GotoClone=false; GotoClone=false;
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -562,8 +525,7 @@ void StandAloneMode14a()
Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]); Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
// wait for button to be released // wait for button to be released
while(BUTTON_PRESS()) while(BUTTON_PRESS()) {
{
// Delay cloning until card is in place // Delay cloning until card is in place
WDT_HIT(); WDT_HIT();
} }
@ -604,8 +566,7 @@ void StandAloneMode14a()
if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1] && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) { if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1] && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected); Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
playing = true; playing = true;
} } else {
else {
Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]); Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
memcpy(newBlock0, oldBlock0, 16); memcpy(newBlock0, oldBlock0, 16);
// Copy uid_1st for bank (2nd is for longer UIDs not supported if classic) // Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
@ -618,15 +579,13 @@ void StandAloneMode14a()
// arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain // arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
MifareCSetBlock(0, 0xFF, 0, newBlock0); MifareCSetBlock(0, 0xFF, 0, newBlock0);
MifareCGetBlock(0x3F, 1, 0, testBlock0); MifareCGetBlock(0x3F, 1, 0, testBlock0);
if (memcmp(testBlock0,newBlock0,16)==0) if (memcmp(testBlock0, newBlock0, 16) == 0) {
{
DbpString("Cloned successfull!"); DbpString("Cloned successfull!");
cardRead[selected] = false; // Only if the card was cloned successfully should we clear it cardRead[selected] = false; // Only if the card was cloned successfully should we clear it
playing = false; playing = false;
GotoRecord = true; GotoRecord = true;
selected = (selected+1) % OPTS; selected = (selected+1) % OPTS;
} } else {
else {
Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected); Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
playing = true; playing = true;
} }
@ -634,10 +593,9 @@ void StandAloneMode14a()
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
} } else if (playing) {
// button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
// Change where to record (or begin playing) // Change where to record (or begin playing)
else if (playing) // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
{
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -653,27 +611,22 @@ void StandAloneMode14a()
if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) { if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) {
DbpString("Mifare Classic"); DbpString("Mifare Classic");
SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data); // Mifare Classic SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data); // Mifare Classic
} } else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
DbpString("Mifare Ultralight"); DbpString("Mifare Ultralight");
SimulateIso14443aTag(2, uid_1st[selected], uid_2nd[selected], data); // Mifare Ultralight SimulateIso14443aTag(2, uid_1st[selected], uid_2nd[selected], data); // Mifare Ultralight
} } else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
DbpString("Mifare DESFire"); DbpString("Mifare DESFire");
SimulateIso14443aTag(3, uid_1st[selected], uid_2nd[selected], data); // Mifare DESFire SimulateIso14443aTag(3, uid_1st[selected], uid_2nd[selected], data); // Mifare DESFire
} } else {
else {
Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation"); Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data); SimulateIso14443aTag(1, uid_1st[selected], uid_2nd[selected], data);
} }
} } else if (button_action == BUTTON_SINGLE_CLICK) {
else if (button_action == BUTTON_SINGLE_CLICK) {
selected = (selected + 1) % OPTS; selected = (selected + 1) % OPTS;
Dbprintf("Done playing. Switching to record mode on bank %d",selected); Dbprintf("Done playing. Switching to record mode on bank %d",selected);
GotoRecord = true; GotoRecord = true;
break; break;
} } else if (button_action == BUTTON_HOLD) {
else if (button_action == BUTTON_HOLD) {
Dbprintf("Playtime over. Begin cloning..."); Dbprintf("Playtime over. Begin cloning...");
GotoClone = true; GotoClone = true;
break; break;
@ -688,10 +641,11 @@ void StandAloneMode14a()
} }
} }
} }
#elif WITH_LF_StandAlone #elif WITH_LF_StandAlone
// samy's sniff and repeat routine // samy's sniff and repeat routine
void SamyRun() void SamyRun() {
{
StandAloneMode(); StandAloneMode();
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@ -703,8 +657,7 @@ void SamyRun()
// Turn on selected LED // Turn on selected LED
LED(selected + 1, 0); LED(selected + 1, 0);
for (;;) for (;;) {
{
usb_poll(); usb_poll();
WDT_HIT(); WDT_HIT();
@ -713,8 +666,7 @@ void SamyRun()
SpinDelay(300); SpinDelay(300);
// Button was held for a second, begin recording // Button was held for a second, begin recording
if (button_pressed > 0 && cardRead == 0) if (button_pressed > 0 && cardRead == 0) {
{
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
LED(LED_RED2, 0); LED(LED_RED2, 0);
@ -745,10 +697,7 @@ void SamyRun()
cardRead = 1; cardRead = 1;
} } else if (button_pressed > 0 && cardRead == 1) {
else if (button_pressed > 0 && cardRead == 1)
{
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
LED(LED_ORANGE, 0); LED(LED_ORANGE, 0);
@ -782,11 +731,9 @@ void SamyRun()
cardRead = 0; cardRead = 0;
} } else if (button_pressed) {
// Change where to record (or begin playing) // Change where to record (or begin playing)
else if (button_pressed)
{
// Next option if we were previously playing // Next option if we were previously playing
if (playing) if (playing)
selected = (selected + 1) % OPTS; selected = (selected + 1) % OPTS;
@ -796,8 +743,7 @@ void SamyRun()
LED(selected + 1, 0); LED(selected + 1, 0);
// Begin transmitting // Begin transmitting
if (playing) if (playing) {
{
LED(LED_GREEN, 0); LED(LED_GREEN, 0);
DbpString("Playing"); DbpString("Playing");
// wait for button to be released // wait for button to be released
@ -810,8 +756,7 @@ void SamyRun()
CmdHIDsimTAG(tops[selected], high[selected], low[selected], 0); CmdHIDsimTAG(tops[selected], high[selected], low[selected], 0);
DbpString("Done playing"); DbpString("Done playing");
if (BUTTON_HELD(1000) > 0) if (BUTTON_HELD(1000) > 0) {
{
DbpString("Exiting"); DbpString("Exiting");
LEDsoff(); LEDsoff();
return; return;
@ -825,8 +770,7 @@ void SamyRun()
playing = !playing; playing = !playing;
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
} } else
else
while(BUTTON_PRESS()) while(BUTTON_PRESS())
WDT_HIT(); WDT_HIT();
} }
@ -834,6 +778,7 @@ void SamyRun()
} }
#endif #endif
/* /*
OBJECTIVE OBJECTIVE
Listen and detect an external reader. Determine the best location Listen and detect an external reader. Determine the best location
@ -869,10 +814,10 @@ static const char LIGHT_SCHEME[] = {
0xE, /* -XXX | 86% of maximum current detected */ 0xE, /* -XXX | 86% of maximum current detected */
0xF, /* XXXX | 100% of maximum current detected */ 0xF, /* XXXX | 100% of maximum current detected */
}; };
static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]); static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
void ListenReaderField(int limit) void ListenReaderField(int limit) {
{
int lf_av, lf_av_new=0, lf_baseline= 0, lf_max; int lf_av, lf_av_new=0, lf_baseline= 0, lf_max;
int hf_av, hf_av_new=0, hf_baseline= 0, hf_max; int hf_av, hf_av_new=0, hf_baseline= 0, hf_max;
int mode=1, display_val, display_max, i; int mode=1, display_val, display_max, i;
@ -919,7 +864,8 @@ void ListenReaderField(int limit)
return; return;
break; break;
} }
while (BUTTON_PRESS()); while (BUTTON_PRESS())
/* wait */;
} }
WDT_HIT(); WDT_HIT();
@ -977,7 +923,7 @@ void ListenReaderField(int limit)
} }
} }
for (i = 0; i < LIGHT_LEN; i++) { for (i = 0; i < LIGHT_LEN; i++) {
if (display_val >= ((display_max/LIGHT_LEN)*i) && display_val <= ((display_max/LIGHT_LEN)*(i+1))) { if (display_val >= (display_max / LIGHT_LEN * i) && display_val <= (display_max / LIGHT_LEN * (i+1))) {
if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF(); if (LIGHT_SCHEME[i] & 0x1) LED_C_ON(); else LED_C_OFF();
if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF(); if (LIGHT_SCHEME[i] & 0x2) LED_A_ON(); else LED_A_OFF();
if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF(); if (LIGHT_SCHEME[i] & 0x4) LED_B_ON(); else LED_B_OFF();
@ -989,8 +935,9 @@ void ListenReaderField(int limit)
} }
} }
void UsbPacketReceived(uint8_t *packet, int len)
{ void UsbPacketReceived(uint8_t *packet, int len) {
UsbCommand *c = (UsbCommand *)packet; UsbCommand *c = (UsbCommand *)packet;
// Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]); // Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
@ -1109,16 +1056,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
SnoopHitag(c->arg[0]); SnoopHitag(c->arg[0]);
break; break;
case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content case CMD_SIMULATE_HITAG: // Simulate Hitag tag, args = memory content
SimulateHitagTag((bool)c->arg[0],(byte_t*)c->d.asBytes); SimulateHitagTag((bool)c->arg[0], (uint8_t*)c->d.asBytes);
break; break;
case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes); ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
break; break;
case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes); SimulateHitagSTag((bool)c->arg[0],(uint8_t*)c->d.asBytes);
break; break;
case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
check_challenges_cmd((bool)c->arg[0], (byte_t*)c->d.asBytes, (uint8_t)c->arg[1]); check_challenges_cmd((bool)c->arg[0], (uint8_t*)c->d.asBytes, (uint8_t)c->arg[1]);
break; break;
case CMD_READ_HITAG_S://Reader for only Hitag S tags, args = key or challenge case CMD_READ_HITAG_S://Reader for only Hitag S tags, args = key or challenge
ReadHitagSCmd((hitag_function)c->arg[0], (hitag_data*)c->d.asBytes, (uint8_t)c->arg[1], (uint8_t)c->arg[2], false); ReadHitagSCmd((hitag_function)c->arg[0], (hitag_data*)c->d.asBytes, (uint8_t)c->arg[1], (uint8_t)c->arg[2], false);
@ -1490,8 +1437,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
} }
} }
void __attribute__((noreturn)) AppMain(void)
{ void __attribute__((noreturn)) AppMain(void) {
SpinDelay(100); SpinDelay(100);
clear_trace(); clear_trace();
if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) { if(common_area.magic != COMMON_AREA_MAGIC || common_area.version != 1) {
@ -1531,7 +1479,7 @@ void __attribute__((noreturn)) AppMain(void)
LCDInit(); LCDInit();
#endif #endif
byte_t rx[sizeof(UsbCommand)]; uint8_t rx[sizeof(UsbCommand)];
size_t rx_len; size_t rx_len;
for(;;) { for(;;) {