#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "sleep.h"
+#include <inttypes.h>
#include "proxmark3.h"
+#include "util.h"
+#include "util_posix.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]: %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(" cmd[len=%zd]: %016" PRIx64 "\n",sizeof(UC->cmd),UC->cmd);
+ printf(" arg0[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[0]),UC->arg[0]);
+ printf(" arg1[len=%zd]: %016" PRIx64 "\n",sizeof(UC->arg[1]),UC->arg[1]);
+ printf(" arg2[len=%zd]: %016" PRIx64 "\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]);
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;
}
}
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;
{
fprintf(stderr, "Usage: %s <port> [-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 <DEVICE>',\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
}
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;