From 0cfa47e6286854d317dee30e8a45f0a5b166d1c8 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Thu, 8 Nov 2018 20:29:08 +0200
Subject: [PATCH] merged iso14 arm side

---
 armsrc/iso14443a.c | 29 ++++++++++++++++++++---------
 armsrc/iso14443a.h |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index f6be25a50..20225f416 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2212,15 +2212,21 @@ b8 b7 b6 b5 b4 b3 b2 b1
 b5,b6 = 00 - DESELECT
         11 - WTX 
 */    
-int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
+int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res) {
 	uint8_t parity[MAX_PARITY_SIZE] = {0x00};
-	uint8_t real_cmd[cmd_len+4];
+	uint8_t real_cmd[cmd_len + 4];
 	
-	// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
-	real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
-	// put block number into the PCB
-	real_cmd[0] |= iso14_pcb_blocknum;
-	memcpy(real_cmd + 1, cmd, cmd_len);
+	if (cmd_len) {
+		// ISO 14443 APDU frame: PCB [CID] [NAD] APDU CRC PCB=0x02
+		real_cmd[0] = 0x02; // bnr,nad,cid,chn=0; i-block(0x00)	
+		// put block number into the PCB
+		real_cmd[0] |= iso14_pcb_blocknum;
+		memcpy(real_cmd + 1, cmd, cmd_len);
+	} else {
+		// R-block. ACK
+		real_cmd[0] = 0xA2; // r-block + ACK	
+		real_cmd[0] |= iso14_pcb_blocknum;
+	}
 	AddCrc14A(real_cmd, cmd_len + 1);
  
 	ReaderTransmit(real_cmd, cmd_len + 3, NULL);
@@ -2259,6 +2265,10 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 	{
 		iso14_pcb_blocknum ^= 1;
 	}
+		
+		// if we received I-block with chaining we need to send ACK and receive another block of data
+		if (res)
+			*res = data_bytes[0];
 
 		// crc check
 		if (len >=3 && !check_crc(CRC_14443_A, data_bytes, len)) {
@@ -2320,8 +2330,9 @@ void ReaderIso14443a(UsbCommand *c) {
 		iso14a_set_timeout(timeout);
 
 	if ((param & ISO14A_APDU)) {
-		arg0 = iso14_apdu(cmd, len, buf);
-		cmd_send(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
+		uint8_t res;
+		arg0 = iso14_apdu(cmd, len, buf, &res);
+		cmd_send(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
 	}
 
 	if ((param & ISO14A_RAW)) {
diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ff9116d67..ff34fa577 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -114,7 +114,7 @@ extern void ReaderTransmitPar(uint8_t *frame, uint16_t len, uint8_t *par, uint32
 extern int ReaderReceive(uint8_t *receivedAnswer, uint8_t *par);
 
 extern void iso14443a_setup(uint8_t fpga_minor_mode);
-extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
+extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data, uint8_t *res);
 extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
 extern int iso14443a_fast_select_card(uint8_t *uid_ptr, uint8_t num_cascades);
 extern void iso14a_set_trigger(bool enable);