fix pluggableUSB linked list

facchinm · facchinm · commit ccc0d3a702ff · 2015-07-02T12:08:53.000+02:00
diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp b/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp
@@ -33,7 +33,6 @@ extern u8 _initEndpoints[];
 static u8 modules_count = 0;
 
 static PUSBListNode* rootNode = NULL;
-static PUSBListNode* lastNode = NULL;
 
 int PUSB_GetInterface(u8* interfaceNum)
 {
@@ -76,9 +75,12 @@ int8_t PUSB_AddFunction(PUSBListNode *node, u8* interface)
 
 	if (modules_count == 0) {
 		rootNode = node;
-		lastNode = node;
 	} else {
-		lastNode->next = node;
+		PUSBListNode *current = rootNode;
+		while(current->next != NULL) {
+			current = current->next;
+		}
+		current->next = node;
 	}
 
 	*interface = lastIf;
diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.h b/hardware/arduino/avr/cores/arduino/PluggableUSB.h
@@ -25,7 +25,7 @@
 
 #if defined(USBCON)
 
-typedef struct
+typedef struct __attribute__((packed))
 {
   bool (*setup)(USBSetup& setup, u8 i);
   int (*getInterface)(u8* interfaceNum);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`#if defined(USBCON)`
`27`	`27`
`28`		`-typedef struct`
	`28`	`+typedef struct __attribute__((packed))`
`29`	`29`	`{`
`30`	`30`	`bool (*setup)(USBSetup& setup, u8 i);`
`31`	`31`	`int (getInterface)(u8 interfaceNum);`