X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/92623113b43d1f36cb72e61b8ce29ac74cf7db71..64d1b4efc932898dc250dbc5d8f7418e3643b27b:/armsrc/iclass.c

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 1a375118..c0edc1e0 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -36,7 +36,7 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "proxmark3.h"
+#include "../include/proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "string.h"
@@ -45,8 +45,10 @@
 // Needed for CRC in emulation mode;
 // same construction as in ISO 14443;
 // different initial value (CRC_ICLASS)
-#include "iso14443crc.h"
-#include "iso15693tools.h"
+#include "../common/iso14443crc.h"
+#include "../common/iso15693tools.h"
+//#include "iso15693tools.h"
+
 
 static int timeout = 4096;
 
@@ -351,7 +353,7 @@ static struct {
 		SUB_SECOND_HALF,
 		SUB_BOTH
 	}		sub;
-    uint8_t *output;
+    uint8_t   *output;
 } Demod;
 
 static RAMFUNC int ManchesterDecoding(int v)
@@ -652,12 +654,12 @@ void RAMFUNC SnoopIClass(void)
     // The DMA buffer, used to stream samples from the FPGA
     uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE);
  
-	// reset traceLen to 0
+    // reset traceLen to 0
     iso14a_set_tracing(TRUE);
     iso14a_clear_trace();
     iso14a_set_trigger(FALSE);
 
-	int lastRxCounter;
+    int lastRxCounter;
     uint8_t *upTo;
     int smpl;
     int maxBehindBy = 0;
@@ -773,7 +775,7 @@ void RAMFUNC SnoopIClass(void)
 		if(ManchesterDecoding(smpl & 0x0F)) {
 			time_stop = (GetCountSspClk()-time_0) << 4;
 
-			rsamples = samples - Demod.samples;
+		    rsamples = samples - Demod.samples;
 		    LED_B_ON();
 
 			if(tracing)	{
@@ -943,7 +945,7 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len)
 		uint8_t b = cmd[i];
 		ToSend[++ToSendMax] = encode4Bits(b & 0xF); //Least significant half
 		ToSend[++ToSendMax] = encode4Bits((b >>4) & 0xF);//Most significant half
-	}
+			}
 
 	// Send EOF
 	ToSend[++ToSendMax] = 0xB8;
@@ -1310,17 +1312,17 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int
    {
      if(*wait < 10) *wait = 10;
      
-     for(c = 0; c < *wait;) {
-       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-         AT91C_BASE_SSC->SSC_THR = 0x00;		// For exact timing!
-         c++;
-       }
-       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-         volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
-         (void)r;
-       }
-       WDT_HIT();
-     }
+  for(c = 0; c < *wait;) {
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
+      AT91C_BASE_SSC->SSC_THR = 0x00;		// For exact timing!
+      c++;
+    }
+    if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+      volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
+      (void)r;
+    }
+    WDT_HIT();
+  }
 
    }
 
