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

diff --git a/armsrc/legicrf.c b/armsrc/legicrf.c
index 4aa45b6d..2d02b636 100644
--- a/armsrc/legicrf.c
+++ b/armsrc/legicrf.c
@@ -72,7 +72,7 @@ static void setup_timer(void) {
 #define	RWD_TIME_1 120		// READER_TIME_PAUSE 20us off, 80us on = 100us  80 * 1.5 == 120ticks
 #define RWD_TIME_0 60		// READER_TIME_PAUSE 20us off, 40us on = 60us   40 * 1.5 == 60ticks 
 #define RWD_TIME_PAUSE 30	// 20us == 20 * 1.5 == 30ticks */
-#define TAG_BIT_PERIOD 144	// 100us == 100 * 1.5 == 150ticks
+#define TAG_BIT_PERIOD 142	// 100us == 100 * 1.5 == 150ticks
 #define TAG_FRAME_WAIT 495  // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495
 
 #define RWD_TIME_FUZZ 20   // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit
@@ -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;
@@ -433,11 +432,11 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 	crc_update(&legic_crc, addr, addr_sz);
 	crc_update(&legic_crc, byte, 8);
 	uint32_t crc = crc_finish(&legic_crc);
-
 	uint32_t crc2 = legic4Crc(LEGIC_WRITE, addr, byte, addr_sz+1);
-	if ( crc != crc2 ) 
+	if ( crc != crc2 ) {
 		Dbprintf("crc is missmatch");
-	
+		return 1;
+	}
 	// send write command
 	uint32_t cmd = ((crc     <<(addr_sz+1+8)) //CRC
                    |(byte    <<(addr_sz+1))   //Data
@@ -448,11 +447,10 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 
     legic_prng_forward(2); /* we wait anyways */
 	
-	WaitUS(TAG_FRAME_WAIT);
+	WaitTicks(330);
 	
 	frame_sendAsReader(cmd, cmd_sz);
-  
- 
+   
 	AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
 	AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
 
@@ -488,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;
@@ -509,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()) {			
@@ -525,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;
 }