diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-08 21:56:18 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-08 21:56:18 +0000 |
| commit | 4dde844e9f12bca880f88f952231a614d5d912ad (patch) | |
| tree | 127b812edec7e3588a4497d1c4901087cbf89701 /Demos | |
| parent | 34dc7f241fe0627e21c3a218123d5d9fbc97374c (diff) | |
| download | lufa-4dde844e9f12bca880f88f952231a614d5d912ad.tar.gz lufa-4dde844e9f12bca880f88f952231a614d5d912ad.tar.bz2 lufa-4dde844e9f12bca880f88f952231a614d5d912ad.zip | |
Remove dependancies from the LowLevel demos to the ClassDriver demos, since the use of ClassDriver headers now outputs an error when NO_STREAM_CALLBACKS is used.
Diffstat (limited to 'Demos')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/makefile | 3 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/makefile | 3 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h | 10 | ||||
| -rw-r--r-- | Demos/Host/LowLevel/MouseHost/MouseHost.h | 10 |
4 files changed, 20 insertions, 6 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile index 80f5e9572..5eda91b67 100644 --- a/Demos/Device/ClassDriver/AudioInput/makefile +++ b/Demos/Device/ClassDriver/AudioInput/makefile @@ -116,8 +116,7 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options
-LUFA_OPTS = -D NO_STREAM_CALLBACKS
-LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile index b22ebf47c..4729f1ffe 100644 --- a/Demos/Device/ClassDriver/AudioOutput/makefile +++ b/Demos/Device/ClassDriver/AudioOutput/makefile @@ -116,8 +116,7 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options
-LUFA_OPTS = -D NO_STREAM_CALLBACKS
-LUFA_OPTS += -D USB_DEVICE_ONLY
+LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h index 4c4356d35..0176fd0c6 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h @@ -47,7 +47,6 @@ #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h>
- #include <LUFA/Drivers/USB/Class/HID.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h>
@@ -72,6 +71,15 @@ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
+ /* Type Defines: */
+ /** Type define for a standard Boot Protocol Keyboard report */
+ typedef struct
+ {
+ uint8_t Modifier; /**< Keyboard modifier byte, indicating pressed modifier keys (such as Shift, Control, etc.) */
+ uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */
+ uint8_t KeyCode[6]; /**< Key codes of the currently pressed keys */
+ } USB_KeyboardReport_Data_t;
+
/* Function Prototypes: */
void Keyboard_HID_Task(void);
void SetupHardware(void);
diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.h b/Demos/Host/LowLevel/MouseHost/MouseHost.h index 5173b3990..6a31c658b 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.h +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.h @@ -47,7 +47,6 @@ #include <LUFA/Version.h>
#include <LUFA/Drivers/Misc/TerminalCodes.h>
#include <LUFA/Drivers/USB/USB.h>
- #include <LUFA/Drivers/USB/Class/HID.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h>
#include <LUFA/Drivers/Board/LEDs.h>
@@ -72,6 +71,15 @@ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
+ /* Type Defines: */
+ /** Type define for a standard Boot Protocol Mouse report */
+ typedef struct
+ {
+ uint8_t Button; /**< Button mask for currently pressed buttons in the mouse */
+ int8_t X; /**< Current delta X movement of the mouse */
+ int8_t Y; /**< Current delta Y movement on the mouse */
+ } USB_MouseReport_Data_t;
+
/* Function Prototypes: */
void Mouse_HID_Task(void);
void SetupHardware(void);
|