mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-10-30 21:02:32 +01:00
Code Issues Projects Releases Wiki Activity

Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities.

Browse Source
This commit is contained in:
Dean Camera 2011-11-18 06:26:51 +00:00
parent 3e04487279
commit eb2e883fd3
54 changed files with 76 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h
View File

@ -40,7 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <string.h> #include <string.h>
#include <LUFA/Drivers/USB/Class/RNDIS.h> #include <LUFA/Drivers/USB/USB.h>
#include "EthernetProtocols.h" #include "EthernetProtocols.h"
#include "ProtocolDecoders.h" #include "ProtocolDecoders.h"

2
Demos/Device/ClassDriver/RNDISEthernet/Lib/EthernetProtocols.h
View File

@ -38,7 +38,7 @@
#define _ETHERNET_PROTOCOLS_H_ #define _ETHERNET_PROTOCOLS_H_
/* Includes: */ /* Includes: */
#include <LUFA/Drivers/USB/Class/RNDIS.h> #include <LUFA/Drivers/USB/USB.h>
/* Macros: */ /* Macros: */
#define ETHERTYPE_IPV4 0x0800 #define ETHERTYPE_IPV4 0x0800

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

1
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -19,6 +19,7 @@
* - Core: * - Core:
* - When automatic PLL management mode is enabled on the U4 series AVR8 chips, the PLL is now configured for 48MHz and not * - When automatic PLL management mode is enabled on the U4 series AVR8 chips, the PLL is now configured for 48MHz and not
* a divided 96MHz, to lower power consumption and to keep the system within the datasheet specs for 3.3V operation (thanks to Scott Vitale) * a divided 96MHz, to lower power consumption and to keep the system within the datasheet specs for 3.3V operation (thanks to Scott Vitale)
* - Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities
* - Library Applications: * - Library Applications:
* - None * - None
* *

4
LUFA/DoxygenPages/MigrationInformation.txt
View File

@ -14,6 +14,10 @@
* <b>USB Core</b> * <b>USB Core</b>
* - The HID_KEYBOARD_MODIFER_* macros in the HID class driver have been corrected to HID_KEYBOARD_MODIFIER_* (note the spelling of "modifier"). * - The HID_KEYBOARD_MODIFER_* macros in the HID class driver have been corrected to HID_KEYBOARD_MODIFIER_* (note the spelling of "modifier").
* Existing applications should switch over to the correctly spelled macro names. * Existing applications should switch over to the correctly spelled macro names.
* - The names of the USB Device and USB Host class driver files have changed; a new "ClassDevice" and "ClassHost" postfix has been added to the
* respective class driver files. Projects referencing the class driver source files by filename rather than the LUFA_SRC_USBCLASS makefile
* variable should append these postfixes to the source file names. Projects including the USB class driver dispatch headers directly should either
* switch to including the main USB driver header instead, or use the updated header filenames.
* *
* \section Sec_Migration111009 Migrating from 110528 to 111009 * \section Sec_Migration111009 Migrating from 110528 to 111009
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>

4
LUFA/Drivers/USB/Class/Audio.h → LUFA/Drivers/USB/Class/AudioClass.h
View File

@ -67,11 +67,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/Audio.h" #include "Device/AudioClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/Audio.h" #include "Host/AudioClassHost.h"
#endif #endif
#endif #endif

4
LUFA/Drivers/USB/Class/CDC.h → LUFA/Drivers/USB/Class/CDCClass.h
View File

@ -67,11 +67,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/CDC.h" #include "Device/CDCClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/CDC.h" #include "Host/CDCClassHost.h"
#endif #endif
#endif #endif

0
LUFA/Drivers/USB/Class/Common/Audio.h → LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
View File

0
LUFA/Drivers/USB/Class/Common/CDC.h → LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
View File

0
LUFA/Drivers/USB/Class/Common/HID.h → LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
View File

2
LUFA/Drivers/USB/Class/Common/HIDParser.h
View File

@ -70,7 +70,7 @@
#include "../../../../Common/Common.h" #include "../../../../Common/Common.h"
#include "HIDReportData.h" #include "HIDReportData.h"
#include "../Common/HID.h" #include "HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Common/MIDI.h → LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../Core/StdDescriptors.h" #include "../../Core/StdDescriptors.h"
#include "Audio.h" #include "AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

