CHG: "hf mfu info" now always tries to read the NDEF CC. (was restricted to only...

[proxmark3-svn] / client / flash.c

diff --git a/client/flash.c b/client/flash.c
index 9f547915b95a9b8b82936c40d6d3936c924c5250..4e222ece2c213a3c898f8ecfb60890256dc3e63a 100644 (file)
--- a/client/flash.c
+++ b/client/flash.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include "proxmark3.h"
 #include "sleep.h"
-//#include "proxusb.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
@@ -276,7 +275,6 @@ static int get_proxmark_state(uint32_t *state)
 {
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
-//     SendCommand_(&c);
   SendCommand(&c);
        UsbCommand resp;
        ReceiveCommand(&resp);
@@ -340,8 +338,7 @@ static int enter_bootloader(char *serial_port_name)
     msleep(100);
                CloseProxmark();
 
-               fprintf(stderr,"Waiting for Proxmark to reappear on ");
-               fprintf(stderr,serial_port_name);
+               fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
     do {
                        sleep(1);
                        fprintf(stderr, ".");
@@ -392,7 +389,6 @@ int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
                        c.arg[2] = 0;
                }
                SendCommand(&c);
-//             SendCommand_(&c);
                return wait_for_ack();
        } else {
                fprintf(stderr, "Note: Your bootloader does not understand the new START_FLASH command\n");
@@ -409,22 +405,8 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length)
        memset(block_buf, 0xFF, BLOCK_SIZE);
        memcpy(block_buf, data, length);
   UsbCommand c;
-/*
-       c.cmd = {CMD_SETUP_WRITE};
-       for (int i = 0; i < 240; i += 48) {
-               memcpy(c.d.asBytes, block_buf + i, 48);
-               c.arg[0] = i / 4;
-               SendCommand(&c);
-//             SendCommand_(&c);
-               if (wait_for_ack() < 0) {
-                       return -1;
-    }
-       }
-*/
        c.cmd = CMD_FINISH_WRITE;
        c.arg[0] = address;
-//     memcpy(c.d.asBytes, block_buf+240, 16);
-//     SendCommand_(&c);
        memcpy(c.d.asBytes, block_buf, length);
   SendCommand(&c);
   return wait_for_ack();
@@ -487,7 +469,6 @@ void flash_free(flash_file_t *ctx)
 // just reset the unit
 int flash_stop_flashing(void) {
        UsbCommand c = {CMD_HARDWARE_RESET};
-//     SendCommand_(&c);
   SendCommand(&c);
   msleep(100);
   return 0;