[PHID] Fixes protocol on reenumeration

NicoHood · NicoHood · commit ca3c821c0439 · 2015-10-12T18:05:34.000+02:00
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
@@ -54,6 +54,11 @@ int HID_::getDescriptor(USBSetup& setup)
 			return -1;
 		total += res;
 	}
+	
+	// Reset the protocol on reenumeration. Normally the host should not assume the state of the protocol
+	// due to the USB specs, but Windows and Linux just assumes its in report mode.
+	protocol = HID_REPORT_PROTOCOL;
+	
 	return total;
 }
 
@@ -130,7 +135,7 @@ bool HID_::setup(USBSetup& setup)
 
 HID_::HID_(void) : PluggableUSBModule(1, 1, epType),
                    rootNode(NULL), descriptorSize(0),
-                   protocol(1), idle(1)
+                   protocol(HID_REPORT_PROTOCOL), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ int HID_::getDescriptor(USBSetup& setup)`
`54`	`54`	`return -1;`
`55`	`55`	`total += res;`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+ // Reset the protocol on reenumeration. Normally the host should not assume the state of the protocol`
	`59`	`+ // due to the USB specs, but Windows and Linux just assumes its in report mode.`
	`60`	`+ protocol = HID_REPORT_PROTOCOL;`
	`61`	`+`
`57`	`62`	`return total;`
`58`	`63`	`}`
`59`	`64`
`@@ -130,7 +135,7 @@ bool HID_::setup(USBSetup& setup)`
`130`	`135`
`131`	`136`	`HID_::HID_(void) : PluggableUSBModule(1, 1, epType),`
`132`	`137`	`rootNode(NULL), descriptorSize(0),`
`133`		`- protocol(1), idle(1)`
	`138`	`+ protocol(HID_REPORT_PROTOCOL), idle(1)`
`134`	`139`	`{`
`135`	`140`	`epType[0] = EP_TYPE_INTERRUPT_IN;`
`136`	`141`	`PluggableUSB().plug(this);`