X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/300bb58ac13c6f52ad7070fe420305db80cbc30e..626e650fbfba3cf2fb8adfa0a256466f9a2fd479:/client/cmdlfcotag.c

diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 0f68064e..d1808c9a 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -7,14 +7,15 @@
 //-----------------------------------------------------------------------------
 // Low frequency COTAG commands
 //-----------------------------------------------------------------------------
+
+#include "cmdlfcotag.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include "proxmark3.h"
+#include "comms.h"
 #include "ui.h"
 #include "cmddata.h"
-#include "data.h"
-#include "cmdlfcotag.h"
 #include "lfdemod.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
@@ -43,7 +44,8 @@ int CmdCOTAGDemod(const char *Cmd) {
 	size_t bitlen = COTAG_BITS;
 	memcpy(bits, DemodBuffer, COTAG_BITS);
 	
-	int err = manrawdecode(bits, &bitlen, 1);
+	uint8_t alignPos = 0;
+	int err = manrawdecode(bits, &bitlen, 1, &alignPos);
 	if (err){
 		if (g_debugMode) PrintAndLog("DEBUG: Error - COTAG too many errors: %d", err);
 		return -1;
@@ -95,13 +97,12 @@ int CmdCOTAGRead(const char *Cmd) {
 		case 2: {
 			CmdPlot("");
 			CmdGrid("384");
-			getSamples("", true); break;
+			getSamples(0, true); break;
 		}
 		case 1: {
-			GetFromBigBuf(DemodBuffer, COTAG_BITS, 0);
-			DemodBufferLen = COTAG_BITS;
 			UsbCommand response;
-			if ( !WaitForResponseTimeout(CMD_ACK, &response, 1000) ) {
+			DemodBufferLen = COTAG_BITS;
+			if (!GetFromBigBuf(DemodBuffer, COTAG_BITS, 0, &response, 1000, true)) {
 				PrintAndLog("timeout while waiting for reply.");
 				return -1;
 			}