@@ -1403,18 +1405,18 @@ void CodeIClassCommand(const uint8_t * cmd, int len)
 
 void ReaderTransmitIClass(uint8_t* frame, int len)
 {
-	int wait = 0;
-	int samples = 0;
+  int wait = 0;
+  int samples = 0;
 
-	// This is tied to other size changes
-	CodeIClassCommand(frame,len);
+  // This is tied to other size changes
+  CodeIClassCommand(frame,len);
 
-	// Select the card
-	TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
-	if(trigger)
-		LED_A_ON();
+  // Select the card
+  TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
+  if(trigger)
+  	LED_A_ON();
 
-	// Store reader command in buffer
+  // Store reader command in buffer
 	if (tracing) {
 		uint8_t par[MAX_PARITY_SIZE];
 		GetParity(frame, len, par);
@@ -1450,7 +1452,7 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples,
 	for(;;) {
 		WDT_HIT();
 
-	        if(BUTTON_PRESS()) return FALSE;
+	    if(BUTTON_PRESS()) return FALSE;
 
 		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
 			AT91C_BASE_SSC->SSC_THR = 0x00;  // To make use of exact timing of next command from reader!!
@@ -1604,20 +1606,20 @@ void ReaderIClass(uint8_t arg0) {
 		if(read_status == 1) datasize = 8;
 		if(read_status == 2) datasize = 16;
 
-		LED_B_ON();
-		//Send back to client, but don't bother if we already sent this
-		if(memcmp(last_csn, card_data, 8) != 0)
+                    LED_B_ON();
+                    //Send back to client, but don't bother if we already sent this
+                    if(memcmp(last_csn, card_data, 8) != 0)
 		{
 
 			if(!get_cc || (get_cc && read_status == 2))
 			{
-				cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
+                        cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
 				if(abort_after_read) {
 					LED_A_OFF();
 					return;
 				}
-				//Save that we already sent this....
-				memcpy(last_csn, card_data, 8);
+                    //Save that we already sent this....
+                        memcpy(last_csn, card_data, 8);
 			}
 			//If 'get_cc' was specified and we didn't get a CC, we'll just keep trying...
 		}
@@ -1672,20 +1674,20 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 		uint8_t read_status = handshakeIclassTag(card_data);
 		if(read_status < 2) continue;
 
-		//for now replay captured auth (as cc not updated)
-		memcpy(check+5,MAC,4);
+				//for now replay captured auth (as cc not updated)
+				memcpy(check+5,MAC,4);
 
 		if(sendCmdGetResponseWithRetries(check, sizeof(check),resp, 4, 5))
 		{
-			Dbprintf("Error: Authentication Fail!");
+				  Dbprintf("Error: Authentication Fail!");
 			continue;
-		}
+				}
 
 		//first get configuration block (block 1)
 		crc = block_crc_LUT[1];
-		read[1]=1;
-		read[2] = crc >> 8;
-		read[3] = crc & 0xff;
+				read[1]=1;
+				read[2] = crc >> 8;
+				read[3] = crc & 0xff;
 
 		if(sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10))
 		{
@@ -1693,12 +1695,12 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			continue;
 		}
 
-		mem=resp[5];
-		memory.k16= (mem & 0x80);
-		memory.book= (mem & 0x20);
-		memory.k2= (mem & 0x8);
-		memory.lockauth= (mem & 0x2);
-		memory.keyaccess= (mem & 0x1);
+					 mem=resp[5];
+					 memory.k16= (mem & 0x80);
+					 memory.book= (mem & 0x20);
+					 memory.k2= (mem & 0x8);
+					 memory.lockauth= (mem & 0x2);
+					 memory.keyaccess= (mem & 0x1);
 
 		cardsize = memory.k16 ? 255 : 32;
 		WDT_HIT();
@@ -1706,20 +1708,20 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 		memset(card_data,0x0,USB_CMD_DATA_SIZE);
 		uint8_t failedRead =0;
 		uint8_t stored_data_length =0;
-		//then loop around remaining blocks
+				//then loop around remaining blocks
 		for(int block=0; block < cardsize; block++){
 
 			read[1]= block;
 			crc = block_crc_LUT[block];
-			read[2] = crc >> 8;
-			read[3] = crc & 0xff;
+				    read[2] = crc >> 8;
+				    read[3] = crc & 0xff;
 
 			if(!sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10))
 			{
-				Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
+				         Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
 						 block, resp[0], resp[1], resp[2],
-						resp[3], resp[4], resp[5],
-						resp[6], resp[7]);
+					  resp[3], resp[4], resp[5],
+					  resp[6], resp[7]);
 
 				//Fill up the buffer
 				memcpy(card_data+stored_data_length,resp,8);
@@ -1783,7 +1785,7 @@ void IClass_iso14443A_write(uint8_t arg0, uint8_t blockNo, uint8_t *data, uint8_
 	uint8_t* resp = (((uint8_t *)BigBuf) + 3560);
 
 	// Reset trace buffer
-    memset(trace, 0x44, RECV_CMD_OFFSET);
+	memset(trace, 0x44, RECV_CMD_OFFSET);
 	traceLen = 0;
 
 	// Setup SSC