X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0ae6234a5be30c1c484c5225508a8d8b8111cd91..818efbebb87ec5485fbf367021dca42514dfdee0:/client/flash.c

diff --git a/client/flash.c b/client/flash.c
index df81a90c..e3714185 100644
--- a/client/flash.c
+++ b/client/flash.c
@@ -11,14 +11,21 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "sleep.h"
-#include "proxusb.h"
+#include <inttypes.h>
+#include <unistd.h>
+#include "proxmark3.h"
+#include "util.h"
+#include "util_posix.h"
 #include "flash.h"
 #include "elf.h"
 #include "proxendian.h"
+#include "usb_cmd.h"
+#include "uart.h"
 
-// FIXME: what the fuckity fuck
-unsigned int current_command = CMD_UNKNOWN;
+void SendCommand(UsbCommand* txcmd);
+void ReceiveCommand(UsbCommand* rxcmd);
+
+serial_port sp;
 
 #define FLASH_START            0x100000
 #define FLASH_SIZE             (256*1024)
@@ -26,7 +33,7 @@ unsigned int current_command = CMD_UNKNOWN;
 #define BOOTLOADER_SIZE        0x2000
 #define BOOTLOADER_END         (FLASH_START + BOOTLOADER_SIZE)
 
-#define BLOCK_SIZE             0x100
+#define BLOCK_SIZE             0x200
 
 static const uint8_t elf_ident[] = {
 	0x7f, 'E', 'L', 'F',
@@ -35,6 +42,23 @@ static const uint8_t elf_ident[] = {
 	EV_CURRENT
 };
 
+void CloseProxmark(const char *serial_port_name) {
+	// 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);
+}
+
+bool OpenProxmark(size_t i, const char *serial_port_name) {
+	sp = uart_open(serial_port_name);
+	if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
+		//poll once a second
+		return false;
+	}
+
+	return true;
+}
+
 // 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)
@@ -250,6 +274,7 @@ int flash_load(flash_file_t *ctx, const char *name, int can_write_bl)
 	if (res < 0)
 		goto fail;
 
+	free(phdrs);
 	fclose(fd);
 	ctx->filename = name;
 	return 0;
@@ -269,7 +294,6 @@ static int get_proxmark_state(uint32_t *state)
 	UsbCommand c;
 	c.cmd = CMD_DEVICE_INFO;
 	SendCommand(&c);
-
 	UsbCommand resp;
 	ReceiveCommand(&resp);
 
@@ -289,7 +313,7 @@ static int get_proxmark_state(uint32_t *state)
 			*state = resp.arg[0];
 			break;
 		default:
-			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04x\n", resp.cmd);
+			fprintf(stderr, "Error: Couldn't get proxmark state, bad response type: 0x%04" PRIx64 "\n", resp.cmd);
 			return -1;
 			break;
 	}
@@ -298,7 +322,7 @@ static int get_proxmark_state(uint32_t *state)
 }
 
 // Enter the bootloader to be able to start flashing
-static int enter_bootloader(void)
+static int enter_bootloader(char *serial_port_name)
 {
 	uint32_t state;
 
@@ -329,14 +353,16 @@ static int enter_bootloader(void)
 			SendCommand(&c);
 			fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
 		}
-		fprintf(stderr,"Waiting for Proxmark to reappear on USB...");
 
-		CloseProxmark();
-		sleep(1);
-		while (!OpenProxmark(0)) {
+		msleep(100);
+		CloseProxmark(serial_port_name);
+
+		fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
+		do {
 			sleep(1);
 			fprintf(stderr, ".");
-		}
+		} while (!OpenProxmark(0, serial_port_name));
+
 		fprintf(stderr," Found.\n");
 
 		return 0;
@@ -351,18 +377,18 @@ static int wait_for_ack(void)
 	UsbCommand ack;
 	ReceiveCommand(&ack);
 	if (ack.cmd != CMD_ACK) {
-		printf("Error: Unexpected reply 0x%04x (expected ACK)\n", ack.cmd);
+		printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
 		return -1;
 	}
 	return 0;
 }
 
 // Go into flashing mode
-int flash_start_flashing(int enable_bl_writes)
+int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
 {
 	uint32_t state;
 
-	if (enter_bootloader() < 0)
+	if (enter_bootloader(serial_port_name) < 0)
 		return -1;
 
 	if (get_proxmark_state(&state) < 0)
@@ -398,21 +424,12 @@ 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 = {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);
-		if (wait_for_ack() < 0)
-			return -1;
-	}
-
+  UsbCommand c;
 	c.cmd = CMD_FINISH_WRITE;
 	c.arg[0] = address;
-	memcpy(c.d.asBytes, block_buf+240, 16);
-	SendCommand(&c);
-	return wait_for_ack();
+	memcpy(c.d.asBytes, block_buf, length);
+  SendCommand(&c);
+  return wait_for_ack();
 }
 
 // Write a file's segments to Flash
@@ -473,5 +490,6 @@ void flash_free(flash_file_t *ctx)
 int flash_stop_flashing(void) {
 	UsbCommand c = {CMD_HARDWARE_RESET};
 	SendCommand(&c);
+	msleep(100);
 	return 0;
 }