X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/9fb0f4d2becd19b6ef278ebe01159a2a3899abea..e052333d36a748d0ecbf1304ce1acc6301f7895c:/flash-hmcfgusb.c?ds=sidebyside

diff --git a/flash-hmcfgusb.c b/flash-hmcfgusb.c
index 0308442..a9ff876 100644
--- a/flash-hmcfgusb.c
+++ b/flash-hmcfgusb.c
@@ -1,6 +1,6 @@
-/* (not working) flasher for HM-CFG-USB
+/* flasher for HM-CFG-USB
  *
- * Copyright (c) 2013 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-14 Michael Gernoth <michael@gernoth.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -36,57 +36,52 @@
 #include <libusb-1.0/libusb.h>
 
 #include "hexdump.h"
+#include "firmware.h"
+#include "version.h"
 #include "hmcfgusb.h"
 
 struct recv_data {
+	int ack;
 };
 
 static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
 {
-	if (buf_len < 1)
+	struct recv_data *rdata = data;
+
+	if (buf_len != 1)
 		return 1;
 
-	switch(buf[0]) {
-		case 'E':
-		case 'H':
-		case 'R':
-		case 'I':
-			break;
-		default:
-			hexdump(buf, buf_len, "Unknown> ");
-			break;
-	}
+	rdata->ack = buf[0];
 
 	return 1;
 }
 
-static uint8_t ascii_to_nibble(uint8_t a)
-{
-	uint8_t c = 0x00;
-
-	if ((a >= '0') && (a <= '9')) {
-		c = a - '0';
-	} else if ((a >= 'A') && (a <= 'F')) {
-		c = (a - 'A') + 10;
-	} else if ((a >= 'a') && (a <= 'f')) {
-		c = (a - 'a') + 10;
-	}
-
-	return c;
-}
-
 int main(int argc, char **argv)
 {
+	const char twiddlie[] = { '-', '\\', '|', '/' };
 	struct hmcfgusb_dev *dev;
 	struct recv_data rdata;
-	uint8_t out[0x40]; //FIXME!!!
-	uint8_t buf[0x80];
-	int fd;
-	int r;
-	int i;
-	int cnt;
+	uint16_t len;
+	struct firmware *fw;
+	int block;
+	int pfd;
+	int debug = 0;
+
+	printf("HM-CFG-USB flasher version " VERSION "\n\n");
+
+	if (argc != 2) {
+		if (argc == 1)
+			fprintf(stderr, "Missing firmware filename!\n\n");
+
+		fprintf(stderr, "Syntax: %s hmusbif.enc\n\n", argv[0]);
+		exit(EXIT_FAILURE);
+	}
+
+	fw = firmware_read_firmware(argv[1], debug);
+	if (!fw)
+		exit(EXIT_FAILURE);
 
-	hmcfgusb_set_debug(0);
+	hmcfgusb_set_debug(debug);
 
 	memset(&rdata, 0, sizeof(rdata));
 
@@ -95,35 +90,83 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Can't initialize HM-CFG-USB\n");
 		exit(EXIT_FAILURE);
 	}
-	printf("HM-CFG-USB opened!\n");
 
-	fd = open("hmusbif.enc", O_RDONLY);
-	if (fd < 0) {
-		perror("Can't open hmusbif.enc");
-		exit(EXIT_FAILURE);
+	if (!dev->bootloader) {
+		fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, entering bootloader.\n");
+		fprintf(stderr, "\nWaiting for device to reappear...\n");
+
+		do {
+			if (dev) {
+				if (!dev->bootloader)
+					hmcfgusb_enter_bootloader(dev);
+				hmcfgusb_close(dev);
+			}
+			sleep(1);
+		} while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (!dev->bootloader));
+	}
+
+	printf("\nHM-CFG-USB opened.\n\n");
+
+
+	printf("Flashing %d blocks", fw->fw_blocks);
+	if (debug) {
+		printf("\n");
+	} else {
+		printf(": %c", twiddlie[0]);
+		fflush(stdout);
 	}
 
-	cnt = 0;
-	do {
-		memset(buf, 0, sizeof(buf));
-		r = read(fd, buf, sizeof(buf));
-		if (r < 0) {
-			perror("read");
+	for (block = 0; block < fw->fw_blocks; block++) {
+		len = fw->fw[block][2] << 8;
+		len |= fw->fw[block][3];
+
+		len += 4; /* block nr., length */
+
+		if (debug)
+			hexdump(fw->fw[block], len, "F> ");
+
+		rdata.ack = 0;
+		if (!hmcfgusb_send(dev, fw->fw[block], len, 0)) {
+			perror("\n\nhmcfgusb_send");
 			exit(EXIT_FAILURE);
-		} else if (r == 0) {
+		}
+
+		if (debug)
+			printf("Waiting for ack...\n");
+		do {
+			errno = 0;
+			pfd = hmcfgusb_poll(dev, 1000);
+			if ((pfd < 0) && errno) {
+				if (errno != ETIMEDOUT) {
+					perror("\n\nhmcfgusb_poll");
+					exit(EXIT_FAILURE);
+				}
+			}
+			if (rdata.ack) {
+				break;
+			}
+		} while (pfd < 0);
+
+		if (rdata.ack == 2) {
+			printf("\n\nFirmware update successfull!\n");
 			break;
 		}
-		memset(out, 0, sizeof(out));
-		for (i = 0; i < r; i+=2) {
-			out[i/2] = (ascii_to_nibble(buf[i]) & 0xf)<< 4;
-			out[i/2] |= ascii_to_nibble(buf[i+1]) & 0xf;
+
+		if (rdata.ack != 1) {
+			fprintf(stderr, "\n\nError flashing block %d, status: %u\n", block, rdata.ack);
+			exit(EXIT_FAILURE);
+		}
+
+		if (!debug) {
+			printf("\b%c", twiddlie[block % sizeof(twiddlie)]);
+			fflush(stdout);
 		}
-		cnt += r/2;
-		printf("Flashing %d bytes...\n", cnt);
-		hmcfgusb_send(dev, out, r/2, 1);
-	} while (r > 0);
+	}
+
+	firmware_free(fw);
 
 	hmcfgusb_close(dev);
+	hmcfgusb_exit();
 
 	return EXIT_SUCCESS;
 }