From 4dde844e9f12bca880f88f952231a614d5d912ad Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 8 Nov 2009 21:56:18 +0000 Subject: [PATCH] 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. --- Demos/Device/ClassDriver/AudioInput/makefile | 3 +-- Demos/Device/ClassDriver/AudioOutput/makefile | 3 +-- Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h | 10 +++++++++- Demos/Host/LowLevel/MouseHost/MouseHost.h | 10 +++++++++- LUFA/Drivers/Board/Temperature.h | 2 +- LUFA/Drivers/USB/USB.h | 4 ++-- LUFA/ManPages/FutureChanges.txt | 9 +++++++-- LUFA/ManPages/WhyUseLUFA.txt | 2 +- Projects/AVRISP/Descriptors.h | 1 - 9 files changed, 31 insertions(+), 13 deletions(-) diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile index 80f5e95728..5eda91b678 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 b22ebf47cb..4729f1ffe7 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 4c4356d351..0176fd0c6e 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h @@ -47,7 +47,6 @@ #include #include #include - #include #include #include @@ -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 5173b39902..6a31c658bb 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.h +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.h @@ -47,7 +47,6 @@ #include #include #include - #include #include #include @@ -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); diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h index f4ecf71b73..1a94d1416d 100644 --- a/LUFA/Drivers/Board/Temperature.h +++ b/LUFA/Drivers/Board/Temperature.h @@ -34,7 +34,7 @@ */ /** \ingroup Group_BoardDrivers - * @defgroup Group_Temperature Temperature Driver - LUFA/Drivers/Board/Temperature.h + * @defgroup Group_Temperature Temperature Sensor Driver - LUFA/Drivers/Board/Temperature.h * * \section Sec_Dependencies Module Source Dependencies * The following files must be built with any user project that uses this module: diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index 86b286eaf4..b9b506fb10 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -104,13 +104,13 @@ * * * Printer - * No + * Yes * Yes * * * RNDIS - * No * Yes + * No * * * Still Image diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index 447c34b5db..60afc3fa67 100644 --- a/LUFA/ManPages/FutureChanges.txt +++ b/LUFA/ManPages/FutureChanges.txt @@ -21,14 +21,19 @@ * - Add detailed overviews of how each demo works * - Master LUFA include file rather than per-module includes * - Change makefiles to allow for absolute LUFA location to be used - * - Add RNDIS Host Class driver * - Add unit testing to APIs * - Add board overviews * - Add resume interrupt support + * - Specification compliance testing for all device demos + * - Add RNDIS Host Class driver * - Make new demos * -# Keyboard/Mouse Dual Class Host * -# Multiple-Report HID device - * - Port LUFA to other architectures + * - Port LUFA codebase * -# AVR32 UC3B series microcontrollers * -# Atmel ARM7 series microcontrollers + * -# Other (commercial) C compilers + * - Extend AVRISP project + * -# Add alternate USB-to-Serial mode + * -# Add alternate USB-to-TWI mode */ diff --git a/LUFA/ManPages/WhyUseLUFA.txt b/LUFA/ManPages/WhyUseLUFA.txt index b967e87911..34976ecfea 100644 --- a/LUFA/ManPages/WhyUseLUFA.txt +++ b/LUFA/ManPages/WhyUseLUFA.txt @@ -40,7 +40,7 @@ * into difficulties or need some advice. In addition, you can also email the library author to recieve personalised * support when you need it (subject to author's schedule). * - * * Atmel Mouse Device Demo 4292 bytes, LUFA Mouse Low Level Device Demo 3336 bytes, under identical build + * * Atmel Stack Mouse Device Demo 4292 bytes, LUFA Mouse Low Level Device Demo 3336 bytes, under identical build * environments */ \ No newline at end of file diff --git a/Projects/AVRISP/Descriptors.h b/Projects/AVRISP/Descriptors.h index d6c214aa47..e9dbea9703 100644 --- a/Projects/AVRISP/Descriptors.h +++ b/Projects/AVRISP/Descriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the AVRISP bidirectional data endpoint. */