From 042d3288ad52301c5b0ef69eada03eee83497dda Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Wed, 5 Aug 2009 07:18:08 +0000
Subject: [PATCH] Fix incorrect Event call name in USBInterrupt.c.
---
Demos/Device/ClassDriver/Mouse/Mouse.c | 2 +-
Demos/Device/ClassDriver/Mouse/Mouse.h | 8 ++++----
LUFA/Drivers/USB/HighLevel/USBInterrupt.c | 2 +-
LUFA/ManPages/FutureChanges.txt | 5 +++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c
index d26101381..32f8ca667 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.c
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.c
@@ -118,7 +118,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
}
/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_Device_UnhandledControlRequest(void)
+void EVENT_USB_Device_UnhandledControlRequest(void)
{
HID_Device_ProcessControlRequest(&Mouse_HID_Interface);
}
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index 709077fab..05b73c078 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -80,10 +80,10 @@
/* Function Prototypes: */
void SetupHardware(void);
- void EVENT_USB_Device_Device_Connect(void);
- void EVENT_USB_Device_Device_Disconnect(void);
- void EVENT_USB_Device_Device_ConfigurationChanged(void);
- void EVENT_USB_Device_Device_UnhandledControlRequest(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);
bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,
void* ReportData, uint16_t* ReportSize);
diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 56e54f25a..a039dffb6 100644
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -209,7 +209,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
USB_INT_Clear(USB_INT_IDTI);
if (USB_DeviceState != DEVICE_STATE_Unattached)
- EVENT_USB_Disconnect();
+ EVENT_USB_Device_Disconnect();
if (USB_HostState != HOST_STATE_Unattached)
EVENT_USB_Host_DeviceUnattached();
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 6d052a745..7a26a5b46 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -12,6 +12,9 @@
* or post your suggestion as an enhancement request to the project bug tracker.
*
* <b>Targeted for This Release:</b>
+ * - N/A
+ *
+ * <b>Targeted for Future Releases:</b>
* - Host Mode Class Drivers
* -# Make new host class drivers
* -# Document new host class drivers
@@ -19,8 +22,6 @@
* -# Re-enable Host mode Class driver builds after completion
* -# Update Host mode Class Driver demo .txt files
* - Add standardized descriptor names to device and host class driver structures
- *
- * <b>Targeted for Future Releases:</b>
* - Remake AVRStudio project files
* - Add detailed overviews of how each demo works
* - Master LUFA include file rather than per-module includes
--
GitLab