X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/b5e57d268fe86cf58116c03166d45c130280dfb6..d033bdb303afa32f5a022f817bb9af238da803ce:/flash-hmcfgusb.c

diff --git a/flash-hmcfgusb.c b/flash-hmcfgusb.c
index aebf781..0f0b9ce 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,6 +36,8 @@
 #include <libusb-1.0/libusb.h>
 
 #include "hexdump.h"
+#include "firmware.h"
+#include "version.h"
 #include "hmcfgusb.h"
 
 struct recv_data {
@@ -54,46 +56,35 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
 	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[4096];
-	uint8_t buf[4096];
-	uint8_t *outp;
-	int fd;
+	uint16_t len;
+	struct firmware *fw;
+	int block;
 	int pfd;
-	int r;
-	int i;
-	int cnt;
-	int pkt;
 	int debug = 0;
 
-	hmcfgusb_set_debug(debug);
+	printf("HM-CFG-USB flasher version " VERSION "\n\n");
 
-	memset(&rdata, 0, sizeof(rdata));
+	if (argc != 2) {
+		if (argc == 1)
+			fprintf(stderr, "Missing firmware filename!\n\n");
 
-	fd = open("hmusbif.enc", O_RDONLY);
-	if (fd < 0) {
-		perror("Can't open hmusbif.enc");
+		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(debug);
+
+	memset(&rdata, 0, sizeof(rdata));
+
 	dev = hmcfgusb_init(parse_hmcfgusb, &rdata);
 	if (!dev) {
 		fprintf(stderr, "Can't initialize HM-CFG-USB\n");
@@ -101,83 +92,54 @@ int main(int argc, char **argv)
 	}
 
 	if (!dev->bootloader) {
-		fprintf(stderr, "HM-CFG-USB not in bootloader mode, entering bootloader.\n");
+		fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, entering bootloader.\n");
 		hmcfgusb_enter_bootloader(dev);
 		fprintf(stderr, "\nWaiting for device to reappear...\n");
 
 		do {
+			if (dev) {
+				hmcfgusb_close(dev);
+			}
 			sleep(1);
-		} while ((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL);
-
-		if (!dev->bootloader) {
-			fprintf(stderr, "Can't enter bootloader, giving up!\n");
-			exit(EXIT_FAILURE);
-		}
+		} while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (!dev->bootloader));
 	}
 
-	printf("HM-CFG-USB opened!\n");
+	printf("\nHM-CFG-USB opened.\n\n");
 
-	cnt = 0;
-	pkt = 0;
-	do {
-		int len;
 
-		memset(buf, 0, sizeof(buf));
-		r = read(fd, buf, 4);
-		if (r < 0) {
-			perror("read");
-			exit(EXIT_FAILURE);
-		} else if (r == 0) {
-			break;
-		} else if (r != 4) {
-			printf("can't get length information!\n");
-			exit(EXIT_FAILURE);
-		}
+	printf("Flashing %d blocks", fw->fw_blocks);
+	if (debug) {
+		printf("\n");
+	} else {
+		printf(": %c", twiddlie[0]);
+		fflush(stdout);
+	}
 
-		len = (ascii_to_nibble(buf[0]) & 0xf)<< 4;
-		len |= ascii_to_nibble(buf[1]) & 0xf;
-		len <<= 8;
-		len |= (ascii_to_nibble(buf[2]) & 0xf)<< 4;
-		len |= ascii_to_nibble(buf[3]) & 0xf;
+	for (block = 0; block < fw->fw_blocks; block++) {
+		len = fw->fw[block][2] << 8;
+		len |= fw->fw[block][3];
 
-		r = read(fd, buf, len * 2);
-		if (r < 0) {
-			perror("read");
-			exit(EXIT_FAILURE);
-		} else if (r < len * 2) {
-			printf("short read, aborting (%d < %d)\n", r, len * 2);
-			break;
-		}
+		len += 4; /* block nr., length */
 
-		memset(out, 0, sizeof(out));
-		outp = out;
-		*outp++ = (pkt >> 8) & 0xff;
-		*outp++ = pkt & 0xff;
-		*outp++ = (len >> 8) & 0xff;
-		*outp++ = len & 0xff;
-		for (i = 0; i < r; i+=2) {
-			*outp = (ascii_to_nibble(buf[i]) & 0xf)<< 4;
-			*outp |= ascii_to_nibble(buf[i+1]) & 0xf;
-			outp++;
-		}
-		cnt = outp - out;
-		printf("Flashing %d bytes...\n", cnt);
 		if (debug)
-			hexdump(out, cnt, "F> ");
+			hexdump(fw->fw[block], len, "F> ");
 
 		rdata.ack = 0;
-		if (!hmcfgusb_send(dev, out, cnt, 0)) {
-			perror("hmcfgusb_send");
+		if (!hmcfgusb_send(dev, fw->fw[block], len, 0)) {
+			perror("\n\nhmcfgusb_send");
 			exit(EXIT_FAILURE);
 		}
 
-		printf("Waiting for ack...\n");
+		if (debug)
+			printf("Waiting for ack...\n");
 		do {
 			errno = 0;
-			pfd = hmcfgusb_poll(dev, 1);
+			pfd = hmcfgusb_poll(dev, 1000);
 			if ((pfd < 0) && errno) {
-				perror("hmcfgusb_poll");
-				exit(EXIT_FAILURE);
+				if (errno != ETIMEDOUT) {
+					perror("\n\nhmcfgusb_poll");
+					exit(EXIT_FAILURE);
+				}
 			}
 			if (rdata.ack) {
 				break;
@@ -185,11 +147,22 @@ int main(int argc, char **argv)
 		} while (pfd < 0);
 
 		if (rdata.ack == 2) {
-			printf("Firmware update successfull!\n");
+			printf("\n\nFirmware update successfull!\n");
 			break;
 		}
-		pkt++;
-	} while (r > 0);
+
+		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);
+		}
+	}
+
+	firmware_free(fw);
 
 	hmcfgusb_close(dev);