CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes...

[proxmark3-svn] / armsrc / legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 42e7649c14f7ba8e144e27ae2ebbedffb0376f0b..2d02b636fc2cea8af8b1b28262dbcc33d7567b72 100644 (file)
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -280,7 +280,6 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        //FIXED time between sending frame and now listening frame. 330us
        uint32_t starttime = GET_TICKS;
        // its about 9+9 ticks delay from end-send to here.
-       //WaitTicks( 495 - 9 - 9 );             
        WaitTicks( 477 );
 
        next_bit_at = GET_TICKS + TAG_BIT_PERIOD;
@@ -487,8 +486,6 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 
 int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
        
-       len &= 0x3FF;
-
        uint16_t i = 0;
        uint8_t isOK = 1;
        legic_card_select_t card;
@@ -508,7 +505,7 @@ int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
        setup_phase_reader(iv);
                
        LED_B_ON();
-       while (i < len) {
+       while (i <= len) {
                int r = legic_read_byte(offset + i, card.cmdsize);
                
                if (r == -1 || BUTTON_PRESS()) {                        
@@ -524,7 +521,7 @@ OUT:
        WDT_HIT();
        switch_off_tag_rwd();
        LEDsoff();
-       cmd_send(CMD_ACK,isOK,len,0,cardmem,len);
+       cmd_send(CMD_ACK, isOK, len, 0, cardmem, len);
     return 0;
 }