X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/368044201a6a4d0802f708b03becf3e49ada37ab..42c235e7efdac01da7e7ef3e4e442557fe50198d:/armsrc/pcf7931.c?ds=sidebyside diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c index 2312795b..58fd5099 100644 --- a/armsrc/pcf7931.c +++ b/armsrc/pcf7931.c @@ -1,11 +1,12 @@ +#include "proxmark3.h" +#include "apps.h" +#include "lfsampling.h" #include "pcf7931.h" +#include "string.h" #define T0_PCF 8 //period for the pcf7931 in us #define ALLOC 16 -#define abs(x) ( ((x)<0) ? -(x) : (x) ) -#define max(x,y) ( x 18000 ) GraphTraceLen = 18000; - - + int i, j, lastval, bitidx, half_switch; int clock = 64; int tolerance = clock / 8; @@ -25,6 +25,8 @@ int DemodPCF7931(uint8_t **outBlocks) { int num_blocks = 0; int lmin=128, lmax=128; uint8_t dir; + //clear read buffer + BigBuf_Clear_keep_EM(); LFSetupFPGAForADC(95, true); DoAcquisition_default(0, true); @@ -66,7 +68,7 @@ int DemodPCF7931(uint8_t **outBlocks) { // Switch depending on lc length: // Tolerance is 1/8 of clock rate (arbitrary) - if (abs(lc-clock/4) < tolerance) { + if (ABS(lc-clock/4) < tolerance) { // 16T0 if((i - pmc) == lc) { /* 16T0 was previous one */ /* It's a PMC ! */ @@ -78,7 +80,7 @@ int DemodPCF7931(uint8_t **outBlocks) { else { pmc = i; } - } else if (abs(lc-clock/2) < tolerance) { + } else if (ABS(lc-clock/2) < tolerance) { // 32TO if((i - pmc) == lc) { /* 16T0 was previous one */ /* It's a PMC ! */ @@ -93,7 +95,7 @@ int DemodPCF7931(uint8_t **outBlocks) { } else half_switch++; - } else if (abs(lc-clock) < tolerance) { + } else if (ABS(lc-clock) < tolerance) { // 64TO bits[bitidx++] = 1; } else { @@ -148,10 +150,12 @@ int IsBlock0PCF7931(uint8_t *Block) { int IsBlock1PCF7931(uint8_t *Block) { // Assume RFU means 0 :) - if(Block[10] == 0 && Block[11] == 0 && Block[12] == 0 && Block[13] == 0) - if((Block[14] & 0x7f) <= 9 && Block[15] <= 9) + if( Block[10] == 0 && + Block[11] == 0 && + Block[12] == 0 && + Block[13] == 0) + if ( (Block[14] & 0x7f) <= 9 && Block[15] <= 9) return 1; - return 0; } @@ -198,7 +202,7 @@ void ReadPCF7931() { Blocks[0][ALLOC] = 1; memcpy(Blocks[1], tmpBlocks[i+1], 16); Blocks[1][ALLOC] = 1; - max_blocks = max((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1; + max_blocks = MAX((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1; // Debug print Dbprintf("(dbg) Max blocks: %d", max_blocks); num_blocks = 2; @@ -264,7 +268,7 @@ void ReadPCF7931() { } Dbprintf("-----------------------------------------"); - return ; + cmd_send(CMD_ACK,0,0,0,0,0); } @@ -275,8 +279,7 @@ void ReadPCF7931() { */ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data) { - - uint32_t tab[1024]={0}; // data times frame + uint32_t tab[1024] = {0}; // data times frame uint32_t u = 0; uint8_t parity = 0; bool comp = 0; @@ -295,7 +298,6 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui //password indication bit AddBitPCF7931(1, tab, l, p); - //password (on 56 bits) Dbprintf("Password (LSB first on each byte) : %02x %02x %02x %02x %02x %02x %02x", pass1,pass2,pass3,pass4,pass5,pass6,pass7); AddBytePCF7931(pass1, tab, l, p); @@ -362,8 +364,7 @@ void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, ui tab[u]=(tab[u] * 3)/2; } - - //compennsation of the counter reload + //compensation of the counter reload while (!comp){ comp = 1; for(u=0;tab[u]!=0;u++){ @@ -384,10 +385,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); @@ -402,7 +402,7 @@ void SendCmdPCF7931(uint32_t * tab){ AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT; //initialization of the timer - AT91C_BASE_PMC->PMC_PCER |= (0x1 << 12) | (0x1 << 13) | (0x1 << 14); + AT91C_BASE_PMC->PMC_PCER |= (0x1 << AT91C_ID_TC0); AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE; AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK; //clock at 48/32 MHz @@ -411,39 +411,26 @@ void SendCmdPCF7931(uint32_t * tab){ tempo = AT91C_BASE_TC0->TC_CV; - for(u=0;tab[u]!= 0;u+=3){ - + 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(); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); SpinDelay(200); - AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable - DbpString("FINISH !"); - DbpString("(Could be usefull to send the same trame many times)"); LED(0xFFFF, 1000); } @@ -458,15 +445,14 @@ void SendCmdPCF7931(uint32_t * tab){ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){ uint32_t u; - for (u=0; u<8; u++) + for ( u=0; u<8; u++) { if (byte&(1<