[USB] use plugged modules name to create iSerial field

Author: facchinm

Diff for: hardware/arduino/avr/cores/arduino/PluggableUSB.cpp

@@ -50,6 +50,18 @@ int PluggableUSB_::getDescriptor(USBSetup& setup)
 	return 0;
 }
 
+char* PluggableUSB_::getShortName(void)
+{
+	char* ret = 0;
+	memset(_iSerialNum, 0, sizeof(_iSerialNum));
+	PluggableUSBModule* node;
+	for (node = rootNode; node; node = node->next) {
+		ret = node->getShortName();
+		memcpy(&_iSerialNum[strlen(_iSerialNum)], ret, strlen(ret));
+	}
+	return _iSerialNum;
+}
+
 bool PluggableUSB_::setup(USBSetup& setup)
 {
 	PluggableUSBModule* node;

Diff for: hardware/arduino/avr/cores/arduino/PluggableUSB.h

@@ -35,6 +35,7 @@ class PluggableUSBModule {
   virtual bool setup(USBSetup& setup) = 0;
   virtual int getInterface(uint8_t* interfaceCount) = 0;
   virtual int getDescriptor(USBSetup& setup) = 0;
+  virtual char* getShortName(void) = 0;
 
   uint8_t pluggedInterface;
   uint8_t pluggedEndpoint;
@@ -55,10 +56,12 @@ class PluggableUSB_ {
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
+  char* getShortName(void);
 
 private:
   uint8_t lastIf;
   uint8_t lastEp;
+  char _iSerialNum[20] = {0};
   PluggableUSBModule* rootNode;
 };
 

Diff for: hardware/arduino/avr/cores/arduino/USBCore.cpp

@@ -18,6 +18,7 @@
 
 #include "USBAPI.h"
 #include "PluggableUSB.h"
+#include <stdlib.h>
 
 #if defined(USBCON)
 
@@ -69,10 +70,10 @@ const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;
 
 //	DEVICE DESCRIPTOR
 const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,ISERIAL,1);
 
 const DeviceDescriptor USB_DeviceDescriptorB =
-	D_DEVICE(0xEF,0x02,0x01,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+	D_DEVICE(0xEF,0x02,0x01,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,ISERIAL,1);
 
 //==================================================================
 //==================================================================
@@ -409,11 +410,12 @@ int USB_SendControl(u8 flags, const void* d, int len)
 // 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) {
+static bool USB_SendStringDescriptor(const u8*string_P, u8 string_len, uint8_t flags) {
         SendControl(2 + string_len * 2);
         SendControl(3);
+        bool pgm = flags & TRANSFER_PGM;
         for(u8 i = 0; i < string_len; i++) {
-                bool r = SendControl(pgm_read_byte(&string_P[i]));
+                bool r = SendControl(pgm ? pgm_read_byte(&string_P[i]) : string_P[i]);
                 r &= SendControl(0); // high byte
                 if(!r) {
                         return false;
@@ -495,10 +497,16 @@ bool SendDescriptor(USBSetup& setup)
 			desc_addr = (const u8*)&STRING_LANGUAGE;
 		}
 		else if (setup.wValueL == IPRODUCT) {
-			return USB_SendStringDescriptor(STRING_PRODUCT, strlen(USB_PRODUCT));
+			return USB_SendStringDescriptor(STRING_PRODUCT, strlen(USB_PRODUCT), TRANSFER_PGM);
 		}
 		else if (setup.wValueL == IMANUFACTURER) {
-			return USB_SendStringDescriptor(STRING_MANUFACTURER, strlen(USB_MANUFACTURER));
+			return USB_SendStringDescriptor(STRING_MANUFACTURER, strlen(USB_MANUFACTURER), TRANSFER_PGM);
+		}
+		else if (setup.wValueL == ISERIAL) {
+#ifdef PLUGGABLE_USB_ENABLED
+			char* name = PluggableUSB().getShortName();
+			return USB_SendStringDescriptor((uint8_t*)name, strlen(name), 0);
+#endif
 		}
 		else
 			return false;

Diff for: hardware/arduino/avr/cores/arduino/USBDesc.h

@@ -39,6 +39,6 @@
 #define CDC_RX CDC_ENDPOINT_OUT
 #define CDC_TX CDC_ENDPOINT_IN
 
-#define IMANUFACTURER	1
-#define IPRODUCT		2
-
+#define IMANUFACTURER   1
+#define IPRODUCT        2
+#define ISERIAL         3

Diff for: hardware/arduino/avr/libraries/HID/HID.cpp

@@ -57,6 +57,16 @@ int HID_::getDescriptor(USBSetup& setup)
 	return total;
 }
 
+char* HID_::getShortName()
+{
+	static char name[7] = {0};
+	char num[3];
+	memcpy(name, "HID", 3);
+	itoa(descriptorSize, num, 10);
+	memcpy(&name[3], num, 3);
+	return name;
+}
+
 void HID_::AppendDescriptor(HIDSubDescriptor *node)
 {
 	if (!rootNode) {

Diff for: hardware/arduino/avr/libraries/HID/HID.h

@@ -96,6 +96,7 @@ class HID_ : public PluggableUSBModule
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
+  char* getShortName(void);
 
 private:
   uint8_t epType[1];