X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/ed031c1df2f5b053b9cd9f48c63e66a42b7c049e..b3a4d8512bcaf0feba16a3cbeeaabfcfeb9cf051:/Demos/Device/Keyboard/Keyboard.h

diff --git a/Demos/Device/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h
index 143ffc654..c4ed6e07c 100644
--- a/Demos/Device/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
@@ -49,29 +49,31 @@
 
 		#include <LUFA/Version.h>                    // Library Version Information
 		#include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management
-		#include <LUFA/Common/ButtLoadTag.h>         // PROGMEM tags readable by the ButtLoad project
 		#include <LUFA/Drivers/USB/USB.h>            // USB Functionality
 		#include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver
 		#include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver
 
 	/* Macros: */
+		/** Idle period indicating that reports should be sent only when the inputs have changed */
+		#define HID_IDLE_CHANGESONLY   0
+
 		/** HID Class specific request to get the next HID report from the device. */
-		#define REQ_GetReport      0x01
+		#define REQ_GetReport          0x01
 
 		/** HID Class specific request to get the idle timeout period of the device. */
-		#define REQ_GetIdle        0x02
+		#define REQ_GetIdle            0x02
 
 		/** HID Class specific request to send the next HID report to the device. */
-		#define REQ_SetReport      0x09
+		#define REQ_SetReport          0x09
 
 		/** HID Class specific request to set the idle timeout period of the device. */
-		#define REQ_SetIdle        0x0A
+		#define REQ_SetIdle            0x0A
 
 		/** HID Class specific request to get the current HID protocol in use, either report or boot. */
-		#define REQ_GetProtocol    0x03
+		#define REQ_GetProtocol        0x03
 
 		/** HID Class specific request to set the current HID protocol in use, either report or boot. */
-		#define REQ_SetProtocol    0x0B
+		#define REQ_SetProtocol        0x0B
 		
 	/* Task Definitions: */
 		TASK(USB_Keyboard_Report);
@@ -95,28 +97,17 @@
 			Status_USBEnumerating = 1, /**< USB interface is enumerating */
 			Status_USBReady       = 2, /**< USB interface is connected and ready */
 		};
-
-	/* Event Handlers: */
-		/** Indicates that this module will catch the USB_Connect event when thrown by the library. */
-		HANDLES_EVENT(USB_Connect);
-
-		/** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */
-		HANDLES_EVENT(USB_Disconnect);
-
-		/** Indicates that this module will catch the USB_Reset event when thrown by the library. */
-		HANDLES_EVENT(USB_Reset);
-
-		/** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */
-		HANDLES_EVENT(USB_ConfigurationChanged);
-
-		/** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */
-		HANDLES_EVENT(USB_UnhandledControlPacket);
 		
 	/* Function Prototypes: */
+		void EVENT_USB_Connect(void);
+		void EVENT_USB_Disconnect(void);
+		void EVENT_USB_ConfigurationChanged(void);
+		void EVENT_USB_UnhandledControlPacket(void);
+
 		void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData);
 		void ProcessLEDReport(uint8_t LEDReport);
-		static inline void SendNextReport(void);
-		static inline void ReceiveNextReport(void);
+		void SendNextReport(void);
+		void ReceiveNextReport(void);
 		void UpdateStatus(uint8_t CurrentStatus);
-		
+
 #endif