0
LUFA/Drivers/USB/Class/Common/MassStorage.h → LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h
View File

0
LUFA/Drivers/USB/Class/Common/Printer.h → LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h
View File

2
LUFA/Drivers/USB/Class/Common/RNDIS.h → LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../Core/StdDescriptors.h" #include "../../Core/StdDescriptors.h"
#include "CDC.h" #include "CDCClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

0
LUFA/Drivers/USB/Class/Common/StillImage.h → LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h
View File

2
LUFA/Drivers/USB/Class/Device/Audio.c → LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_AUDIO_DRIVER #define __INCLUDE_FROM_AUDIO_DRIVER
#define __INCLUDE_FROM_AUDIO_DEVICE_C #define __INCLUDE_FROM_AUDIO_DEVICE_C
#include "Audio.h" #include "AudioClassDevice.h"
void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
{ {

2
LUFA/Drivers/USB/Class/Device/Audio.h → LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/Audio.h" #include "../Common/AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Device/CDC.c → LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_CDC_DRIVER #define __INCLUDE_FROM_CDC_DRIVER
#define __INCLUDE_FROM_CDC_DEVICE_C #define __INCLUDE_FROM_CDC_DEVICE_C
#include "CDC.h" #include "CDCClassDevice.h"
void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
{ {

2
LUFA/Drivers/USB/Class/Device/CDC.h → LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
View File

@ -72,7 +72,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/CDC.h" #include "../Common/CDCClassCommon.h"
#include <stdio.h> #include <stdio.h>

2
LUFA/Drivers/USB/Class/Device/HID.c → LUFA/Drivers/USB/Class/Device/HIDClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_HID_DRIVER #define __INCLUDE_FROM_HID_DRIVER
#define __INCLUDE_FROM_HID_DEVICE_C #define __INCLUDE_FROM_HID_DEVICE_C
#include "HID.h" #include "HIDClassDevice.h"
void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
{ {

2
LUFA/Drivers/USB/Class/Device/HID.h → LUFA/Drivers/USB/Class/Device/HIDClassDevice.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/HID.h" #include "../Common/HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Device/MIDI.c → LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MIDI_DRIVER #define __INCLUDE_FROM_MIDI_DRIVER
#define __INCLUDE_FROM_MIDI_DEVICE_C #define __INCLUDE_FROM_MIDI_DEVICE_C
#include "MIDI.h" #include "MIDIClassDevice.h"
bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
{ {

2
LUFA/Drivers/USB/Class/Device/MIDI.h → LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/MIDI.h" #include "../Common/MIDIClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Device/MassStorage.c → LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MS_DRIVER #define __INCLUDE_FROM_MS_DRIVER
#define __INCLUDE_FROM_MASSSTORAGE_DEVICE_C #define __INCLUDE_FROM_MASSSTORAGE_DEVICE_C
#include "MassStorage.h" #include "MassStorageClassDevice.h"
void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
{ {

2
LUFA/Drivers/USB/Class/Device/MassStorage.h → LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/MassStorage.h" #include "../Common/MassStorageClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Device/RNDIS.c → LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_RNDIS_DRIVER #define __INCLUDE_FROM_RNDIS_DRIVER
#define __INCLUDE_FROM_RNDIS_DEVICE_C #define __INCLUDE_FROM_RNDIS_DEVICE_C
#include "RNDIS.h" #include "RNDISClassDevice.h"
static const uint32_t PROGMEM AdapterSupportedOIDList[] = static const uint32_t PROGMEM AdapterSupportedOIDList[] =
{ {

2
LUFA/Drivers/USB/Class/Device/RNDIS.h → LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/RNDIS.h" #include "../Common/RNDISClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

4
LUFA/Drivers/USB/Class/HID.h → LUFA/Drivers/USB/Class/HIDClass.h
View File

@ -68,11 +68,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/HID.h" #include "Device/HIDClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/HID.h" #include "Host/HIDClassHost.h"
#endif #endif
#endif #endif

2
LUFA/Drivers/USB/Class/Host/Audio.c → LUFA/Drivers/USB/Class/Host/AudioClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_AUDIO_DRIVER #define __INCLUDE_FROM_AUDIO_DRIVER
#define __INCLUDE_FROM_AUDIO_HOST_C #define __INCLUDE_FROM_AUDIO_HOST_C
#include "Audio.h" #include "AudioClassHost.h"
uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo, uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/Audio.h → LUFA/Drivers/USB/Class/Host/AudioClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/Audio.h" #include "../Common/AudioClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/CDC.c → LUFA/Drivers/USB/Class/Host/CDCClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_CDC_DRIVER #define __INCLUDE_FROM_CDC_DRIVER
#define __INCLUDE_FROM_CDC_HOST_C #define __INCLUDE_FROM_CDC_HOST_C
#include "CDC.h" #include "CDCClassHost.h"
uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/CDC.h → LUFA/Drivers/USB/Class/Host/CDCClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/CDC.h" #include "../Common/CDCClassCommon.h"
#include <stdio.h> #include <stdio.h>

2
LUFA/Drivers/USB/Class/Host/HID.c → LUFA/Drivers/USB/Class/Host/HIDClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_HID_DRIVER #define __INCLUDE_FROM_HID_DRIVER
#define __INCLUDE_FROM_HID_HOST_C #define __INCLUDE_FROM_HID_HOST_C
#include "HID.h" #include "HIDClassHost.h"
uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/HID.h → LUFA/Drivers/USB/Class/Host/HIDClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/HID.h" #include "../Common/HIDClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/MIDI.c → LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MIDI_DRIVER #define __INCLUDE_FROM_MIDI_DRIVER
#define __INCLUDE_FROM_MIDI_HOST_C #define __INCLUDE_FROM_MIDI_HOST_C
#include "MIDI.h" #include "MIDIClassHost.h"
uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/MIDI.h → LUFA/Drivers/USB/Class/Host/MIDIClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/MIDI.h" #include "../Common/MIDIClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/MassStorage.c → LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_MS_DRIVER #define __INCLUDE_FROM_MS_DRIVER
#define __INCLUDE_FROM_MASSSTORAGE_HOST_C #define __INCLUDE_FROM_MASSSTORAGE_HOST_C
#include "MassStorage.h" #include "MassStorageClassHost.h"
uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/MassStorage.h → LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/MassStorage.h" #include "../Common/MassStorageClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/Printer.c → LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_PRINTER_DRIVER #define __INCLUDE_FROM_PRINTER_DRIVER
#define __INCLUDE_FROM_PRINTER_HOST_C #define __INCLUDE_FROM_PRINTER_HOST_C
#include "Printer.h" #include "PrinterClassHost.h"
uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/Printer.h → LUFA/Drivers/USB/Class/Host/PrinterClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/Printer.h" #include "../Common/PrinterClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/RNDIS.c → LUFA/Drivers/USB/Class/Host/RNDISClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_RNDIS_DRIVER #define __INCLUDE_FROM_RNDIS_DRIVER
#define __INCLUDE_FROM_RNDIS_HOST_C #define __INCLUDE_FROM_RNDIS_HOST_C
#include "RNDIS.h" #include "RNDISClassHost.h"
uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/RNDIS.h → LUFA/Drivers/USB/Class/Host/RNDISClassHost.h
View File

@ -56,7 +56,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/RNDIS.h" #include "../Common/RNDISClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

2
LUFA/Drivers/USB/Class/Host/StillImage.c → LUFA/Drivers/USB/Class/Host/StillImageClassHost.c
View File

@ -35,7 +35,7 @@
#define __INCLUDE_FROM_SI_DRIVER #define __INCLUDE_FROM_SI_DRIVER
#define __INCLUDE_FROM_STILLIMAGE_HOST_C #define __INCLUDE_FROM_STILLIMAGE_HOST_C
#include "StillImage.h" #include "StillImageClassHost.h"
uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
uint16_t ConfigDescriptorSize, uint16_t ConfigDescriptorSize,

2
LUFA/Drivers/USB/Class/Host/StillImage.h → LUFA/Drivers/USB/Class/Host/StillImageClassHost.h
View File

@ -55,7 +55,7 @@
/* Includes: */ /* Includes: */
#include "../../USB.h" #include "../../USB.h"
#include "../Common/StillImage.h" #include "../Common/StillImageClassCommon.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus) #if defined(__cplusplus)

4
LUFA/Drivers/USB/Class/MIDI.h → LUFA/Drivers/USB/Class/MIDIClass.h
View File

@ -70,11 +70,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/MIDI.h" #include "Device/MIDIClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/MIDI.h" #include "Host/MIDIClassHost.h"
#endif #endif
#endif #endif

4
LUFA/Drivers/USB/Class/MassStorage.h → LUFA/Drivers/USB/Class/MassStorageClass.h
View File

@ -67,11 +67,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/MassStorage.h" #include "Device/MassStorageClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/MassStorage.h" #include "Host/MassStorageClassHost.h"
#endif #endif
#endif #endif

2
LUFA/Drivers/USB/Class/Printer.h → LUFA/Drivers/USB/Class/PrinterClass.h
View File

@ -68,7 +68,7 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/Printer.h" #include "Host/PrinterClassHost.h"
#endif #endif
#endif #endif

4
LUFA/Drivers/USB/Class/RNDIS.h → LUFA/Drivers/USB/Class/RNDISClass.h
View File

@ -67,11 +67,11 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_DEVICE) #if defined(USB_CAN_BE_DEVICE)
#include "Device/RNDIS.h" #include "Device/RNDISClassDevice.h"
#endif #endif
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/RNDIS.h" #include "Host/RNDISClassHost.h"
#endif #endif
#endif #endif

2
LUFA/Drivers/USB/Class/StillImage.h → LUFA/Drivers/USB/Class/StillImageClass.h
View File

@ -66,7 +66,7 @@
#include "../Core/USBMode.h" #include "../Core/USBMode.h"
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
#include "Host/StillImage.h" #include "Host/StillImageClassHost.h"
#endif #endif
#endif #endif

16
LUFA/Drivers/USB/USB.h
View File

@ -388,14 +388,14 @@
#include "Core/OTG.h" #include "Core/OTG.h"
#endif #endif
#include "Class/Audio.h" #include "Class/AudioClass.h"
#include "Class/CDC.h" #include "Class/CDCClass.h"
#include "Class/HID.h" #include "Class/HIDClass.h"
#include "Class/MassStorage.h" #include "Class/MassStorageClass.h"
#include "Class/MIDI.h" #include "Class/MIDIClass.h"
#include "Class/Printer.h" #include "Class/PrinterClass.h"
#include "Class/RNDIS.h" #include "Class/RNDISClass.h"
#include "Class/StillImage.h" #include "Class/StillImageClass.h"
#endif #endif

28
LUFA/makefile
View File

@ -37,20 +37,20 @@ LUFA_SRC_USB = $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH
$(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c
LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/Audio.c \ LUFA_SRC_USBCLASS = $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDC.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HID.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorage.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDI.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDIS.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Audio.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDC.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HID.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorage.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDI.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/Printer.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDIS.c \ $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c \
$(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImage.c $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c
LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c LUFA_SRC_TEMPERATURE = $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c LUFA_SRC_SERIAL = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c
LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c LUFA_SRC_TWI = $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c

1
Projects/MIDIToneGenerator/MIDIToneGenerator.h
View File

@ -50,7 +50,6 @@
#include <LUFA/Drivers/Board/LEDs.h> #include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/Peripheral/ADC.h> #include <LUFA/Drivers/Peripheral/ADC.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/USB/Class/MIDI.h>
/* Macros: */ /* Macros: */
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */

2
Projects/Webserver/Lib/uip/uip-split.h
View File

@ -77,7 +77,7 @@
#include "../../USBHostMode.h" #include "../../USBHostMode.h"
#include <LUFA/Drivers/USB/Class/RNDIS.h> #include <LUFA/Drivers/USB/USB.h>
/** /**
* Handle outgoing packets. * Handle outgoing packets.