From: Keith Packard <keithp@keithp.com>
Date: Tue, 24 Aug 2010 11:02:27 +0000 (-0700)
Subject: altosui: write USB serial number string while flashing
X-Git-Tag: debian/0.6+373+gcf65c6b~18
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ba086cc77273efe5397f60dcaccd1e3771441481

altosui: write USB serial number string while flashing

USB serial number is encoded in UCS2 as a part of the string
descriptors. Place those right after the other rom config bits so that
altosui can find it. altosui is changed to write the serial number there.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/altosui/AltosRomconfig.java b/ao-tools/altosui/AltosRomconfig.java
index 844da7c4..8c9cb27a 100644
--- a/ao-tools/altosui/AltosRomconfig.java
+++ b/ao-tools/altosui/AltosRomconfig.java
@@ -47,14 +47,57 @@ public class AltosRomconfig {
 		}
 	}
 
+	static void put_string(String value, byte[] bytes, int start) {
+		for (int i = 0; i < value.length(); i++)
+			bytes[start + i] = (byte) value.charAt(i);
+	}
+
+	static final int AO_USB_DESC_STRING	= 3;
+
+	static void put_usb_serial(int value, byte[] bytes, int start) {
+		int offset = start + 0xa;
+		int string_num = 0;
+		System.out.printf("Put usb serial %d\n", value);
+
+		while (offset < bytes.length && bytes[offset] != 0) {
+			if (bytes[offset + 1] == AO_USB_DESC_STRING) {
+				++string_num;
+				if (string_num == 4)
+					break;
+			}
+			offset += ((int) bytes[offset]) & 0xff;
+		}
+		System.out.printf("offset %d content %d\n",
+				  offset, bytes[offset]);
+		if (offset >= bytes.length || bytes[offset] == 0)
+			return;
+		int len = ((((int) bytes[offset]) & 0xff) - 2) / 2;
+		String fmt = String.format("%%0%dd", len);
+		System.out.printf("existing serial length %d format %s\n", len, fmt);
+
+		String s = String.format(fmt, value);
+		if (s.length() != len) {
+			System.out.printf("weird usb length issue %s isn't %d\n",
+					  s, len);
+			return;
+		}
+		for (int i = 0; i < len; i++) {
+			bytes[offset + 2 + i*2] = (byte) s.charAt(i);
+			bytes[offset + 2 + i*2+1] = 0;
+		}
+	}
+
 	public AltosRomconfig(byte[] bytes, int offset) {
 		version = get_int(bytes, offset + 0, 2);
 		check = get_int(bytes, offset + 2, 2);
+		System.out.printf("version %d check %d\n", version, check);
 		if (check == (~version & 0xffff)) {
 			switch (version) {
+			case 2:
 			case 1:
 				serial_number = get_int(bytes, offset + 4, 2);
 				radio_calibration = get_int(bytes, offset + 6, 4);
+				System.out.printf("serial %d cal %d\n", serial_number, radio_calibration);
 				valid = true;
 				break;
 			}
@@ -77,6 +120,8 @@ public class AltosRomconfig {
 			throw new IOException("image does not contain existing rom config");
 
 		switch (existing.version) {
+		case 2:
+			put_usb_serial(serial_number, bytes, offset);
 		case 1:
 			put_int(serial_number, bytes, offset + 4, 2);
 			put_int(radio_calibration, bytes, offset + 6, 4);
@@ -86,7 +131,9 @@ public class AltosRomconfig {
 
 	public void write (AltosHexfile hexfile) throws IOException {
 		write(hexfile.data, 0xa0 - hexfile.address);
-		new AltosRomconfig(hexfile);
+		AltosRomconfig check = new AltosRomconfig(hexfile);
+		if (!check.valid())
+			throw new IOException("writing new rom config failed\n");
 	}
 
 	public AltosRomconfig(int in_serial_number, int in_radio_calibration) {
diff --git a/ao-tools/altosui/AltosRomconfigUI.java b/ao-tools/altosui/AltosRomconfigUI.java
index 21c34ef4..bc511865 100644
--- a/ao-tools/altosui/AltosRomconfigUI.java
+++ b/ao-tools/altosui/AltosRomconfigUI.java
@@ -143,12 +143,31 @@ public class AltosRomconfigUI
 		return Integer.parseInt(serial_value.getText());
 	}
 
+	void set_serial(int serial) {
+		serial_value.setText(String.format("%d", serial));
+	}
+
 	int radio_calibration() {
 		return Integer.parseInt(radio_calibration_value.getText());
 	}
 
+	void set_radio_calibration(int calibration) {
+		radio_calibration_value.setText(String.format("%d", calibration));
+	}
+
+	public void set(AltosRomconfig config) {
+		if (config != null && config.valid()) {
+			set_serial(config.serial_number);
+			set_radio_calibration(config.radio_calibration);
+		}
+	}
+
 	public AltosRomconfig romconfig() {
-		return new AltosRomconfig(serial(), radio_calibration());
+		try {
+			return new AltosRomconfig(serial(), radio_calibration());
+		} catch (NumberFormatException ne) {
+			return null;
+		}
 	}
 
 	public AltosRomconfig showDialog() {
diff --git a/src/ao.h b/src/ao.h
index 9c418db2..d289ced1 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -293,12 +293,13 @@ ao_led_init(uint8_t enable);
  * ao_romconfig.c
  */
 
-#define AO_ROMCONFIG_VERSION	1
+#define AO_ROMCONFIG_VERSION	2
 
 extern __code __at (0x00a0) uint16_t ao_romconfig_version;
 extern __code __at (0x00a2) uint16_t ao_romconfig_check;
 extern __code __at (0x00a4) uint16_t ao_serial_number;
 extern __code __at (0x00a6) uint32_t ao_radio_cal;
+extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
 
 /*
  * ao_usb.c
@@ -1008,7 +1009,7 @@ ao_rssi_init(uint8_t rssi_led);
  * each instance of a product
  */
 
-extern const uint8_t ao_usb_descriptors [];
+extern __code __at(0x00aa) uint8_t ao_usb_descriptors [];
 extern const char ao_version[];
 extern const char ao_manufacturer[];
 extern const char ao_product[];
diff --git a/src/ao_product.c b/src/ao_product.c
index f0eb4c07..82d6298f 100644
--- a/src/ao_product.c
+++ b/src/ao_product.c
@@ -28,7 +28,7 @@ const char ao_product[] = AO_iProduct_STRING;
 #define LE_WORD(x)    ((x)&0xFF),((uint8_t) (((uint16_t) (x))>>8))
 
 /* USB descriptors in one giant block of bytes */
-const uint8_t ao_usb_descriptors [] =
+__code __at(0x00aa) uint8_t ao_usb_descriptors [] =
 {
 	/* Device descriptor */
 	0x12,