diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-18 10:05:21 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-18 10:05:21 +0000 |
| commit | 2ee9fc707784e115d744dbc229bdc893f4bb6bc1 (patch) | |
| tree | 1f4de5f6d8e2a9bfe89d3263f19f9b9ebf855812 /Bootloaders/CDC/BootloaderCDC.c | |
| parent | 72c2922e38a2dfd14eb2d8e3692171704b5508f4 (diff) | |
| download | lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.tar.gz lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.tar.bz2 lufa-2ee9fc707784e115d744dbc229bdc893f4bb6bc1.zip | |
Rewritten event system to remove all macros, to make user code clearer.
Fixed incorrect ENDPOINT_EPNUM_MASK mask preventing endpoints above EP3 from being selected (thanks to Jonathan Oakley).
Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code.
Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code.
Diffstat (limited to 'Bootloaders/CDC/BootloaderCDC.c')
| -rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f36c4fc3e..265e90f8f 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -119,7 +119,7 @@ int main(void) /** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user
* application started.
*/
-EVENT_HANDLER(USB_Disconnect)
+void EVENT_USB_Disconnect(void)
{
/* Upon disconnection, run user application */
RunBootloader = false;
@@ -128,7 +128,7 @@ EVENT_HANDLER(USB_Disconnect) /** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready
* to relay data to and from the attached USB host.
*/
-EVENT_HANDLER(USB_ConfigurationChanged)
+void EVENT_USB_ConfigurationChanged(void)
{
/* Setup CDC Notification, Rx and Tx Endpoints */
Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
@@ -148,7 +148,7 @@ EVENT_HANDLER(USB_ConfigurationChanged) * control requests that are not handled internally by the USB library, so that they can be handled appropriately
* for the application.
*/
-EVENT_HANDLER(USB_UnhandledControlPacket)
+void EVENT_USB_UnhandledControlPacket(void)
{
uint8_t* LineCodingData = (uint8_t*)&LineCoding;
|