From 5ef16fe01651268d5a05aa6ad0554325248e22ac Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 8 Apr 2020 05:14:19 +0200
Subject: [PATCH] mix

---
 armsrc/epa.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index f535b89a3..3a44502ba 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -263,7 +263,7 @@ static void EPA_PACE_Collect_Nonce_Abort(uint8_t step, int func_return) {
     EPA_Finish();
 
     // send the USB packet
-    reply_old(CMD_ACK, step, func_return, 0, 0, 0);
+    reply_mix(CMD_ACK, step, func_return, 0, 0, 0);
 }
 
 //-----------------------------------------------------------------------------
@@ -280,12 +280,8 @@ void EPA_PACE_Collect_Nonce(PacketCommandNG *c) {
      *   d:
      *       Encrypted nonce
      */
-
-    // return value of a function
-    int func_return = 0;
-
     // set up communication
-    func_return = EPA_Setup();
+    int func_return = EPA_Setup();
     if (func_return != 0) {
         EPA_PACE_Collect_Nonce_Abort(1, func_return);
         return;
@@ -335,7 +331,7 @@ void EPA_PACE_Collect_Nonce(PacketCommandNG *c) {
     EPA_Finish();
 
     // save received information
-    reply_old(CMD_ACK, 0, func_return, 0, nonce, func_return);
+    reply_mix(CMD_ACK, 0, func_return, 0, nonce, func_return);
 }
 
 //-----------------------------------------------------------------------------
@@ -447,7 +443,7 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
     if (c->oldarg[0] != 0) {
         // make sure it's not too big
         if (c->oldarg[2] > apdus_replay[c->oldarg[0] - 1].len) {
-            reply_old(CMD_ACK, 1, 0, 0, NULL, 0);
+            reply_mix(CMD_ACK, 1, 0, 0, NULL, 0);
         }
         memcpy(apdus_replay[c->oldarg[0] - 1].data + c->oldarg[1],
                c->data.asBytes,
@@ -458,7 +454,7 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
         } else {
             apdu_lengths_replay[c->oldarg[0] - 1] += c->oldarg[2];
         }
-        reply_old(CMD_ACK, 0, 0, 0, NULL, 0);
+        reply_mix(CMD_ACK, 0, 0, 0, NULL, 0);
         return;
     }
 
@@ -469,7 +465,7 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
     func_return = EPA_Setup();
     if (func_return != 0) {
         EPA_Finish();
-        reply_old(CMD_ACK, 2, func_return, 0, NULL, 0);
+        reply_mix(CMD_ACK, 2, func_return, 0, NULL, 0);
         return;
     }
 
@@ -492,12 +488,12 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
                     || response_apdu[func_return - 4] != 0x90
                     || response_apdu[func_return - 3] != 0x00)) {
             EPA_Finish();
-            reply_old(CMD_ACK, 3 + i, func_return, 0, timings, 20);
+            reply_mix(CMD_ACK, 3 + i, func_return, 0, timings, 20);
             return;
         }
     }
     EPA_Finish();
-    reply_old(CMD_ACK, 0, 0, 0, timings, 20);
+    reply_mix(CMD_ACK, 0, 0, 0, timings, 20);
     return;
 }
 
@@ -506,14 +502,13 @@ void EPA_PACE_Replay(PacketCommandNG *c) {
 // Returns 0 on success or a non-zero error code on failure
 //-----------------------------------------------------------------------------
 int EPA_Setup() {
-    uint8_t uid[10];
-    iso14a_card_select_t card_a_info;
 
     // first, look for type A cards
     // power up the field
     iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
-    // select the card
-    int return_code = iso14443a_select_card(uid, &card_a_info, NULL, true, 0, false);
+    iso14a_card_select_t card_a_info;
+    int return_code = iso14443a_select_card(NULL, &card_a_info, NULL, true, 0, false);
+
     if (return_code == 1) {
         uint8_t pps_response[3];
         uint8_t pps_response_par[1];
@@ -528,12 +523,14 @@ int EPA_Setup() {
         return 0;
     }
 
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+    
     // if we're here, there is no type A card, so we look for type B
     // power up the field
     iso14443b_setup();
     iso14b_card_select_t card_b_info;
-    // select the card
     return_code = iso14443b_select_card(&card_b_info);
+
     if (return_code == 0) {
         Dbprintf("ISO 14443 Type B");
         iso_type = 'b';