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

Syntax suger, making the code easier to read (for me at least)

Browse source
This commit is contained in:
iceman1001 2016-01-08 14:26:35 +01:00
commit 614da335f6
3 changed files with 51 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

20
armsrc/appmain.c
View file

@ -351,7 +351,6 @@ void SendStatus(void)
#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF) #if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
#define OPTS 2 #define OPTS 2
void StandAloneMode() void StandAloneMode()
{ {
DbpString("Stand-alone mode! No PC necessary."); DbpString("Stand-alone mode! No PC necessary.");
@ -365,13 +364,9 @@ 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
#ifdef WITH_ISO14443a_StandAlone #ifdef WITH_ISO14443a_StandAlone
void StandAloneMode14a() void StandAloneMode14a()
{ {
@ -640,8 +635,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();
@ -672,17 +666,12 @@ void SamyRun()
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
// Finished recording // Finished recording
// If we were previously playing, set playing off // If we were previously playing, set playing off
// so next button push begins playing what we recorded // so next button push begins playing what we recorded
playing = 0; playing = 0;
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);
@ -707,14 +696,11 @@ void SamyRun()
// If we were previously playing, set playing off // If we were previously playing, set playing off
// so next button push begins playing what we recorded // so next button push begins playing what we recorded
playing = 0; playing = 0;
cardRead = 0; cardRead = 0;
} }
// Change where to record (or begin playing) // Change where to record (or begin playing)
else if (button_pressed) 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;

30
armsrc/pcf7931.c
View file

@ -386,10 +386,9 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui
*/ */
void SendCmdPCF7931(uint32_t * tab){ void SendCmdPCF7931(uint32_t * tab){
uint16_t u=0; uint16_t u=0, tempo=0;
uint16_t tempo=0;
Dbprintf("SENDING DATA FRAME..."); Dbprintf("Sending data frame...");
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
@ -415,25 +414,17 @@ void SendCmdPCF7931(uint32_t * tab){
tempo = AT91C_BASE_TC0->TC_CV; tempo = AT91C_BASE_TC0->TC_CV;
for( u = 0; tab[u] != 0; u += 3){ for( u = 0; tab[u] != 0; u += 3){
// modulate antenna // modulate antenna
HIGH(GPIO_SSC_DOUT); HIGH(GPIO_SSC_DOUT);
while(tempo != tab[u]){ while(tempo != tab[u]) tempo = AT91C_BASE_TC0->TC_CV;
tempo = AT91C_BASE_TC0->TC_CV;
}
// stop modulating antenna // stop modulating antenna
LOW(GPIO_SSC_DOUT); LOW(GPIO_SSC_DOUT);
while(tempo != tab[u+1]){ while(tempo != tab[u+1]) tempo = AT91C_BASE_TC0->TC_CV;
tempo = AT91C_BASE_TC0->TC_CV;
}
// modulate antenna // modulate antenna
HIGH(GPIO_SSC_DOUT); HIGH(GPIO_SSC_DOUT);
while(tempo != tab[u+2]){ while(tempo != tab[u+2]) tempo = AT91C_BASE_TC0->TC_CV;
tempo = AT91C_BASE_TC0->TC_CV;
}
} }
LED_A_OFF(); 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; if (AddBitPCF7931(0, tab, l, p)==1) return 1;
} }
} }
return 0; return 0;
} }
@ -490,8 +480,10 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
return 0; return 0;
} else { //add a bit 0 } else { //add a bit 0
if(u==0) tab[u] = 98*T0_PCF+p; if ( u == 0 )
else tab[u] = 98*T0_PCF+tab[u-1]+p; 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+1] = 6 * T0_PCF + tab[u] + l;
tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p; 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; uint32_t u = 0;
for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array 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; tab[u] = (u == 0) ? a : a + tab[u-1];
else tab[u] = a + tab[u-1];
tab[u+1] = b + tab[u]; tab[u+1] = b + tab[u];
tab[u+2] = c + tab[u+1]; tab[u+2] = c + tab[u+1];