Combine PDIProtocol and TPIProtocol into a single XPROGProtocol set of files.

[pub/USBasp.git] / Demos / Device / LowLevel / Joystick / Joystick.h

diff --git a/Demos/Device/LowLevel/Joystick/Joystick.h b/Demos/Device/LowLevel/Joystick/Joystick.h
index c50d7f0..bf339fe 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/Joystick.h
+++ b/Demos/Device/LowLevel/Joystick/Joystick.h
@@ -52,7 +52,7 @@
 \r
        /* Macros: */\r
                /** HID Class specific request to get the next HID report from the device. */\r
-               #define REQ_GetReport   0x01\r
+               #define REQ_GetReport             0x01\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
@@ -81,10 +81,10 @@
                void SetupHardware(void);\r
                void HID_Task(void);\r
 \r
-               void EVENT_USB_Connect(void);\r
-               void EVENT_USB_Disconnect(void);\r
-               void EVENT_USB_ConfigurationChanged(void);\r
-               void EVENT_USB_UnhandledControlPacket(void);\r
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
 \r
                bool GetNextReport(USB_JoystickReport_Data_t* ReportData);\r
 \r