CHG: Added the urls to the new Wiki on github inside the flasher.c usuage text.

[proxmark3-svn] / armsrc / pcf7931.c

diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 2312795bef38ad8d5721099a6a9d8c9235aee3b9..4d45a69cfe5e94fc721286f6e06cdaf2ebca5b5e 100644 (file)
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -1,4 +1,8 @@
+#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
@@ -15,8 +19,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
        int GraphTraceLen = BigBuf_max_traceLen();
        if (  GraphTraceLen > 18000 )
                GraphTraceLen = 18000;
-       
-       
+               
        int i, j, lastval, bitidx, half_switch;
        int clock = 64;
        int tolerance = clock / 8;
@@ -148,10 +151,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;
 }
 
@@ -264,7 +269,7 @@ void ReadPCF7931() {
        }
        Dbprintf("-----------------------------------------");
 
-       return ;
+       cmd_send(CMD_ACK,0,0,0,0,0);
 }
 
 
@@ -275,8 +280,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 +299,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 +365,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 +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);
 
@@ -411,39 +412,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 +446,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<<u)) {      //bit à 1
-                       if(AddBitPCF7931(1, tab, l, p)==1)return 1;
+                       if( AddBitPCF7931(1, tab, l, p)==1) return 1;
                } else { //bit à 0
-                       if(AddBitPCF7931(0, tab, l, p)==1)return 1;
+                       if (AddBitPCF7931(0, tab, l, p)==1) return 1;
                }
        }
-
        return 0;
 }
 
@@ -479,23 +466,27 @@ bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
 bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
        uint8_t u = 0;
 
-       for(u=0;tab[u]!=0;u+=3){} //we put the cursor at the last value of the array
+       //we put the cursor at the last value of the array
+       for ( u = 0; tab[u] != 0; u += 3 ) { } 
        
+       if ( b == 1 ) { //add a bit 1
+               if ( u == 0 ) 
+                       tab[u] = 34 * T0_PCF + p;
+               else
+                       tab[u] = 34 * T0_PCF + tab[u-1] + p;
 
-       if(b==1){       //add a bit 1
-               if(u==0) tab[u] = 34*T0_PCF+p;
-               else     tab[u] = 34*T0_PCF+tab[u-1]+p;
-
-               tab[u+1] = 6*T0_PCF+tab[u]+l;
-               tab[u+2] = 88*T0_PCF+tab[u+1]-l-p;
+               tab[u+1] =  6 * T0_PCF + tab[u] + l;
+               tab[u+2] = 88 * T0_PCF + tab[u+1] - l - p;
                return 0;
-       }else{          //add a bit 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;
+               tab[u+1] =  6 * T0_PCF + tab[u] + l;
+               tab[u+2] = 24 * T0_PCF + tab[u+1] - l - p;
                return 0;
        }
 
@@ -511,13 +502,11 @@ bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
  */
 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];
+       for(u = 0; tab[u] != 0; u += 3){} //we put the cursor at the last value of the array
 
-       tab[u+1] = b+tab[u];
-       tab[u+2] = c+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];
 
        return 0;
 }
\ No newline at end of file