From b37d77eab32d171ad7b28157a924a4026e2aebd1 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 24 Oct 2010 22:53:57 +0000 Subject: All USB class drivers are now automatically included when LUFA/Drivers/USB.h is included, and no longer need to be seperately included. All LowLevel demos changed to use the constants and types defined in the USB class drivers. --- Projects/Benito/Benito.h | 1 - Projects/Benito/Descriptors.h | 1 - Projects/Incomplete/StandaloneProgrammer/Descriptors.h | 2 -- Projects/Incomplete/StandaloneProgrammer/DiskDevice.h | 1 - Projects/Incomplete/StandaloneProgrammer/DiskHost.h | 1 - .../Incomplete/StandaloneProgrammer/Lib/DataflashManager.h | 1 - Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h | 1 - Projects/LEDNotifier/Descriptors.h | 1 - Projects/LEDNotifier/LEDNotifier.h | 1 - Projects/Magstripe/Descriptors.h | 1 - Projects/Magstripe/Magstripe.h | 1 - Projects/MissileLauncher/MissileLauncher.c | 2 +- Projects/MissileLauncher/MissileLauncher.h | 11 ++++------- Projects/RelayBoard/RelayBoard.h | 2 +- Projects/TempDataLogger/Descriptors.h | 2 -- Projects/TempDataLogger/Lib/DataflashManager.h | 1 - Projects/TempDataLogger/Lib/SCSI.h | 1 - Projects/TempDataLogger/TempDataLogger.h | 2 -- Projects/USBtoSerial/Descriptors.h | 1 - Projects/USBtoSerial/USBtoSerial.h | 1 - Projects/Webserver/Descriptors.h | 1 - Projects/Webserver/Lib/DataflashManager.h | 1 - Projects/Webserver/Lib/SCSI.h | 3 +-- Projects/Webserver/Lib/uIPManagement.h | 2 +- Projects/Webserver/USBDeviceMode.h | 1 - Projects/Webserver/USBHostMode.h | 1 - Projects/XPLAINBridge/USARTDescriptors.h | 1 - Projects/XPLAINBridge/XPLAINBridge.h | 1 - 28 files changed, 8 insertions(+), 38 deletions(-) (limited to 'Projects') diff --git a/Projects/Benito/Benito.h b/Projects/Benito/Benito.h index 974956993..4152f2174 100644 --- a/Projects/Benito/Benito.h +++ b/Projects/Benito/Benito.h @@ -48,7 +48,6 @@ #include #include #include - #include /* Macros: */ /** LED mask for the library LED driver, to indicate TX activity. */ diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h index ddd9495ea..e9b55a3d0 100644 --- a/Projects/Benito/Descriptors.h +++ b/Projects/Benito/Descriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the CDC device-to-host notification IN endpoint. */ diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h index 62399db30..1b4a3672a 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h @@ -40,8 +40,6 @@ #include #include - #include - #include /* Macros: */ /** Endpoint number of the CDC device-to-host notification IN endpoint. */ diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskDevice.h b/Projects/Incomplete/StandaloneProgrammer/DiskDevice.h index 76e528e5e..714355e44 100644 --- a/Projects/Incomplete/StandaloneProgrammer/DiskDevice.h +++ b/Projects/Incomplete/StandaloneProgrammer/DiskDevice.h @@ -44,7 +44,6 @@ #include #include - #include /* Function Prototypes: */ #if defined(USB_CAN_BE_DEVICE) diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.h b/Projects/Incomplete/StandaloneProgrammer/DiskHost.h index cbb63577a..aa0d62c7c 100644 --- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.h +++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.h @@ -44,7 +44,6 @@ #include #include - #include /* External Variables: */ #if defined(USB_CAN_BE_HOST) diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h index b42b13297..72cf026d5 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h @@ -43,7 +43,6 @@ #include "Descriptors.h" #include - #include #include /* Preprocessor Checks: */ diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h index 75d281414..0382c62b2 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h @@ -41,7 +41,6 @@ #include #include - #include #include "StandaloneProgrammer.h" #include "Descriptors.h" diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index ddd9495ea..e9b55a3d0 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the CDC device-to-host notification IN endpoint. */ diff --git a/Projects/LEDNotifier/LEDNotifier.h b/Projects/LEDNotifier/LEDNotifier.h index f91fa6e95..2a1d769cf 100644 --- a/Projects/LEDNotifier/LEDNotifier.h +++ b/Projects/LEDNotifier/LEDNotifier.h @@ -49,7 +49,6 @@ #include #include #include - #include /* Function Prototypes: */ void SetupHardware(void); diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h index 963aaac09..6a4f22ad9 100644 --- a/Projects/Magstripe/Descriptors.h +++ b/Projects/Magstripe/Descriptors.h @@ -41,7 +41,6 @@ #include #include - #include /* Type Defines: */ /** Type define for the device configuration descriptor structure. This must be defined in the diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index 58f3f2373..1e29a1880 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -49,7 +49,6 @@ #include #include - #include /* Macros: */ /** Total number of tracks which can be read from the card, between 1 and 3. */ diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c index 6b22df82e..6897d6637 100644 --- a/Projects/MissileLauncher/MissileLauncher.c +++ b/Projects/MissileLauncher/MissileLauncher.c @@ -283,7 +283,7 @@ void WriteNextReport(uint8_t* const ReportOUTData, USB_ControlRequest = (USB_Request_Header_t) { .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), - .bRequest = REQ_SetReport, + .bRequest = HID_REQ_SetReport, .wValue = 0x02, .wIndex = 0x01, .wLength = ReportLength, diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h index 080d568f9..9e8421c92 100644 --- a/Projects/MissileLauncher/MissileLauncher.h +++ b/Projects/MissileLauncher/MissileLauncher.h @@ -54,23 +54,20 @@ #include "ConfigDescriptor.h" /* Macros: */ - /** HID Class specific request to send a HID report to the device. */ - #define REQ_SetReport 0x09 - /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ #define LEDMASK_USB_NOTREADY LEDS_LED1 /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */ - #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3) + #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3) /** LED mask for the library LED driver, to indicate that the USB interface is ready. */ - #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4) + #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4) /** 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) + #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) /** Size of the Launcher report command buffer. */ - #define LAUNCHER_CMD_BUFFER_SIZE 64 + #define LAUNCHER_CMD_BUFFER_SIZE 64 /* Function Prototypes: */ void SetupHardware(void); diff --git a/Projects/RelayBoard/RelayBoard.h b/Projects/RelayBoard/RelayBoard.h index f3814b299..e928c732d 100644 --- a/Projects/RelayBoard/RelayBoard.h +++ b/Projects/RelayBoard/RelayBoard.h @@ -54,7 +54,7 @@ #define RELAY2 (1 << 6) #define RELAY3 (1 << 5) #define RELAY4 (1 << 4) - #define ALL_RELAYS (RELAY1|RELAY2|RELAY3|RELAY4) + #define ALL_RELAYS (RELAY1 | RELAY2 | RELAY3 | RELAY4) /* Function Prototypes: */ void SetupHardware(void); diff --git a/Projects/TempDataLogger/Descriptors.h b/Projects/TempDataLogger/Descriptors.h index 3b5e78ea3..41bcd7f25 100644 --- a/Projects/TempDataLogger/Descriptors.h +++ b/Projects/TempDataLogger/Descriptors.h @@ -13,8 +13,6 @@ #include #include - #include - #include #include "TempDataLogger.h" diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h index cd1c460cd..4250e2628 100644 --- a/Projects/TempDataLogger/Lib/DataflashManager.h +++ b/Projects/TempDataLogger/Lib/DataflashManager.h @@ -44,7 +44,6 @@ #include #include - #include #include /* Preprocessor Checks: */ diff --git a/Projects/TempDataLogger/Lib/SCSI.h b/Projects/TempDataLogger/Lib/SCSI.h index 39c9aee46..661dd1156 100644 --- a/Projects/TempDataLogger/Lib/SCSI.h +++ b/Projects/TempDataLogger/Lib/SCSI.h @@ -41,7 +41,6 @@ #include #include - #include #include "../TempDataLogger.h" #include "../Descriptors.h" diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h index ce79670a2..0e3a1c835 100644 --- a/Projects/TempDataLogger/TempDataLogger.h +++ b/Projects/TempDataLogger/TempDataLogger.h @@ -55,8 +55,6 @@ #include #include #include - #include - #include /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h index ddd9495ea..e9b55a3d0 100644 --- a/Projects/USBtoSerial/Descriptors.h +++ b/Projects/USBtoSerial/Descriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the CDC device-to-host notification IN endpoint. */ diff --git a/Projects/USBtoSerial/USBtoSerial.h b/Projects/USBtoSerial/USBtoSerial.h index 9233ba203..364d8c0bf 100644 --- a/Projects/USBtoSerial/USBtoSerial.h +++ b/Projects/USBtoSerial/USBtoSerial.h @@ -50,7 +50,6 @@ #include #include #include - #include /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h index c816e2383..0327a4774 100644 --- a/Projects/Webserver/Descriptors.h +++ b/Projects/Webserver/Descriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */ diff --git a/Projects/Webserver/Lib/DataflashManager.h b/Projects/Webserver/Lib/DataflashManager.h index 3351922ab..473168c3c 100644 --- a/Projects/Webserver/Lib/DataflashManager.h +++ b/Projects/Webserver/Lib/DataflashManager.h @@ -43,7 +43,6 @@ #include #include - #include #include /* Preprocessor Checks: */ diff --git a/Projects/Webserver/Lib/SCSI.h b/Projects/Webserver/Lib/SCSI.h index 2ff6d05dc..daba1e033 100644 --- a/Projects/Webserver/Lib/SCSI.h +++ b/Projects/Webserver/Lib/SCSI.h @@ -41,8 +41,7 @@ #include #include - #include - + #include "../Descriptors.h" #include "DataflashManager.h" diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h index f5ac26e55..61521eb77 100644 --- a/Projects/Webserver/Lib/uIPManagement.h +++ b/Projects/Webserver/Lib/uIPManagement.h @@ -37,7 +37,7 @@ #define _UIP_MANAGEMENT_H_ /* Includes: */ - #include + #include #include #include diff --git a/Projects/Webserver/USBDeviceMode.h b/Projects/Webserver/USBDeviceMode.h index ec3e71390..5823dcd0d 100644 --- a/Projects/Webserver/USBDeviceMode.h +++ b/Projects/Webserver/USBDeviceMode.h @@ -38,7 +38,6 @@ /* Includes: */ #include - #include #include "Webserver.h" #include "Descriptors.h" diff --git a/Projects/Webserver/USBHostMode.h b/Projects/Webserver/USBHostMode.h index e05c600f2..459bb385e 100644 --- a/Projects/Webserver/USBHostMode.h +++ b/Projects/Webserver/USBHostMode.h @@ -38,7 +38,6 @@ /* Includes: */ #include - #include #include "Webserver.h" #include "Lib/uIPManagement.h" diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 0287e81ae..7f22cc0ce 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -40,7 +40,6 @@ #include #include - #include /* Macros: */ /** Endpoint number of the CDC device-to-host notification IN endpoint. */ diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index ac4378dc7..43129c1b5 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -52,7 +52,6 @@ #include #include #include - #include /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ -- cgit v1.2.3