mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 23:36:31 +08:00
Syntax suger, making the code easier to read (for me at least)
This commit is contained in:
parent
ab7bb49475
commit
614da335f6
|
@ -351,7 +351,6 @@ void SendStatus(void)
|
|||
#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
|
||||
|
||||
#define OPTS 2
|
||||
|
||||
void StandAloneMode()
|
||||
{
|
||||
DbpString("Stand-alone mode! No PC necessary.");
|
||||
|
@ -365,13 +364,9 @@ void StandAloneMode()
|
|||
LED(LED_GREEN, 200);
|
||||
LED(LED_ORANGE, 200);
|
||||
LED(LED_RED, 200);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef WITH_ISO14443a_StandAlone
|
||||
void StandAloneMode14a()
|
||||
{
|
||||
|
@ -640,8 +635,7 @@ void SamyRun()
|
|||
// Turn on selected LED
|
||||
LED(selected + 1, 0);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;) {
|
||||
usb_poll();
|
||||
WDT_HIT();
|
||||
|
||||
|
@ -672,17 +666,12 @@ void SamyRun()
|
|||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
// Finished recording
|
||||
|
||||
// If we were previously playing, set playing off
|
||||
// so next button push begins playing what we recorded
|
||||
playing = 0;
|
||||
|
||||
cardRead = 1;
|
||||
|
||||
}
|
||||
|
||||
else if (button_pressed > 0 && cardRead == 1)
|
||||
{
|
||||
else if (button_pressed > 0 && cardRead == 1) {
|
||||
LEDsoff();
|
||||
LED(selected + 1, 0);
|
||||
LED(LED_ORANGE, 0);
|
||||
|
@ -707,14 +696,11 @@ void SamyRun()
|
|||
// If we were previously playing, set playing off
|
||||
// so next button push begins playing what we recorded
|
||||
playing = 0;
|
||||
|
||||
cardRead = 0;
|
||||
|
||||
}
|
||||
|
||||
// Change where to record (or begin playing)
|
||||
else if (button_pressed)
|
||||
{
|
||||
else if (button_pressed) {
|
||||
// Next option if we were previously playing
|
||||
if (playing)
|
||||
selected = (selected + 1) % OPTS;
|
||||
|
|
|
@ -386,10 +386,9 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
|
|||
*/
|
||||
|
||||
void SendCmdPCF7931(uint32_t * tab){
|
||||
uint16_t u=0;
|
||||
uint16_t tempo=0;
|
||||
uint16_t u=0, tempo=0;
|
||||
|
||||
Dbprintf("SENDING DATA FRAME...");
|
||||
Dbprintf("Sending data frame...");
|
||||
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||
|
||||
|
@ -415,25 +414,17 @@ void SendCmdPCF7931(uint32_t * tab){
|
|||
tempo = AT91C_BASE_TC0->TC_CV;
|
||||
for( u = 0; tab[u] != 0; u += 3){
|
||||
|
||||
|
||||
// modulate antenna
|
||||
HIGH(GPIO_SSC_DOUT);
|
||||
while(tempo != tab[u]){
|
||||
tempo = AT91C_BASE_TC0->TC_CV;
|
||||
}
|
||||
while(tempo != tab[u]) tempo = AT91C_BASE_TC0->TC_CV;
|
||||
|
||||
// stop modulating antenna
|
||||
LOW(GPIO_SSC_DOUT);
|
||||
while(tempo != tab[u+1]){
|
||||
tempo = AT91C_BASE_TC0->TC_CV;
|
||||
}
|
||||
|
||||
while(tempo != tab[u+1]) tempo = AT91C_BASE_TC0->TC_CV;
|
||||
|
||||
// modulate antenna
|
||||
HIGH(GPIO_SSC_DOUT);
|
||||
while(tempo != tab[u+2]){
|
||||
tempo = AT91C_BASE_TC0->TC_CV;
|
||||
}
|
||||
while(tempo != tab[u+2]) tempo = AT91C_BASE_TC0->TC_CV;
|
||||
}
|
||||
|
||||
LED_A_OFF();
|
||||
|
@ -463,7 +454,6 @@ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
|
|||
if (AddBitPCF7931(0, tab, l, p)==1) return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -490,8 +480,10 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
|
|||
return 0;
|
||||
} else { //add a bit 0
|
||||
|
||||
if(u==0) tab[u] = 98*T0_PCF+p;
|
||||
else tab[u] = 98*T0_PCF+tab[u-1]+p;
|
||||
if ( u == 0 )
|
||||
tab[u] = 98 * T0_PCF + p;
|
||||
else
|
||||
tab[u] = 98 * T0_PCF + tab[u-1] + p;
|
||||
|
||||
tab[u+1] = 6 * T0_PCF + tab[u] + l;
|
||||
tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p;
|
||||
|
@ -512,9 +504,7 @@ bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab){
|
|||
uint32_t u = 0;
|
||||
for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array
|
||||
|
||||
if(u==0) tab[u] = a;
|
||||
else tab[u] = a + tab[u-1];
|
||||
|
||||
tab[u] = (u == 0) ? a : a + tab[u-1];
|
||||
tab[u+1] = b + tab[u];
|
||||
tab[u+2] = c + tab[u+1];
|
||||
|
||||
|
|
Loading…
Reference in a new issue