Merge branch 'graphwork2' into graphwork

[proxmark3-svn] / client / data.c

diff --git a/client/data.c b/client/data.c
index 1fc7408ffd84d767b4cbc256e98e5d0d24327301..4d7d1e410fdc04e73789345b3560c7a671d5a624 100644 (file)
--- a/client/data.c
+++ b/client/data.c
@@ -1,25 +1,25 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Data utilities
+//-----------------------------------------------------------------------------
+

 #include <string.h>
 #include <stdint.h>
 #include "data.h"
 #include "ui.h"
 #include <string.h>
 #include <stdint.h>
 #include "data.h"
 #include "ui.h"

-#include "proxusb.h"
+#include "proxmark3.h"

 #include "cmdmain.h"
 
 #include "cmdmain.h"
 

-uint8_t sample_buf[SAMPLE_BUFFER_SIZE];
+uint8_t* sample_buf;

 
 

-void GetFromBigBuf(uint8_t *dest, int bytes)
+void GetFromBigBuf(uint8_t *dest, int bytes, int start_index)

 {
 {

-  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);
-  }
+  sample_buf = dest;
+  UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {start_index, bytes, 0}};
+  SendCommand(&c);

 }
 }