X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7bc3c99e7ea67d2d67c4c7a44abcea92fa523231..c417b2185cad17af6639f96bbaf141b62e054d1f:/armsrc/legicrf.c

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 42e7649c..1b068404 100644
--- 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;
@@ -396,8 +395,10 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
 	uint8_t byte, crc, calcCrc = 0;
 	uint32_t cmd = (index << 1) | LEGIC_READ;
 
-	//WaitTicks(366); 
-	WaitTicks(330); 
+	//WaitTicks(330); // (4)
+	WaitTicks(240); // (3)
+	//WaitTicks(230); //(2)
+	//WaitTicks(60); //(1)
 	
 	frame_sendAsReader(cmd, cmd_sz);
 	frame_receiveAsReader(&current_frame, 12);
@@ -412,7 +413,7 @@ int legic_read_byte( uint16_t index, uint8_t cmd_sz) {
 		return -1;
 	}
 
-	legic_prng_forward(4);
+	legic_prng_forward(3);
 	return byte;
 }
 
@@ -487,8 +488,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;
@@ -524,7 +523,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;
 }