diff --git a/Demos/Device/MassStorage/DataflashManager.c b/Demos/Device/MassStorage/Lib/DataflashManager.c similarity index 100% rename from Demos/Device/MassStorage/DataflashManager.c rename to Demos/Device/MassStorage/Lib/DataflashManager.c diff --git a/Demos/Device/MassStorage/DataflashManager.h b/Demos/Device/MassStorage/Lib/DataflashManager.h similarity index 100% rename from Demos/Device/MassStorage/DataflashManager.h rename to Demos/Device/MassStorage/Lib/DataflashManager.h diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/Lib/SCSI.c similarity index 100% rename from Demos/Device/MassStorage/SCSI.c rename to Demos/Device/MassStorage/Lib/SCSI.c diff --git a/Demos/Device/MassStorage/SCSI.h b/Demos/Device/MassStorage/Lib/SCSI.h similarity index 100% rename from Demos/Device/MassStorage/SCSI.h rename to Demos/Device/MassStorage/Lib/SCSI.h diff --git a/Demos/Device/MassStorage/SCSI_Codes.h b/Demos/Device/MassStorage/Lib/SCSI_Codes.h similarity index 100% rename from Demos/Device/MassStorage/SCSI_Codes.h rename to Demos/Device/MassStorage/Lib/SCSI_Codes.h diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h index afe9872ea9..cbd3cd9312 100644 --- a/Demos/Device/MassStorage/MassStorage.h +++ b/Demos/Device/MassStorage/MassStorage.h @@ -42,8 +42,9 @@ #include #include "Descriptors.h" - #include "SCSI.h" - #include "DataflashManager.h" + + #include "Lib/SCSI.h" + #include "Lib/DataflashManager.h" #include // Library Version Information #include // USB Functionality diff --git a/Demos/Device/MassStorage/makefile b/Demos/Device/MassStorage/makefile index 78abcfd07a..93f895727c 100644 --- a/Demos/Device/MassStorage/makefile +++ b/Demos/Device/MassStorage/makefile @@ -125,8 +125,8 @@ LUFA_PATH = ../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - SCSI.c \ - DataflashManager.c \ + Lib/SCSI.c \ + Lib/DataflashManager.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ diff --git a/Demos/Device/RNDISEthernet/ARP.c b/Demos/Device/RNDISEthernet/Lib/ARP.c similarity index 100% rename from Demos/Device/RNDISEthernet/ARP.c rename to Demos/Device/RNDISEthernet/Lib/ARP.c diff --git a/Demos/Device/RNDISEthernet/ARP.h b/Demos/Device/RNDISEthernet/Lib/ARP.h similarity index 100% rename from Demos/Device/RNDISEthernet/ARP.h rename to Demos/Device/RNDISEthernet/Lib/ARP.h diff --git a/Demos/Device/RNDISEthernet/DHCP.c b/Demos/Device/RNDISEthernet/Lib/DHCP.c similarity index 100% rename from Demos/Device/RNDISEthernet/DHCP.c rename to Demos/Device/RNDISEthernet/Lib/DHCP.c diff --git a/Demos/Device/RNDISEthernet/DHCP.h b/Demos/Device/RNDISEthernet/Lib/DHCP.h similarity index 100% rename from Demos/Device/RNDISEthernet/DHCP.h rename to Demos/Device/RNDISEthernet/Lib/DHCP.h diff --git a/Demos/Device/RNDISEthernet/Ethernet.c b/Demos/Device/RNDISEthernet/Lib/Ethernet.c similarity index 100% rename from Demos/Device/RNDISEthernet/Ethernet.c rename to Demos/Device/RNDISEthernet/Lib/Ethernet.c diff --git a/Demos/Device/RNDISEthernet/Ethernet.h b/Demos/Device/RNDISEthernet/Lib/Ethernet.h similarity index 100% rename from Demos/Device/RNDISEthernet/Ethernet.h rename to Demos/Device/RNDISEthernet/Lib/Ethernet.h diff --git a/Demos/Device/RNDISEthernet/EthernetProtocols.h b/Demos/Device/RNDISEthernet/Lib/EthernetProtocols.h similarity index 100% rename from Demos/Device/RNDISEthernet/EthernetProtocols.h rename to Demos/Device/RNDISEthernet/Lib/EthernetProtocols.h diff --git a/Demos/Device/RNDISEthernet/ICMP.c b/Demos/Device/RNDISEthernet/Lib/ICMP.c similarity index 100% rename from Demos/Device/RNDISEthernet/ICMP.c rename to Demos/Device/RNDISEthernet/Lib/ICMP.c diff --git a/Demos/Device/RNDISEthernet/ICMP.h b/Demos/Device/RNDISEthernet/Lib/ICMP.h similarity index 100% rename from Demos/Device/RNDISEthernet/ICMP.h rename to Demos/Device/RNDISEthernet/Lib/ICMP.h diff --git a/Demos/Device/RNDISEthernet/IP.c b/Demos/Device/RNDISEthernet/Lib/IP.c similarity index 100% rename from Demos/Device/RNDISEthernet/IP.c rename to Demos/Device/RNDISEthernet/Lib/IP.c diff --git a/Demos/Device/RNDISEthernet/IP.h b/Demos/Device/RNDISEthernet/Lib/IP.h similarity index 100% rename from Demos/Device/RNDISEthernet/IP.h rename to Demos/Device/RNDISEthernet/Lib/IP.h diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.c b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.c similarity index 100% rename from Demos/Device/RNDISEthernet/ProtocolDecoders.c rename to Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.c diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.h b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.h similarity index 100% rename from Demos/Device/RNDISEthernet/ProtocolDecoders.h rename to Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.h diff --git a/Demos/Device/RNDISEthernet/RNDIS.c b/Demos/Device/RNDISEthernet/Lib/RNDIS.c similarity index 100% rename from Demos/Device/RNDISEthernet/RNDIS.c rename to Demos/Device/RNDISEthernet/Lib/RNDIS.c diff --git a/Demos/Device/RNDISEthernet/RNDIS.h b/Demos/Device/RNDISEthernet/Lib/RNDIS.h similarity index 100% rename from Demos/Device/RNDISEthernet/RNDIS.h rename to Demos/Device/RNDISEthernet/Lib/RNDIS.h diff --git a/Demos/Device/RNDISEthernet/RNDISConstants.h b/Demos/Device/RNDISEthernet/Lib/RNDISConstants.h similarity index 100% rename from Demos/Device/RNDISEthernet/RNDISConstants.h rename to Demos/Device/RNDISEthernet/Lib/RNDISConstants.h diff --git a/Demos/Device/RNDISEthernet/TCP.c b/Demos/Device/RNDISEthernet/Lib/TCP.c similarity index 100% rename from Demos/Device/RNDISEthernet/TCP.c rename to Demos/Device/RNDISEthernet/Lib/TCP.c diff --git a/Demos/Device/RNDISEthernet/TCP.h b/Demos/Device/RNDISEthernet/Lib/TCP.h similarity index 100% rename from Demos/Device/RNDISEthernet/TCP.h rename to Demos/Device/RNDISEthernet/Lib/TCP.h diff --git a/Demos/Device/RNDISEthernet/UDP.c b/Demos/Device/RNDISEthernet/Lib/UDP.c similarity index 100% rename from Demos/Device/RNDISEthernet/UDP.c rename to Demos/Device/RNDISEthernet/Lib/UDP.c diff --git a/Demos/Device/RNDISEthernet/UDP.h b/Demos/Device/RNDISEthernet/Lib/UDP.h similarity index 100% rename from Demos/Device/RNDISEthernet/UDP.h rename to Demos/Device/RNDISEthernet/Lib/UDP.h diff --git a/Demos/Device/RNDISEthernet/Webserver.c b/Demos/Device/RNDISEthernet/Lib/Webserver.c similarity index 100% rename from Demos/Device/RNDISEthernet/Webserver.c rename to Demos/Device/RNDISEthernet/Lib/Webserver.c diff --git a/Demos/Device/RNDISEthernet/Webserver.h b/Demos/Device/RNDISEthernet/Lib/Webserver.h similarity index 100% rename from Demos/Device/RNDISEthernet/Webserver.h rename to Demos/Device/RNDISEthernet/Lib/Webserver.h diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h index 7c3c8dabe8..703af4003c 100644 --- a/Demos/Device/RNDISEthernet/RNDISEthernet.h +++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h @@ -45,11 +45,12 @@ #include #include "Descriptors.h" - #include "RNDIS.h" - #include "Ethernet.h" - #include "TCP.h" - #include "ARP.h" - #include "Webserver.h" + + #include "Lib/RNDIS.h" + #include "Lib/Ethernet.h" + #include "Lib/TCP.h" + #include "Lib/ARP.h" + #include "Lib/Webserver.h" #include // Library Version Information #include // USB Functionality diff --git a/Demos/Device/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile index 15c33efc5b..f40c37b05a 100644 --- a/Demos/Device/RNDISEthernet/makefile +++ b/Demos/Device/RNDISEthernet/makefile @@ -125,16 +125,16 @@ LUFA_PATH = ../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - RNDIS.c \ - Ethernet.c \ - ProtocolDecoders.c \ - ICMP.c \ - TCP.c \ - UDP.c \ - DHCP.c \ - ARP.c \ - IP.c \ - Webserver.c \ + Lib/RNDIS.c \ + Lib/Ethernet.c \ + Lib/ProtocolDecoders.c \ + Lib/ICMP.c \ + Lib/TCP.c \ + Lib/UDP.c \ + Lib/DHCP.c \ + Lib/ARP.c \ + Lib/IP.c \ + Lib/Webserver.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ diff --git a/Demos/Device/USBtoSerial/RingBuff.c b/Demos/Device/USBtoSerial/Lib/RingBuff.c similarity index 100% rename from Demos/Device/USBtoSerial/RingBuff.c rename to Demos/Device/USBtoSerial/Lib/RingBuff.c diff --git a/Demos/Device/USBtoSerial/RingBuff.h b/Demos/Device/USBtoSerial/Lib/RingBuff.h similarity index 100% rename from Demos/Device/USBtoSerial/RingBuff.h rename to Demos/Device/USBtoSerial/Lib/RingBuff.h diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h index cd1f42c3f5..8e7e8aed8c 100644 --- a/Demos/Device/USBtoSerial/USBtoSerial.h +++ b/Demos/Device/USBtoSerial/USBtoSerial.h @@ -43,7 +43,8 @@ #include #include "Descriptors.h" - #include "RingBuff.h" + + #include "Lib/RingBuff.h" #include // Library Version Information #include // USB Functionality diff --git a/Demos/Device/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile index 7da8b97403..708e872463 100644 --- a/Demos/Device/USBtoSerial/makefile +++ b/Demos/Device/USBtoSerial/makefile @@ -125,7 +125,7 @@ LUFA_PATH = ../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - RingBuff.c \ + Lib/RingBuff.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c similarity index 100% rename from Demos/Host/MassStorageHost/MassStoreCommands.c rename to Demos/Host/MassStorageHost/Lib/MassStoreCommands.c diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.h b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.h similarity index 100% rename from Demos/Host/MassStorageHost/MassStoreCommands.h rename to Demos/Host/MassStorageHost/Lib/MassStoreCommands.h diff --git a/Demos/Host/MassStorageHost/SCSI_Codes.h b/Demos/Host/MassStorageHost/Lib/SCSI_Codes.h similarity index 100% rename from Demos/Host/MassStorageHost/SCSI_Codes.h rename to Demos/Host/MassStorageHost/Lib/SCSI_Codes.h diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h index 1646ad75e9..6e1e5cd9e4 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/MassStorageHost/MassStorageHost.h @@ -45,7 +45,8 @@ #include #include "ConfigDescriptor.h" - #include "MassStoreCommands.h" + + #include "Lib/MassStoreCommands.h" #include // Library Version Information #include // ANSI Terminal Escape Codes diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile index d4792ae404..f50f598872 100644 --- a/Demos/Host/MassStorageHost/makefile +++ b/Demos/Host/MassStorageHost/makefile @@ -125,7 +125,7 @@ LUFA_PATH = ../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - MassStoreCommands.c \ + Lib/MassStoreCommands.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ diff --git a/Demos/Host/StillImageHost/PIMACodes.h b/Demos/Host/StillImageHost/Lib/PIMACodes.h similarity index 100% rename from Demos/Host/StillImageHost/PIMACodes.h rename to Demos/Host/StillImageHost/Lib/PIMACodes.h diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/Lib/StillImageCommands.c similarity index 100% rename from Demos/Host/StillImageHost/StillImageCommands.c rename to Demos/Host/StillImageHost/Lib/StillImageCommands.c diff --git a/Demos/Host/StillImageHost/StillImageCommands.h b/Demos/Host/StillImageHost/Lib/StillImageCommands.h similarity index 100% rename from Demos/Host/StillImageHost/StillImageCommands.h rename to Demos/Host/StillImageHost/Lib/StillImageCommands.h diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h index 909ed89bc6..b563767ccb 100644 --- a/Demos/Host/StillImageHost/StillImageHost.h +++ b/Demos/Host/StillImageHost/StillImageHost.h @@ -43,8 +43,9 @@ #include #include "ConfigDescriptor.h" - #include "PIMACodes.h" - #include "StillImageCommands.h" + + #include "Lib/PIMACodes.h" + #include "Lib/StillImageCommands.h" #include // ANSI Terminal Escape Codes #include // USB Functionality diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile index bcb036f25a..8c1ca0b452 100644 --- a/Demos/Host/StillImageHost/makefile +++ b/Demos/Host/StillImageHost/makefile @@ -124,7 +124,7 @@ LUFA_PATH = ../../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ ConfigDescriptor.c \ - StillImageCommands.c \ + Lib/StillImageCommands.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \ diff --git a/LUFA.pnproj b/LUFA.pnproj index 2409a3e4fe..b5ceb65c17 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index 4a7f34eaa1..68aa6c79ed 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -28,6 +28,7 @@ * - Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill) * - Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor, moved ConfigDescriptor.c/.h from the * LUFA/Drivers/USB/Class/ directory to LUFA/Drivers/USB/HighLevel/ in preperation for the new USB class APIs + * - Moved out each demos' functionality library files (e.g. Ring Buffer library) to /Lib directories for a better directory structure * * * \section Sec_ChangeLog090510 Version 090510 diff --git a/Projects/Magstripe/CircularBitBuffer.c b/Projects/Magstripe/Lib/CircularBitBuffer.c similarity index 100% rename from Projects/Magstripe/CircularBitBuffer.c rename to Projects/Magstripe/Lib/CircularBitBuffer.c diff --git a/Projects/Magstripe/CircularBitBuffer.h b/Projects/Magstripe/Lib/CircularBitBuffer.h similarity index 100% rename from Projects/Magstripe/CircularBitBuffer.h rename to Projects/Magstripe/Lib/CircularBitBuffer.h diff --git a/Projects/Magstripe/MagstripeHW.h b/Projects/Magstripe/Lib/MagstripeHW.h similarity index 100% rename from Projects/Magstripe/MagstripeHW.h rename to Projects/Magstripe/Lib/MagstripeHW.h diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index a83496b91c..c700bcaff5 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -46,8 +46,9 @@ #include #include "Descriptors.h" - #include "MagstripeHW.h" - #include "CircularBitBuffer.h" + + #include "Lib/MagstripeHW.h" + #include "Lib/CircularBitBuffer.h" #include // Library Version Information #include // USB Functionality diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile index 6a77cf05c1..962c999b3f 100644 --- a/Projects/Magstripe/makefile +++ b/Projects/Magstripe/makefile @@ -125,7 +125,7 @@ LUFA_PATH = ../.. # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - CircularBitBuffer.c \ + Lib/CircularBitBuffer.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \