FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 4a966676539f2c541cc7a1dd03be1ce6cb929075..4e8cb89cc2f287d3577cf67acee5f23e20c07cee 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -1,4 +1,15 @@
+//-----------------------------------------------------------------------------
+// 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.
+//-----------------------------------------------------------------------------
+// Graph utilities
+//-----------------------------------------------------------------------------
+
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include "ui.h"
 #include "graph.h"
@@ -10,11 +21,13 @@ int GraphTraceLen;
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
-
-  for (i = 0; i < (int)(clock / 2); ++i)
-    GraphBuffer[GraphTraceLen++] = bit ^ 1;
+  int half = (int)(clock/2);
+  int firstbit = bit ^ 1;
+ 
+  for (i = 0; i < half; ++i)
+    GraphBuffer[GraphTraceLen++] = firstbit;
   
-  for (i = (int)(clock / 2); i < clock; ++i)
+  for (i = 0; i <= half; ++i)
     GraphBuffer[GraphTraceLen++] = bit;
 
   if (redraw)
@@ -25,8 +38,10 @@ void AppendGraph(int redraw, int clock, int bit)
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;
-  GraphTraceLen = 0;
+  memset(GraphBuffer, 0x00, GraphTraceLen);
 
+  GraphTraceLen = 0;
+ 
   if (redraw)
     RepaintGraphWindow();
 
@@ -59,8 +74,23 @@ int DetectClock(int peak)
       lastpeak = i;
     }
   }
+       
+       int clockmod = clock%8;
+       if ( clockmod == 0) 
+               return clock;
+       
+       // When detected clock is 31 or 33 then return 32
 
-  return clock;
+       printf("Found clock at %d ", clock);
+       switch( clockmod )
+       {
+               case 7: clock++; break;
+               case 6: clock += 2 ; break;
+               case 1: clock--; break;
+               case 2: clock -= 2; break;
+       }
+       printf("- adjusted it to %d \n", clock);
+       return clock;
 }
 
 /* Get or auto-detect clock rate */
@@ -83,3 +113,15 @@ int GetClock(const char *str, int peak, int verbose)
 
   return clock;
 }
+
+
+/* A simple test to see if there is any data inside Graphbuffer. 
+*/
+bool HasGraphData(){
+
+       if ( GraphTraceLen <= 0) {
+               PrintAndLog("No data available, try reading something first");
+               return false;
+       }
+       return true;    
+}
\ No newline at end of file