Merge pull request #969 from pwpiwi/gcc10_fixes

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index c848e6479bdf11a752d31e37d858e631514a1f65..71ff0321c546208fbda0928bfadaf3184f09c328 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -14,6 +14,7 @@
 
 #include "proxmark3.h"
 #include "apps.h"
 
 #include "proxmark3.h"
 #include "apps.h"

+#include "usb_cdc.h"

 #include "util.h"
 #include "string.h"
 #include "legic_prng.h"
 #include "util.h"
 #include "string.h"
 #include "legic_prng.h"


@@ -379,8 +380,9 @@ void LegicRfReader(int offset, int bytes) {
   // establish shared secret and detect card type
   DbpString("Reading card ...");
   uint8_t card_type = setup_phase(SESSION_IV);
   // establish shared secret and detect card type
   DbpString("Reading card ...");
   uint8_t card_type = setup_phase(SESSION_IV);

+  uint8_t result = 0;

   if(init_card(card_type, &card) != 0) {
   if(init_card(card_type, &card) != 0) {

-    Dbprintf("No or unknown card found, aborting");
+    result = 1;

     goto OUT;
   }
 
     goto OUT;
   }
 


@@ -397,17 +399,14 @@ void LegicRfReader(int offset, int bytes) {
   for(uint16_t i = 0; i < bytes; ++i) {
     int16_t byte = read_byte(offset + i, card.cmdsize);
     if(byte == -1) {
   for(uint16_t i = 0; i < bytes; ++i) {
     int16_t byte = read_byte(offset + i, card.cmdsize);
     if(byte == -1) {

-      Dbprintf("operation failed @ 0x%03.3x", bytes);
+      result = 2;

       goto OUT;
     }
     BigBuf[i] = byte;
   }
 
       goto OUT;
     }
     BigBuf[i] = byte;
   }
 

-  // OK
-  Dbprintf("Card (MIM %i) read, use 'hf legic decode' or", card.cardsize);
-  Dbprintf("'data hexsamples %d' to view results", (bytes+7) & ~7);
-

 OUT:
 OUT:

+  cmd_send(CMD_ACK, result, bytes, 0, &card, sizeof(card));

   FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
   LED_B_OFF();
   LED_C_OFF();
   FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
   LED_B_OFF();
   LED_C_OFF();