github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 10:37:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged hi_reader and hi_reader_15 into one file

Browse source 
hi_reader_15  was a superset of hi_reader, now uses conditional compile from Makefile like the other files to select compilations options
This commit is contained in:
Alex 2023-08-24 17:52:12 +02:00
commit c41c685807
4 changed files with 139 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fpga/fpga_pm3_top.v
View file

@ -73,11 +73,7 @@ multiple outputs connected together therefore leading to a failed compilation
//`ifdef WITH_LF2 `include "lo_passthru.v" `endif
//`ifdef WITH_LF3 `include "lo_adc.v" `endif
//
//`ifdef WITH_HF_15
//`ifdef WITH_HF0 `include "hi_reader_15.v" `endif
//`else
//`ifdef WITH_HF0 `include "hi_reader.v" `endif
//`endif
//`ifdef WITH_HF1 `include "hi_simulate.v" `endif
//`ifdef WITH_HF2 `include "hi_iso14443a.v" `endif
//`ifdef WITH_HF3 `include "hi_sniffer.v" `endif
@ -277,11 +273,7 @@ assign mux6_pwr_lo = 1'b1;
// HF reader
`ifdef WITH_HF0
`ifdef WITH_HF_15
hi_reader_15 hr(
`else
hi_reader hr(
`endif
.ck_1356meg (ck_1356megb),
.adc_d (adc_d),
.subcarrier_frequency (conf_word[5:4]),