diff options
author | Dean Camera <[email protected]> | 2009-08-05 06:36:31 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-08-05 06:36:31 +0000 |
commit | c5038f1bf44aea75f1ae1ed035cb7d523ccfdacb (patch) | |
tree | 5cf62e8642cc53c49eb28f973db843df5f047ba3 /Bootloaders/TeensyHID | |
parent | 357ccc577bc6f8710ff942019e16cfa6a08466b7 (diff) | |
download | qmk_firmware-c5038f1bf44aea75f1ae1ed035cb7d523ccfdacb.tar.gz qmk_firmware-c5038f1bf44aea75f1ae1ed035cb7d523ccfdacb.zip |
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.
Diffstat (limited to 'Bootloaders/TeensyHID')
-rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.c | 6 | ||||
-rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.h | 4 | ||||
-rw-r--r-- | Bootloaders/TeensyHID/TeensyHID.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c index 52526689a0..bb5a0c7083 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 3c59605954..a05729a50a 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 93862c6746..4cf13082b9 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.
|