Code improved for less memory

[proxmark3-svn] / armsrc / iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index d27fc1c6f70ff533fe94b70e0590aae541a8100f..7ffac62d5cd3f296739c3e07663d0871f6c4081c 100644 (file)
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -51,6 +51,7 @@
 #include "protocols.h"
 #include "optimized_cipher.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
+#include "fpgaloader.h"
 
 static int timeout = 4096;
 
@@ -809,10 +810,7 @@ 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, BigBuf_get_traceLen(), (int)Uart.output[0]);
-    LED_A_OFF();
-    LED_B_OFF();
-    LED_C_OFF();
-    LED_D_OFF();
+    LEDsoff();
 }
 
 void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) {
@@ -1965,7 +1963,10 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
        uint8_t *dataout = BigBuf_malloc(255*8);
        if (dataout == NULL){
                Dbprintf("out of memory");
-               OnError(1);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               LED_D_OFF();
+               cmd_send(CMD_ACK,0,1,0,0,0);
+               LED_A_OFF();
                return;
        }
        memset(dataout,0xFF,255*8);