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 /Projects | |
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 'Projects')
-rw-r--r-- | Projects/Benito/Benito.c | 12 | ||||
-rw-r--r-- | Projects/Benito/Benito.h | 8 | ||||
-rw-r--r-- | Projects/Magstripe/Magstripe.c | 6 | ||||
-rw-r--r-- | Projects/Magstripe/Magstripe.h | 4 | ||||
-rw-r--r-- | Projects/MissileLauncher/MissileLauncher.c | 10 | ||||
-rw-r--r-- | Projects/MissileLauncher/MissileLauncher.h | 10 |
6 files changed, 25 insertions, 25 deletions
diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index 26c5664962..d7e0413a6d 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -155,21 +155,21 @@ void SetupHardware(void) }
/** Event handler for the library USB Connection event. */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
{
PingPongMSRemaining = PING_PONG_LED_PULSE_MS;
LEDs_SetAllLEDs(LEDMASK_TX);
}
/** Event handler for the library USB Disconnection event. */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
{
PingPongMSRemaining = 0;
LEDs_TurnOffLEDs(LEDMASK_BUSY);
}
/** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
{
PingPongMSRemaining = 0;
LEDs_TurnOffLEDs(LEDMASK_BUSY);
@@ -178,10 +178,10 @@ void EVENT_USB_ConfigurationChanged(void) LEDs_TurnOnLEDs(LEDMASK_ERROR);
}
-/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_UnhandledControlPacket(void)
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
{
- CDC_Device_ProcessControlPacket(&VirtualSerial_CDC_Interface);
+ CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
}
/** Event handler for the CDC Class driver Line Encoding Changed event.
diff --git a/Projects/Benito/Benito.h b/Projects/Benito/Benito.h index 740319f64e..3b0dfcd2cb 100644 --- a/Projects/Benito/Benito.h +++ b/Projects/Benito/Benito.h @@ -64,10 +64,10 @@ /* Function Prototypes: */
void SetupHardware(void);
- void EVENT_USB_Connect(void);
- void EVENT_USB_Disconnect(void);
- void EVENT_USB_ConfigurationChanged(void);
- void EVENT_USB_UnhandledControlPacket(void);
+ void EVENT_USB_Device_Connect(void);
+ void EVENT_USB_Device_Disconnect(void);
+ void EVENT_USB_Device_ConfigurationChanged(void);
+ void EVENT_USB_Device_UnhandledControlRequest(void);
void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index f0fd8a7d0e..5be34492ac 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -145,15 +145,15 @@ void ReadMagstripeData(void) }
/** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
{
HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface);
}
/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_UnhandledControlPacket(void)
+void EVENT_USB_Device_UnhandledControlRequest(void)
{
- HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);
+ HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
}
/** Timer 0 CTC ISR, firing once each millisecond to keep track of elapsed idle time in the HID interface. */
diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index 279e3db2eb..7cbda8302d 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -82,8 +82,8 @@ void SetupHardware(void);
void ReadMagstripeData(void);
- void EVENT_USB_ConfigurationChanged(void);
- void EVENT_USB_UnhandledControlPacket(void);
+ void EVENT_USB_Device_ConfigurationChanged(void);
+ void EVENT_USB_Device_UnhandledControlRequest(void);
bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,
void* ReportData, uint16_t* ReportSize);
diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c index 50a8009bba..d15613eb8f 100644 --- a/Projects/MissileLauncher/MissileLauncher.c +++ b/Projects/MissileLauncher/MissileLauncher.c @@ -186,7 +186,7 @@ void Send_Command(uint8_t* Command) /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
* starts the library USB task to begin the enumeration and USB management process.
*/
-void EVENT_USB_DeviceAttached(void)
+void EVENT_USB_Host_DeviceAttached(void)
{
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
}
@@ -194,7 +194,7 @@ void EVENT_USB_DeviceAttached(void) /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
* stops the library USB task management process.
*/
-void EVENT_USB_DeviceUnattached(void)
+void EVENT_USB_Host_DeviceUnattached(void)
{
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
}
@@ -202,13 +202,13 @@ void EVENT_USB_DeviceUnattached(void) /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
* enumerated by the host and is now ready to be used by the application.
*/
-void EVENT_USB_DeviceEnumerationComplete(void)
+void EVENT_USB_Host_DeviceEnumerationComplete(void)
{
LEDs_SetAllLEDs(LEDMASK_USB_READY);
}
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
-void EVENT_USB_HostError(const uint8_t ErrorCode)
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{
USB_ShutDown();
@@ -219,7 +219,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
* enumerating an attached USB device.
*/
-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
{
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h index 3730b2c871..86fbe86020 100644 --- a/Projects/MissileLauncher/MissileLauncher.h +++ b/Projects/MissileLauncher/MissileLauncher.h @@ -87,11 +87,11 @@ void HID_Host_Task(void);
- void EVENT_USB_HostError(const uint8_t ErrorCode);
- void EVENT_USB_DeviceAttached(void);
- void EVENT_USB_DeviceUnattached(void);
- void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
- void EVENT_USB_DeviceEnumerationComplete(void);
+ void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
+ void EVENT_USB_Host_DeviceAttached(void);
+ void EVENT_USB_Host_DeviceUnattached(void);
+ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);
+ void EVENT_USB_Host_DeviceEnumerationComplete(void);
void DiscardNextReport(void);
void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength);
|