X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/55acbb2a3903f7940d0db5fae2e8f4fdab51d1b8..4df3eb3f739af80b6fdc8f737fc906d254ebd0b5:/armsrc/mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 31e0287d..f95ca3df 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -31,16 +31,17 @@ int MfSniffInit(void){
 }
 
 int MfSniffEnd(void){
-	UsbCommand ack = {CMD_ACK, {0, 0, 0}};
+//	UsbCommand ack = {CMD_ACK, {0, 0, 0}};
 
 	LED_B_ON();
-	UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+  cmd_send(CMD_ACK,0,0,0,0,0);
+//	UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
 	LED_B_OFF();
 
 	return 0;
 }
 
-int RAMFUNC MfSniffLogic(const uint8_t * data, int len, int bitCnt, int reader) {
+int RAMFUNC MfSniffLogic(const uint8_t * data, int len, uint32_t parity, int bitCnt, int reader) {
 
 	if ((len == 1) && (bitCnt = 9) && (data[0] > 0x0F)) { 
 		sniffState = SNF_INIT;
@@ -121,18 +122,18 @@ int RAMFUNC MfSniffLogic(const uint8_t * data, int len, int bitCnt, int reader)
 			sniffBuf[11] = sniffSAK;
 			sniffBuf[12] = 0xFF;
 			sniffBuf[13] = 0xFF;
-			LogTrace(sniffBuf, 14, 0, 0, true);
+			LogTrace(sniffBuf, 14, 0, parity, true);
 			timerData = GetTickCount();
 		}
 		case SNF_CARD_CMD:{
-			LogTrace(data, len, 0, 0, true);
+			LogTrace(data, len, 0, parity, true);
 
 			sniffState = SNF_CARD_RESP;
 			timerData = GetTickCount();
 			break;
 		}
 		case SNF_CARD_RESP:{
-			LogTrace(data, len, 0, 0, false);
+			LogTrace(data, len, 0, parity, false);
 
 			sniffState = SNF_CARD_CMD;
 			timerData = GetTickCount();
@@ -166,23 +167,25 @@ int intMfSniffSend() {
 	FpgaDisableSscDma();
 
 	while (pckLen > 0) {
-		pckSize = min(32, pckLen);
-		UsbCommand ack = {CMD_ACK, {1, pckSize, pckNum}};
-		memcpy(ack.d.asBytes, trace + traceLen - pckLen, pckSize);
+		pckSize = MIN(32, pckLen);
+//		UsbCommand ack = {CMD_ACK, {1, pckSize, pckNum}};
+//		memcpy(ack.d.asBytes, trace + traceLen - pckLen, pckSize);
 	
 		LED_B_ON();
-		UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
-		SpinDelay(20);
+    cmd_send(CMD_ACK,1,pckSize,pckNum,trace + traceLen - pckLen,pckSize);
+//		UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+//		SpinDelay(20);
 		LED_B_OFF();
 
 		pckLen -= pckSize;
 		pckNum++;
 	}
 
-	UsbCommand ack = {CMD_ACK, {2, 0, 0}};
+//	UsbCommand ack = {CMD_ACK, {2, 0, 0}};
 
 	LED_B_ON();
-	UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+  cmd_send(CMD_ACK,2,0,0,0,0);
+//	UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
 	LED_B_OFF();
 
 	traceLen = 0;