Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	hardware/arduino/avr/cores/arduino/USBCore.cpp

1 files changed, 40 insertions, 30 deletions

diff --git a/cores/robot/USBCore.cpp b/cores/robot/USBCore.cpp
index d3e0170..c46c75f 100644
--- a/cores/robot/USBCore.cpp
+++ b/cores/robot/USBCore.cpp
@@ -39,8 +39,8 @@ volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
 //==================================================================
 
 extern const u16 STRING_LANGUAGE[] PROGMEM;
-extern const u16 STRING_IPRODUCT[] PROGMEM;
-extern const u16 STRING_IMANUFACTURER[] PROGMEM;
+extern const u8 STRING_PRODUCT[] PROGMEM;
+extern const u8 STRING_MANUFACTURER[] PROGMEM;
 extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
 extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
 
@@ -49,31 +49,24 @@ const u16 STRING_LANGUAGE[2] = {
 	0x0409	// English
 };
 
-const u16 STRING_IPRODUCT[17] = {
-	(3<<8) | (2+2*16),
-#if USB_PID == 0x8036	
-	'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
-#elif USB_PID == 0x8037
-	'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
-#elif USB_PID == 0x803C
-	'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
-#elif USB_PID == 0x9208
-	'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
-#else
-	'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
+#ifndef USB_PRODUCT
+// If no product is provided, use USB IO Board
+#define USB_PRODUCT     "USB IO Board"
 #endif
-};
 
-const u16 STRING_IMANUFACTURER[12] = {
-	(3<<8) | (2+2*11),
+const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT;
+
 #if USB_VID == 0x2341
-	'A','r','d','u','i','n','o',' ','L','L','C'
+#define USB_MANUFACTURER "Arduino LLC"
 #elif USB_VID == 0x1b4f
-	'S','p','a','r','k','F','u','n',' ',' ',' '
-#else
-	'U','n','k','n','o','w','n',' ',' ',' ',' '
+#define USB_MANUFACTURER "SparkFun"
+#elif !defined(USB_MANUFACTURER)
+// Fall through to unknown if no manufacturer name was provided in a macro
+#define USB_MANUFACTURER "Unknown"
 #endif
-};
+
+const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;
+
 
 #ifdef CDC_ENABLED
 #define DEVICE_CLASS 0x02
@@ -416,6 +409,22 @@ int USB_SendControl(u8 flags, const void* d, int len)
 	return sent;
 }
 
+// Send a USB descriptor string. The string is stored in PROGMEM as a
+// plain ASCII string but is sent out as UTF-16 with the correct 2-byte
+// prefix
+static bool USB_SendStringDescriptor(const u8*string_P, u8 string_len) {
+        SendControl(2 + string_len * 2);
+        SendControl(3);
+        for(u8 i = 0; i < string_len; i++) {
+                bool r = SendControl(pgm_read_byte(&string_P[i]));
+                r &= SendControl(0); // high byte
+                if(!r) {
+                        return false;
+                }
+        }
+        return true;
+}
+
 //	Does not timeout or cross fifo boundaries
 //	Will only work for transfers <= 64 bytes
 //	TODO
@@ -476,7 +485,6 @@ bool SendDescriptor(Setup& setup)
 		return HID_GetDescriptor(t);
 #endif
 
-	u8 desc_length = 0;
 	const u8* desc_addr = 0;
 	if (USB_DEVICE_DESCRIPTOR_TYPE == t)
 	{
@@ -486,20 +494,22 @@ bool SendDescriptor(Setup& setup)
 	}
 	else if (USB_STRING_DESCRIPTOR_TYPE == t)
 	{
-		if (setup.wValueL == 0)
+		if (setup.wValueL == 0) {
 			desc_addr = (const u8*)&STRING_LANGUAGE;
-		else if (setup.wValueL == IPRODUCT) 
-			desc_addr = (const u8*)&STRING_IPRODUCT;
-		else if (setup.wValueL == IMANUFACTURER)
-			desc_addr = (const u8*)&STRING_IMANUFACTURER;
+		}
+		else if (setup.wValueL == IPRODUCT) {
+			return USB_SendStringDescriptor(STRING_PRODUCT, strlen(USB_PRODUCT));
+		}
+		else if (setup.wValueL == IMANUFACTURER) {
+			return USB_SendStringDescriptor(STRING_MANUFACTURER, strlen(USB_MANUFACTURER));
+		}
 		else
 			return false;
 	}
 
 	if (desc_addr == 0)
 		return false;
-	if (desc_length == 0)
-		desc_length = pgm_read_byte(desc_addr);
+	u8 desc_length = pgm_read_byte(desc_addr);
 
 	USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
 	return true;