CHG: And that should be everything cleaned up with unneed functions and calls.

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 96c70ecbbdebe23d6e77ed8e69025f19647670cf..1fae4f3c691ca9aa79f771b235396c4624e14203 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1678,7 +1678,7 @@ int EmSend4bit(uint8_t resp){
        return res;
 }
 
        return res;
 }
 

-int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
+int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par){

        CodeIso14443aAsTagPar(resp, respLen, par);
        int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
        // do the tracing for the previous reader request and this tag answer:
        CodeIso14443aAsTagPar(resp, respLen, par);
        int res = EmSendCmd14443aRaw(ToSend, ToSendMax);
        // do the tracing for the previous reader request and this tag answer:


@@ -1698,11 +1698,7 @@ int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
 int EmSendCmd(uint8_t *resp, uint16_t respLen){
        uint8_t par[MAX_PARITY_SIZE] = {0x00};
        GetParity(resp, respLen, par);
 int EmSendCmd(uint8_t *resp, uint16_t respLen){
        uint8_t par[MAX_PARITY_SIZE] = {0x00};
        GetParity(resp, respLen, par);

-       return EmSendCmdExPar(resp, respLen, par);
-}
-
-int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par){
-       return EmSendCmdExPar(resp, respLen, par);
+       return EmSendCmdPar(resp, respLen, par);

 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,
 }
 
 bool EmLogTrace(uint8_t *reader_data, uint16_t reader_len, uint32_t reader_StartTime, uint32_t reader_EndTime, uint8_t *reader_Parity,

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 326d8e95c21fe0fa3bf16138abb52ad5958cc463..d57f5a2feb846316c0a2748d2eef6247701671e2 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -98,7 +98,6 @@ extern void iso14a_set_trigger(bool enable);
 
 int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 int EmSend4bit(uint8_t resp);
 
 int EmSendCmd14443aRaw(uint8_t *resp, uint16_t respLen);
 int EmSend4bit(uint8_t resp);

-int EmSendCmdExPar(uint8_t *resp, uint16_t respLen, uint8_t *par);

 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
 extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);
 extern int EmSendCmd(uint8_t *resp, uint16_t respLen);
 extern int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *parity);
 int EmSendCmdPar(uint8_t *resp, uint16_t respLen, uint8_t *par);