X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/28fdb04fd8d62e46c36f959b373d662f1a146448..b7eddc14db9262a51ad3100ade7386d03500ace8:/client/flasher.c diff --git a/client/flasher.c b/client/flasher.c index 2e8bd2ed..c273c1f3 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -10,21 +10,25 @@ #include #include #include "sleep.h" -//#include "proxusb.h" +#include "proxmark3.h" #include "flash.h" #include "uart.h" #include "usb_cmd.h" +#ifdef _WIN32 +# define unlink(x) +#endif + static serial_port sp; static char* serial_port_name; void cmd_debug(UsbCommand* UC) { // Debug printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand)); - printf(" cmd[len=%zd]: %016llx\n",sizeof(UC->cmd),UC->cmd); - printf(" arg0[len=%zd]: %016llx\n",sizeof(UC->arg[0]),UC->arg[0]); - printf(" arg1[len=%zd]: %016llx\n",sizeof(UC->arg[1]),UC->arg[1]); - printf(" arg2[len=%zd]: %016llx\n",sizeof(UC->arg[2]),UC->arg[2]); + printf(" cmd[len=%zd]: %016"llx"\n",sizeof(UC->cmd),UC->cmd); + printf(" arg0[len=%zd]: %016"llx"\n",sizeof(UC->arg[0]),UC->arg[0]); + printf(" arg1[len=%zd]: %016"llx"\n",sizeof(UC->arg[1]),UC->arg[1]); + printf(" arg2[len=%zd]: %016"llx"\n",sizeof(UC->arg[2]),UC->arg[2]); printf(" data[len=%zd]: ",sizeof(UC->d.asBytes)); for (size_t i=0; i<16; i++) { printf("%02x",UC->d.asBytes[i]); @@ -48,11 +52,8 @@ void ReceiveCommand(UsbCommand* rxcmd) { while (true) { rxlen = sizeof(UsbCommand) - (prx-prxcmd); if (uart_receive(sp,prx,&rxlen)) { -// printf("received [%zd] bytes\n",rxlen); prx += rxlen; if ((prx-prxcmd) >= sizeof(UsbCommand)) { -// printf("received: "); -// cmd_debug(rxcmd); return; } } @@ -62,11 +63,14 @@ void ReceiveCommand(UsbCommand* rxcmd) { void CloseProxmark() { // Clean up the port uart_close(sp); + // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/* + unlink(serial_port_name); } int OpenProxmark(size_t i) { sp = uart_open(serial_port_name); - if (sp == INVALID_SERIAL_PORT) { + if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) { + //poll once a second return 0; } return 1; @@ -76,7 +80,12 @@ static void usage(char *argv0) { fprintf(stderr, "Usage: %s [-b] image.elf [image.elf...]\n\n", argv0); fprintf(stderr, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n"); - fprintf(stderr, "Example: %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0); + //Is the example below really true? /Martin + fprintf(stderr, "Example:\n\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0); + fprintf(stderr, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0); + fprintf(stderr, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on ',\n"); + fprintf(stderr, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n"); + fprintf(stderr, " http://code.google.com/p/proxmark3/wiki/Linux\n\n"); } #define MAX_FILES 4 @@ -115,13 +124,15 @@ int main(int argc, char **argv) } serial_port_name = argv[1]; - fprintf(stderr, "Waiting for Proxmark to appear on USB..."); - while (!OpenProxmark(0)) { - fprintf(stderr, "."); - } - fprintf(stderr, " Found.\n"); - - res = flash_start_flashing(can_write_bl); + + fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name); + do { + sleep(1); + fprintf(stderr, "."); + } while (!OpenProxmark(0)); + fprintf(stderr," Found.\n"); + + res = flash_start_flashing(can_write_bl,serial_port_name); if (res < 0) return -1;