From: pwpiwi Date: Fri, 26 May 2017 05:10:30 +0000 (+0200) Subject: fix hf 15 commands (#293) X-Git-Tag: v3.0.0~6 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b535053a778a8581b9f35f5895a57c57871d8815?ds=sidebyside fix hf 15 commands (#293) --- diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h index 7dfc5c12..59c07ed8 100644 --- 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/iso15693.c b/armsrc/iso15693.c index 9a6ef9f0..e11e5a9c 100644 --- 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/fpga/fpga_hf.bit b/fpga/fpga_hf.bit index 6e6b9794..864b5239 100644 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 afaf7cb6..80e36327 100644 --- 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];