Add License/Copyright headers/notices. Please add your own copyright notice if you...

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index 3b5c1ad5fc742f6ac28c687d5c0eb39c722bd40b..0b8a3368e19398f93151808609ea29eb1b5ffc58 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -1,16 +1,15 @@
-#include <usb.h>
+//-----------------------------------------------------------------------------
+// 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.
+//-----------------------------------------------------------------------------
+// Flashing binary
+//-----------------------------------------------------------------------------
+
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <strings.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include "prox.h"
-#include "proxmark3.h"
+#include "sleep.h"
+#include "proxusb.h"
 #include "flash.h"
 
 unsigned int current_command = CMD_UNKNOWN;
@@ -19,49 +18,49 @@ extern struct partition partitions[];
 
 static void usage(char **argv)
 {
-       int i;
-       fprintf(stderr, "Usage:   %s areas image [image [image]]\n", argv[0]);
-       fprintf(stderr, "         areas is a comma-separated list of areas to flash, with no spaces\n");
-       fprintf(stderr, "               Known areas are:");
-
-       for(i=0; partitions[i].name != NULL; i++) {
-               fprintf(stderr, " %s", partitions[i].name);
-       }
-
-       fprintf(stderr, "\n");
-       fprintf(stderr, "         image is the path to the corresponding image\n\n");
-       fprintf(stderr, "Example: %s os,fpga path/to/osimage.s19 path/to/fpgaimage.s19\n", argv[0]);
+  fprintf(stderr, "Usage:   %s areas image [image [image]]\n", argv[0]);
+  fprintf(stderr, "         areas is a comma-separated list of areas to flash, with no spaces\n");
+  fprintf(stderr, "               Known areas are:");
+
+  for (int i = 0; partitions[i].name != NULL; ++i) {
+    fprintf(stderr, " %s", partitions[i].name);
+  }
+
+  fprintf(stderr, "\n");
+  fprintf(stderr, "         image is the path to the corresponding image\n\n");
+  fprintf(stderr, "Example: %s os,fpga path/to/osimage.elf path/to/fpgaimage.elf\n", argv[0]);
 }
 
-int main(int argc, char **argv) {
-       if(argc < 2) {
-               usage(argv);
-               exit(-1);
-       }
-       
-       /* Count area arguments */
-       int areas = 0, offset=-1, length=0;
-       while(find_next_area(argv[1], &offset, &length)) areas++;
-       
-       if(areas != argc - 2) {
-               usage(argv);
-               exit(-1);
-       }
-       
-       usb_init();
-
-       fprintf(stderr,"Waiting for Proxmark to appear on USB... ");
-       while(!(devh=OpenProxmark(0))) { sleep(1); }
-       fprintf(stderr,"Found.\n");
-       
-       do_flash(argv);
-       
-       UsbCommand c = {CMD_HARDWARE_RESET};
-       SendCommand(&c);
-
-       CloseProxmark();
-
-       fprintf(stderr,"Have a nice day!\n");
-
-       return 0;
+int main(int argc, char **argv)
+{
+  if (argc < 2) {
+    usage(argv);
+    exit(-1);
+  }
+
+  /* Count area arguments */
+  int areas = 0, offset=-1, length=0;
+  while (find_next_area(argv[1], &offset, &length)) areas++;
+
+  if (areas != argc - 2) {
+    usage(argv);
+    exit(-1);
+  }
+
+  usb_init();
+
+  fprintf(stderr,"Waiting for Proxmark to appear on USB... ");
+  while (!OpenProxmark(0)) { sleep(1); }
+  fprintf(stderr,"Found.\n");
+
+  do_flash(argv);
+
+  UsbCommand c = {CMD_HARDWARE_RESET};
+  SendCommand(&c);
+
+  CloseProxmark();
+
+  fprintf(stderr,"Have a nice day!\n");
+
+  return 0;
 }