From 69fa44473b4deea26200aab1537d39e8ffac949b Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Thu, 18 Oct 2012 15:03:23 -0400
Subject: Updating USB core to work at 8 MHz (different PLLCSR value).

---
 cores/arduino/USBCore.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cores/arduino/USBCore.cpp')

diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index 8bcf66c..decfd6b 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -638,7 +638,11 @@ void USBDevice_::attach()
 	_usbConfiguration = 0;
 	UHWCON = 0x01;						// power internal reg
 	USBCON = (1<<USBE)|(1<<FRZCLK);		// clock frozen, usb enabled
+#if F_CPU == 16000000UL
 	PLLCSR = 0x12;						// Need 16 MHz xtal
+#elif F_CPU == 8000000UL
+	PLLCSR = 0x02;						// Need 8 MHz xtal
+#endif
 	while (!(PLLCSR & (1<<PLOCK)))		// wait for lock pll
 		;
 
-- 
cgit v1.2.3-18-g5258


From 42ca56fb830d60060a839038865708cd8d596270 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sat, 27 Oct 2012 14:12:26 -0400
Subject: Adding Micro.

---
 cores/arduino/USBCore.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'cores/arduino/USBCore.cpp')

diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index decfd6b..91b2594 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -53,6 +53,8 @@ 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',' ',' ',' '
 #else
 	'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
 #endif
-- 
cgit v1.2.3-18-g5258


From cfec7864e97876305cf7cfffacf184257a1cf274 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Thu, 1 Nov 2012 10:45:50 -0400
Subject: Adding LilyPad Arduino USB.

---
 cores/arduino/USBCore.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cores/arduino/USBCore.cpp')

diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp
index 91b2594..dfc0f21 100644
--- a/cores/arduino/USBCore.cpp
+++ b/cores/arduino/USBCore.cpp
@@ -55,6 +55,8 @@ const u16 STRING_IPRODUCT[17] = {
 	'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 == 0x9208
+	'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
 #else
 	'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
 #endif
@@ -64,6 +66,8 @@ const u16 STRING_IMANUFACTURER[12] = {
 	(3<<8) | (2+2*11),
 #if USB_VID == 0x2341
 	'A','r','d','u','i','n','o',' ','L','L','C'
+#elif USB_VID == 0x1b4f
+	'S','p','a','r','k','F','u','n',' ',' ',' '
 #else
 	'U','n','k','n','o','w','n',' ',' ',' ',' '
 #endif
-- 
cgit v1.2.3-18-g5258