X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/10403a6a3005f81839603dcb415ee352f939c06b..d716ca2fc1062c3c7f67cb52b0799df32adf6b0d:/client/cmdhf15.c?ds=sidebyside

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index ec037ce9..b843730f 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -31,9 +31,10 @@
 #include "data.h"
 #include "graph.h"
 #include "ui.h"
+#include "util.h"
 #include "cmdparser.h"
 #include "cmdhf15.h"
-#include "../common/iso15693tools.h"
+#include "iso15693tools.h"
 #include "cmdmain.h"
 
 #define FrameSOF              Iso15693FrameSOF
@@ -44,7 +45,6 @@
 #define Crc(data,datalen)     Iso15693Crc(data,datalen)
 #define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)	Iso15693sprintUID(target,uid)
-#define TRACE_BUFF_SIZE 12000
 
 // structure and database for uid -> tagtype lookups 
 typedef struct { 
@@ -136,6 +136,7 @@ const productName uidmapping[] = {
 	{ 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034? no 'read', just 'readmulti'" },
 	{ 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" },
 	{ 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
+	{ 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233;" },
 	{ 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" },
 	
 	{ 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
@@ -236,7 +237,7 @@ static char* getTagInfo(uint8_t *uid) {
 			if (best==-1) { 
 				best=i;
 			} else {
-				if (uidmapping[i].mask > uidmapping[best].mask) {
+				if (uidmapping[i].mask>uidmapping[best].mask) {
 					best=i;
 				}
 			}					
@@ -352,17 +353,6 @@ int CmdHF15Read(const char *Cmd)
 {
 	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693};
 	SendCommand(&c);
-
-	uint8_t data[TRACE_BUFF_SIZE] = {0x00};
-	
-	GetFromBigBuf(data,TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
-	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
-
-	for (int j = 0; j < TRACE_BUFF_SIZE; j++) {
-		GraphBuffer[j] = ((int)data[j]) ;
-	}
-	GraphTraceLen = TRACE_BUFF_SIZE;
-	RepaintGraphWindow();
 	return 0;
 }
 
@@ -371,17 +361,6 @@ int CmdHF15Record(const char *Cmd)
 {
 	UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693};
 	SendCommand(&c);
-
-	uint8_t data[TRACE_BUFF_SIZE] = {0x00};
-	
-	GetFromBigBuf(data,TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
-	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
-
-	for (int j = 0; j < TRACE_BUFF_SIZE; j++) {
-		GraphBuffer[j] = ((int)data[j]) ;
-	}
-	GraphTraceLen = TRACE_BUFF_SIZE;
-	RepaintGraphWindow();
 	return 0;
 }
 
@@ -679,9 +658,9 @@ int CmdHF15CmdRaw (const char *cmd) {
  */
 int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
 	int temp;
-	uint8_t *req = c->d.asBytes;
+	uint8_t *req=c->d.asBytes;
 	uint8_t uid[8] = {0x00};
-	uint32_t reqlen = 0;
+	uint32_t reqlen=0;
 
 	// strip
 	while (**cmd==' ' || **cmd=='\t') (*cmd)++;