X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a553f2674865fa544d04ca7b8194e30c008644ae..ceb34a3c1be2ebebfc5e062e39fd83ed0624fb4f:/client/data.c

diff --git a/client/data.c b/client/data.c
index 80374c60..184a63b6 100644
--- a/client/data.c
+++ b/client/data.c
@@ -12,24 +12,21 @@
 #include <stdint.h>
 #include "data.h"
 #include "ui.h"
-#include "proxusb.h"
+#include "proxmark3.h"
 #include "cmdmain.h"
 
-uint8_t sample_buf[SAMPLE_BUFFER_SIZE];
+uint8_t* sample_buf;
 
-void GetFromBigBuf(uint8_t *dest, int bytes)
-{
-  int n = bytes/4;
-
-  if (n % 48 != 0) {
-    PrintAndLog("bad len in GetFromBigBuf");
-    return;
-  }
-
-  for (int i = 0; i < n; i += 12) {
-    UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
-    SendCommand(&c);
-    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
-    memcpy(dest+(i*4), sample_buf, 48);
-  }
+void GetFromBigBuf(uint8_t *dest, int bytes, int start_index) {
+	sample_buf = dest;
+	UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
 }
+void GetEMLFromBigBuf(uint8_t *dest, uint32_t bytes, uint32_t start_index) {
+	sample_buf = dest;
+	UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
+	clearCommandBuffer();
+	SendCommand(&c);
+}
+