#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
+#include <unistd.h>
#include "proxmark3.h"
-#include "sleep.h"
+#include "util.h"
+#include "util_posix.h"
#include "flash.h"
#include "elf.h"
#include "proxendian.h"
#include "usb_cmd.h"
-
-void SendCommand(UsbCommand* txcmd);
-void ReceiveCommand(UsbCommand* rxcmd);
-void CloseProxmark();
-int OpenProxmark(size_t i);
-
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
+#include "comms.h"
#define FLASH_START 0x100000
#define FLASH_SIZE (256*1024)
EV_CURRENT
};
+
// Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
// unaligned segments if needed
-static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs)
+static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, uint16_t num_phdrs)
{
Elf32_Phdr *phdr = phdrs;
flash_seg_t *seg;
}
// Load an ELF file and prepare it for flashing
-int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
+int flash_load(flash_file_t *ctx, const char *name, bool can_write_bl)
{
FILE *fd = NULL;
Elf32_Ehdr ehdr;
Elf32_Phdr *phdrs = NULL;
- int num_phdrs;
+ uint16_t num_phdrs;
int res;
fd = fopen(name, "rb");
// Get the state of the proxmark, backwards compatible
static int get_proxmark_state(uint32_t *state)
{
- UsbCommand c;
+ UsbCommand c = {0};
c.cmd = CMD_DEVICE_INFO;
- SendCommand(&c);
+ SendCommand(&c);
UsbCommand resp;
- ReceiveCommand(&resp);
+ WaitForResponse(CMD_UNKNOWN, &resp); // wait for any response. No timeout.
// Three outcomes:
// 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
*state = resp.arg[0];
break;
default:
- fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04"llx"\n", resp.cmd);
+ fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
return -1;
break;
}
SendCommand(&c);
fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
}
- msleep(100);
- CloseProxmark();
- fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
- do {
- sleep(1);
- fprintf(stderr, ".");
- } while (!OpenProxmark(0));
- fprintf(stderr," Found.\n");
+ msleep(100);
+ CloseProxmark();
- return 0;
+ bool opened = OpenProxmark(serial_port_name, true, 120, true); // wait for 2 minutes
+ if (opened) {
+ fprintf(stderr," Found.\n");
+ return 0;
+ } else {
+ fprintf(stderr,"Error: Proxmark not found.\n");
+ return -1;
+ }
}
fprintf(stderr, "Error: Unknown Proxmark mode\n");
static int wait_for_ack(void)
{
- UsbCommand ack;
- ReceiveCommand(&ack);
+ UsbCommand ack;
+ WaitForResponse(CMD_UNKNOWN, &ack);
if (ack.cmd != CMD_ACK) {
- printf("Error: Unexpected reply 0x%04"llx" (expected ACK)\n", ack.cmd);
+ printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
return -1;
}
return 0;
memset(block_buf, 0xFF, BLOCK_SIZE);
memcpy(block_buf, data, length);
- UsbCommand c;
+ UsbCommand c;
c.cmd = CMD_FINISH_WRITE;
c.arg[0] = address;
memcpy(c.d.asBytes, block_buf, length);
- SendCommand(&c);
- return wait_for_ack();
+ SendCommand(&c);
+ return wait_for_ack();
}
// Write a file's segments to Flash
// just reset the unit
int flash_stop_flashing(void) {
UsbCommand c = {CMD_HARDWARE_RESET};
- SendCommand(&c);
- msleep(100);
- return 0;
+ SendCommand(&c);
+ msleep(100);
+ return 0;
}