Renamed all library events to properly seperate out Device and Host mode events. Changed the firing conditions for some events to ensure that events are fired by their own USB mode only.

Remove VBUS events - not needed as the library takes care of VBUS detection and feedback on supported AVRs via the USB_Device_Connected and USB_Device_Disconnected events.

Fixed incorrect Host state assignment in the incomplete BluetoothHost demo.

7 files changed, 18 insertions, 18 deletions

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index cbcfd7e6c..6769a0c2d 100644
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -119,7 +119,7 @@ void ResetHardware(void)
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user

  *  application started.

  */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	/* Upon disconnection, run user application */

 	RunBootloader = false;

@@ -128,7 +128,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready

  *  to relay data to and from the attached USB host.

  */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	/* Setup CDC Notification, Rx and Tx Endpoints */

 	Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,

@@ -144,11 +144,11 @@ void EVENT_USB_ConfigurationChanged(void)
 	                           ENDPOINT_BANK_SINGLE);

 }

 

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific

  *  control requests that are not handled internally by the USB library, so that they can be handled appropriately

  *  for the application.

  */

-void EVENT_USB_UnhandledControlPacket(void)

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

 	uint8_t* LineCodingData = (uint8_t*)&LineCoding;

 

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index fa98a15b3..13a4f9f5e 100644
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -118,9 +118,9 @@
 		void SetupHardware(void);

 		void ResetHardware(void);

 

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		#if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)

 			static void    ReadWriteMemoryBlock(const uint8_t Command);

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index f9c8195f3..fb326a1d9 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -144,17 +144,17 @@ void ResetHardware(void)
 /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user

  *  application started.

  */

-void EVENT_USB_Disconnect(void)

+void EVENT_USB_Device_Disconnect(void)

 {

 	/* Upon disconnection, run user application */

 	RunBootloader = false;

 }

 

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific

  *  control requests that are not handled internally by the USB library (including the DFU commands, which are

  *  all issued via the control endpoint), so that they can be handled appropriately for the application.

  */

-void EVENT_USB_UnhandledControlPacket(void)

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

 	/* Get the size of the command and data from the wLength value */

 	SentCommand.DataSize = USB_ControlRequest.wLength;

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 9366c2284..11d91db79 100644
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -191,8 +191,8 @@
 		void SetupHardware(void);

 		void ResetHardware(void);

 

-		void EVENT_USB_Disconnect(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_Disconnect(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 

 		#if defined(INCLUDE_FROM_BOOTLOADER_C)

 			static void DiscardFillerBytes(uint8_t NumberOfBytes);

diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c
index 52526689a..bb5a0c708 100644
--- a/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@ -84,7 +84,7 @@ void SetupHardware(void)
 /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready

  *  to relay data to and from the attached USB host.

  */

-void EVENT_USB_ConfigurationChanged(void)

+void EVENT_USB_Device_ConfigurationChanged(void)

 {

 	/* Setup HID Report Endpoint */

 	Endpoint_ConfigureEndpoint(HID_EPNUM, EP_TYPE_INTERRUPT,

@@ -92,11 +92,11 @@ void EVENT_USB_ConfigurationChanged(void)
 	                           ENDPOINT_BANK_SINGLE);

 }

 

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific

  *  control requests that are not handled internally by the USB library (including the HID commands, which are

  *  all issued via the control endpoint), so that they can be handled appropriately for the application.

  */

-void EVENT_USB_UnhandledControlPacket(void)

+void EVENT_USB_Device_UnhandledControlRequest(void)

 {

 	/* Handle HID Class specific requests */

 	switch (USB_ControlRequest.bRequest)

diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 3c5960595..a05729a50 100644
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -64,7 +64,7 @@
 	/* Function Prototypes: */

 		void SetupHardware(void);

 

-		void EVENT_USB_ConfigurationChanged(void);

-		void EVENT_USB_UnhandledControlPacket(void);

+		void EVENT_USB_Device_ConfigurationChanged(void);

+		void EVENT_USB_Device_UnhandledControlRequest(void);

 		

 #endif

diff --git a/Bootloaders/TeensyHID/TeensyHID.txt b/Bootloaders/TeensyHID/TeensyHID.txt
index 93862c674..4cf13082b 100644
--- a/Bootloaders/TeensyHID/TeensyHID.txt
+++ b/Bootloaders/TeensyHID/TeensyHID.txt
@@ -47,7 +47,7 @@
  * This bootloader enumerates to the host as a HID Class device, allowing for Teensy compatible programming

  * software to load firmware onto the AVR, such as the official software at http://www.pjrc.com/teensy/.

  *  

- * Out of the box this bootloader builds for the USB162, and will fit into 2KB of bootloader space.

+ * Out of the box this bootloader builds for the AT90USB162, and will fit into 4KB of bootloader space.

  *

  * This spoofs (with permission) the official Teensy bootloader's VID and PID, so that the software remains

  * compatible with no changes.