Fix for some strange behaviours during board reset

cmaglie · cmaglie · commit b407337677f8 · 2012-03-07T16:21:04.000+01:00
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
@@ -637,6 +637,12 @@ void USB_::attach()
 	PLLCSR = 0x12;						// Need 16 MHz xtal
 	while (!(PLLCSR & (1<<PLOCK)))		// wait for lock pll
 		;
+
+	// Some tests on specific versions of macosx (10.7.3), reported some
+	// strange behaviuors when the board is reset using the serial
+	// port touch at 1200 bps. This delay fixes this behaviour.
+	delay(1);
+
 	USBCON = ((1<<USBE)|(1<<OTGPADE));	// start USB clock
 	UDIEN = (1<<EORSTE)|(1<<SOFE);		// Enable interrupts for EOR (End of Reset) and SOF (start of frame)
 	UDCON = 0;							// enable attach resistor
@@ -659,4 +665,4 @@ void USB_::poll()
 {
 }
 
-#endif /* if defined(USBCON) */
+#endif /* if defined(USBCON) */

Original file line number	Diff line number	Diff line change
`@@ -637,6 +637,12 @@ void USB_::attach()`
`637`	`637`	`PLLCSR = 0x12; // Need 16 MHz xtal`
`638`	`638`	`while (!(PLLCSR & (1<<PLOCK))) // wait for lock pll`
`639`	`639`	`;`
	`640`	`+`
	`641`	`+ // Some tests on specific versions of macosx (10.7.3), reported some`
	`642`	`+ // strange behaviuors when the board is reset using the serial`
	`643`	`+ // port touch at 1200 bps. This delay fixes this behaviour.`
	`644`	`+ delay(1);`
	`645`	`+`
`640`	`646`	`USBCON = ((1<<USBE)\|(1<<OTGPADE)); // start USB clock`
`641`	`647`	`UDIEN = (1<<EORSTE)\|(1<<SOFE); // Enable interrupts for EOR (End of Reset) and SOF (start of frame)`
`642`	`648`	`UDCON = 0; // enable attach resistor`
`@@ -659,4 +665,4 @@ void USB_::poll()`
`659`	`665`	`{`
`660`	`666`	`}`
`661`	`667`
`662`		`-#endif /* if defined(USBCON) */`
	`668`	`+#endif /* if defined(USBCON) */`