use char instead of uint8_t to avoid warnings/casting

[proxmark3-svn] / armsrc / iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 6c219f301cbd8f130ca1ca214cb959b6137e8d32..203c8d3661d06a94b02b25d74f47c5dd4a3e2bd8 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -768,13 +768,10 @@ void RAMFUNC SnoopIso14443a(void)
 
     DbpString("COMMAND FINISHED");
 
 
     DbpString("COMMAND FINISHED");
 

-    Dbprintf("%x %x %x", maxBehindBy, Uart.state, Uart.byteCnt);
-    Dbprintf("%x %x %x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
-

 done:
     AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
 done:
     AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;

-    Dbprintf("%x %x %x", maxBehindBy, Uart.state, Uart.byteCnt);
-    Dbprintf("%x %x %x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);
+    Dbprintf("maxBehindBy=%x, Uart.state=%x, Uart.byteCnt=%x", maxBehindBy, Uart.state, Uart.byteCnt);
+    Dbprintf("Uart.byteCntMax=%x, traceLen=%x, Uart.output[0]=%x", Uart.byteCntMax, traceLen, (int)Uart.output[0]);

     LED_A_OFF();
     LED_B_OFF();
        LED_C_OFF();
     LED_A_OFF();
     LED_B_OFF();
        LED_C_OFF();


@@ -1917,7 +1914,7 @@ void ReaderMifare(uint32_t parameter)
                {
                        if ( (parameter != 0) && (memcmp(nt, nt_noattack, 4) == 0) ) continue;
 
                {
                        if ( (parameter != 0) && (memcmp(nt, nt_noattack, 4) == 0) ) continue;
 

-                       isNULL = (nt_attacked[0] = 0) && (nt_attacked[1] = 0) && (nt_attacked[2] = 0) && (nt_attacked[3] = 0);
+                       isNULL = (nt_attacked[0] == 0) && (nt_attacked[1] == 0) && (nt_attacked[2] == 0) && (nt_attacked[3] == 0);

                        if ( (isNULL != 0 ) && (memcmp(nt, nt_attacked, 4) != 0) ) continue;
 
                        if (nt_diff == 0)
                        if ( (isNULL != 0 ) && (memcmp(nt, nt_attacked, 4) != 0) ) continue;
 
                        if (nt_diff == 0)