Merge pull request #297 from pwpiwi/hardnested

Implement hf mf hardnested

diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index 7dfc5c1265e539e8e8e419bb9ad68da857e6a061..59c07ed89a5c391c5d8157d28df2f49dc9bc25f1 100644 (file)
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -58,7 +58,6 @@ void SetAdcMuxFor(uint32_t whichGpio);
 // Options for the HF reader, correlating against rx from tag
 #define FPGA_HF_READER_RX_XCORR_848_KHZ                                (1<<0)
 #define FPGA_HF_READER_RX_XCORR_SNOOP                          (1<<1)
-#define FPGA_HF_READER_RX_XCORR_QUARTER_FREQ           (1<<2)
 // Options for the HF simulated tag, how to modulate
 #define FPGA_HF_SIMULATOR_NO_MODULATION                                (0<<0)
 #define FPGA_HF_SIMULATOR_MODULATE_BPSK                                (1<<0)

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 56774bd09d635eb258de88d254c54ec1f0823c83..c750ab261eab647a4e41e57c9d77b4fb2a82763a 100644 (file)
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -29,7 +29,7 @@ static void RAMFUNC optimizedSnoop(void)
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
        Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.", samplesToSkip, triggersToSkip);
-       bool trigger_cnt;
+       int trigger_cnt;
        LED_D_ON();
        // Select correct configs
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 9a6ef9f01220a5d52fe441b7e16ae82e70affcb7..e11e5a9ccc6e232fa7374bf2c7f5fb1e2390ec66 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -319,7 +319,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
-                               int8_t r = ABS(b) + ABS(prev);
+                               uint8_t r = ABS(b) + ABS(prev);
 
                                dest[c++] = (uint8_t)r;
 
@@ -356,7 +356,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        maxPos = i;
                }
        }
-       //      DbpString("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
+               // Dbprintf("SOF at %d, correlation %d", maxPos,max/(arraylen(FrameSOF)/skip));
 
        int k = 0; // this will be our return value
 
@@ -385,7 +385,7 @@ static int GetIso15693AnswerFromTag(uint8_t *receivedResponse, int maxLen, int *
                        corr1 *= 4;
        
                        if(corrEOF > corr1 && corrEOF > corr0) {
-       //                      DbpString("EOF at %d", i);
+                               // Dbprintf("EOF at %d", i);
                                break;
                        } else if(corr1 > corr0) {
                                i += arraylen(Logic1)/skip;
@@ -457,7 +457,7 @@ static int GetIso15693AnswerFromSniff(uint8_t *receivedResponse, int maxLen, int
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
-                               int8_t r = ABS(b) + ABS(prev);
+                               uint8_t r = ABS(b) + ABS(prev);
 
                                dest[c++] = (uint8_t)r;
 
@@ -626,7 +626,7 @@ void AcquireRawAdcSamplesIso15693(void)
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
-                               int8_t r = ABS(b) + ABS(prev);
+                               uint8_t r = ABS(b) + ABS(prev);
 
                                dest[c++] = (uint8_t)r;
 
@@ -680,7 +680,7 @@ void RecordRawAdcSamplesIso15693(void)
                        // every other is Q. We just want power, so abs(I) + abs(Q) is
                        // close to what we want.
                        if(getNext) {
-                               int8_t r = ABS(b) + ABS(prev);
+                               uint8_t r = ABS(b) + ABS(prev);
 
                                dest[c++] = (uint8_t)r;
 

diff --git a/driver/proxmark3.inf b/driver/proxmark3.inf
index 601b2d8f1c31d770197c3030d76df0a29c930785..122ebd55b3b51025cac82aadd525cfa59b91b62b 100644 (file)
--- a/driver/proxmark3.inf
+++ b/driver/proxmark3.inf
@@ -3,16 +3,16 @@ Signature="$Windows NT$"
 Class=Ports
 ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
 Provider=%ProviderName%
-DriverVer=10/15/2009,1.0.0.0
+DriverVer=31/05/2017,1.1.0.0
 
 [MANUFACTURER]
 %ProviderName%=DeviceList, NTx86, NTamd64
 
 [DeviceList.NTx86]
-%DeviceName%=DriverInstall,USB\VID_2d2d&PID_504d
+%DeviceName%=DriverInstall,USB\VID_9AC4&PID_4B8F
 
 [DeviceList.NTamd64]
-%DeviceName%=DriverInstall,USB\VID_2d2d&PID_504d
+%DeviceName%=DriverInstall,USB\VID_9AC4&PID_4B8F
 
 [DriverInstall]
 include=mdmcpq.inf

diff --git a/fpga/fpga_hf.bit b/fpga/fpga_hf.bit
index 6e6b9794b7ee55312bd98688d4f406b7e3f92020..864b52394dcb821b24bb42ac9b8d6d01a34832f8 100644 (file)
Binary files a/fpga/fpga_hf.bit and b/fpga/fpga_hf.bit differ

diff --git a/fpga/hi_read_rx_xcorr.v b/fpga/hi_read_rx_xcorr.v
index afaf7cb6fb17ae0a1f5687a9b48601ead3d65c23..80e363275fd6ed6ab6f56c369e1b42827852022b 100644 (file)
--- a/fpga/hi_read_rx_xcorr.v
+++ b/fpga/hi_read_rx_xcorr.v
@@ -28,11 +28,18 @@ assign pwr_oe1 = 1'b0;
 assign pwr_oe3 = 1'b0;
 assign pwr_oe4 = 1'b0;
 
-wire adc_clk = ck_1356megb;
-
-reg fc_div_2;
+// Clock divider
+reg [0:0] fc_divider;
 always @(negedge ck_1356megb)
-    fc_div_2 <= fc_div_2 + 1;
+    fc_divider <= fc_divider + 1;
+wire fc_div2 = fc_divider[0];
+
+reg adc_clk;
+always @(ck_1356megb)
+       if (xcorr_is_848)
+               adc_clk <= ck_1356megb;
+       else
+               adc_clk <= fc_div2;
 
 // When we're a reader, we just need to do the BPSK demod; but when we're an
 // eavesdropper, we also need to pick out the commands sent by the reader,
@@ -77,7 +84,6 @@ reg ssp_frame;
 
 always @(negedge adc_clk)
 begin
-       if (xcorr_is_848 | fc_div_2)
                corr_i_cnt <= corr_i_cnt + 1;
 end            
                
@@ -137,7 +143,7 @@ begin
     begin
         ssp_clk <= 1'b1;
         // Don't shift if we just loaded new data, obviously.
-        if(corr_i_cnt != 7'd0)
+        if(corr_i_cnt != 6'd0)
         begin
             corr_i_out[7:0] <= {corr_i_out[6:0], corr_q_out[7]};
             corr_q_out[7:1] <= corr_q_out[6:0];