X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a146075d74306aacf600d219dfa2df086690db53..b97a3d994b53dade7cf3460ec4246cbbc258212e:/client/proxmark3.c?ds=sidebyside

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 4c6076bc..b98afd9a 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -1,105 +1,113 @@
-#include <usb.h>
+//-----------------------------------------------------------------------------
+// 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.
+//-----------------------------------------------------------------------------
+// Main binary
+//-----------------------------------------------------------------------------
+
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <strings.h>
 #include <string.h>
-#include <errno.h>
+#include <pthread.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-#include <pthread.h>
-
-#include "prox.h"
+#include "proxusb.h"
 #include "proxmark3.h"
 #include "proxgui.h"
+#include "cmdmain.h"
 
-struct usb_receiver_arg {
-	int run;
+struct usb_receiver_arg
+{
+  int run;
 };
 
-struct main_loop_arg {
-	int usb_present;
+struct main_loop_arg
+{
+  int usb_present;
 };
 
-static void *usb_receiver(void *targ) {
-	struct usb_receiver_arg *arg = (struct usb_receiver_arg*)targ;
-	UsbCommand cmdbuf;
-
-	while(arg->run) {
-		if (ReceiveCommandP(&cmdbuf) > 0) {
-			int i;
-
-			for (i=0; i<strlen(PROXPROMPT); i++)
-				putchar(0x08);
-
-			UsbCommandReceived(&cmdbuf);
-			printf(PROXPROMPT);
-			fflush(NULL);
-		}
-	}
-
-	pthread_exit(NULL);
+static void *usb_receiver(void *targ)
+{
+  struct usb_receiver_arg *arg = (struct usb_receiver_arg*)targ;
+  UsbCommand cmdbuf;
+
+  while (arg->run) {
+    if (ReceiveCommandPoll(&cmdbuf)) {
+      for (int i = 0; i < strlen(PROXPROMPT); i++)
+        putchar(0x08);
+      UsbCommandReceived(&cmdbuf);
+      printf(PROXPROMPT);
+      fflush(NULL);
+    }
+  }
+
+  pthread_exit(NULL);
+  return NULL;
 }
 
 static void *main_loop(void *targ)
 {
-	struct main_loop_arg *arg = (struct main_loop_arg*)targ;
-	char *cmd = NULL;
-
-	while(1) {
-		struct usb_receiver_arg rarg;
-		pthread_t reader_thread;
-
-		rarg.run=1;
-		if (arg->usb_present == 1) {
-			pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
-		}
-		cmd = readline(PROXPROMPT);
-		rarg.run=0;
-		if (arg->usb_present == 1) {
-			pthread_join(reader_thread, NULL);
-		}
-
-		if (cmd) {
-			if (cmd[0] != 0x00) {
-				CommandReceived(cmd);
-				add_history(cmd);
-			}
-			free(cmd);
-		} else {
-			printf("\n");
-			break;
-		}
-	}
-
-	ExitGraphics();
-	pthread_exit(NULL);
+  struct main_loop_arg *arg = (struct main_loop_arg*)targ;
+  struct usb_receiver_arg rarg;
+  char *cmd = NULL;
+  pthread_t reader_thread;
+
+  if (arg->usb_present == 1) {
+    rarg.run=1;
+    pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
+  }
+
+  while(1) {
+    cmd = readline(PROXPROMPT);
+    if (cmd) {
+      if (cmd[0] != 0x00) {
+        CommandReceived(cmd);
+        add_history(cmd);
+      }
+      free(cmd);
+    } else {
+      printf("\n");
+      break;
+    }
+  }
+
+  if (arg->usb_present == 1) {
+    rarg.run = 0;
+    pthread_join(reader_thread, NULL);
+  }
+
+  ExitGraphics();
+  pthread_exit(NULL);
+  return NULL;
 }
 
 int main(int argc, char **argv)
 {
-	struct main_loop_arg marg;
-	pthread_t main_loop_t;
-	usb_init();
-
-	if (!(devh = OpenProxmark(1))) {
-		fprintf(stderr,"PROXMARK3: NOT FOUND!\n");
-		marg.usb_present = 0;
-		offline = 1;
-	} else {
-		marg.usb_present = 1;
-		offline = 0;
-	}
-
-	pthread_create(&main_loop_t, NULL, &main_loop, &marg);
-	InitGraphics(argc, argv);
-
-	MainGraphics();
-
-	pthread_join(main_loop_t, NULL);
-
-	if (marg.usb_present == 1) {
-		CloseProxmark();
-	}
-	return 0;
+  struct main_loop_arg marg;
+  pthread_t main_loop_t;
+  usb_init();
+
+  if (!OpenProxmark(1)) {
+    fprintf(stderr,"PROXMARK3: NOT FOUND!\n");
+    marg.usb_present = 0;
+    offline = 1;
+  } else {
+    marg.usb_present = 1;
+    offline = 0;
+  }
+
+  pthread_create(&main_loop_t, NULL, &main_loop, &marg);
+  InitGraphics(argc, argv);
+
+  MainGraphics();
+
+  pthread_join(main_loop_t, NULL);
+
+  if (marg.usb_present == 1) {
+    CloseProxmark();
+  }
+  return 0;
 }