X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c54d1394c69fbe8199cf96f9e0ddb5172e71682c..refs/heads/graphwork:/client/graph.c

diff --git a/client/graph.c b/client/graph.c
index 269c2dd9..94c65569 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -18,6 +18,9 @@
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
+int s_Buff[MAX_GRAPH_TRACE_LEN];
+
+
 /* write a bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {
@@ -66,7 +69,7 @@ void setGraphBuf(uint8_t *buff, size_t size)
 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
-	if ( buff == NULL ) return -1;
+	if ( buff == NULL ) return 0;
 	
   uint32_t i;
   for (i=0;i<GraphTraceLen;++i){
@@ -76,6 +79,8 @@ size_t getFromGraphBuf(uint8_t *buff)
   }
   return i;
 }
+
+
 // Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
@@ -89,7 +94,7 @@ int GetClock(const char *str, int peak, int verbose)
 	{
 		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
-		if ( size < 0 ) {
+		if ( size == 0 ) {
 			PrintAndLog("Failed to copy from graphbuffer");
 			return -1;
 		}
@@ -146,6 +151,10 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 	{
 		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
 		size_t size = getFromGraphBuf(grph);
+		if ( size == 0 ) {
+			PrintAndLog("Failed to copy from graphbuffer");
+			return -1;
+		}
 		clock = DetectpskNRZClock(grph,size,0);
 		// Only print this message if we're not looping something
 		if (!verbose){
@@ -153,4 +162,4 @@ int GetNRZpskClock(const char *str, int peak, int verbose)
 		}
 	}
 	return clock;
-}
\ No newline at end of file
+}