diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 21b0c0a42..1d2693347 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -152,7 +152,7 @@ static void tx_bit(bool bit) {
 //-----------------------------------------------------------------------------
 
 static void tx_frame(uint32_t frame, uint8_t len) {
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_FULL_MOD);
 
     // wait for next tx timeslot
     last_frame_end += RWD_FRAME_WAIT;
@@ -180,9 +180,7 @@ static void tx_frame(uint32_t frame, uint8_t len) {
 }
 
 static uint32_t rx_frame(uint8_t len) {
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                      | FPGA_HF_READER_RX_XCORR_848_KHZ
-                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_212_KHZ | FPGA_HF_READER_MODE_RECEIVE_IQ);
 
     // hold sampling until card is expected to respond
     last_frame_end += TAG_FRAME_WAIT;
@@ -210,9 +208,7 @@ static uint32_t rx_frame(uint8_t len) {
 
 static bool rx_ack(void) {
     // change fpga into rx mode
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                      | FPGA_HF_READER_RX_XCORR_848_KHZ
-                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_212_KHZ | FPGA_HF_READER_MODE_RECEIVE_IQ);
 
     // hold sampling until card is expected to respond
     last_frame_end += TAG_FRAME_WAIT;
@@ -279,14 +275,12 @@ static int init_card(uint8_t cardtype, legic_card_select_t *p_card) {
 static void init_reader(bool clear_mem) {
     // configure FPGA
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR
-                      | FPGA_HF_READER_RX_XCORR_848_KHZ
-                      | FPGA_HF_READER_RX_XCORR_QUARTER);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_212_KHZ | FPGA_HF_READER_MODE_RECEIVE_IQ);
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
     LED_A_ON();
 
     // configure SSC with defaults
-    FpgaSetupSsc();
+    FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
 
     // re-claim GPIO_SSC_DOUT as GPIO and enable output
     AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
diff --git a/armsrc/legicrfsim.c b/armsrc/legicrfsim.c
index 35eefc56c..2ca65f54a 100644
--- a/armsrc/legicrfsim.c
+++ b/armsrc/legicrfsim.c
@@ -303,12 +303,11 @@ static int32_t init_card(uint8_t cardtype, legic_card_select_t *p_card) {
 static void init_tag(void) {
     // configure FPGA
     FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR
-                      | FPGA_HF_SIMULATOR_MODULATE_212K);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);
     SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
     // configure SSC with defaults
-    FpgaSetupSsc();
+    FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR);
 
     // first pull output to low to prevent glitches then re-claim GPIO_SSC_DOUT
     LOW(GPIO_SSC_DOUT);