Moved out each demos' functionality library files (e.g. Ring Buffer library) to /Lib directories for a better directory structure.

45 files changed, 31 insertions, 26 deletions

diff --git a/Demos/Device/MassStorage/DataflashManager.c b/Demos/Device/MassStorage/Lib/DataflashManager.c
index 4b624190f..4b624190f 100644
--- a/Demos/Device/MassStorage/DataflashManager.c
+++ b/Demos/Device/MassStorage/Lib/DataflashManager.c
diff --git a/Demos/Device/MassStorage/DataflashManager.h b/Demos/Device/MassStorage/Lib/DataflashManager.h
index 1332fd3a3..1332fd3a3 100644
--- a/Demos/Device/MassStorage/DataflashManager.h
+++ b/Demos/Device/MassStorage/Lib/DataflashManager.h
diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/Lib/SCSI.c
index 5993a546d..5993a546d 100644
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/Lib/SCSI.c
diff --git a/Demos/Device/MassStorage/SCSI.h b/Demos/Device/MassStorage/Lib/SCSI.h
index d7693cafb..d7693cafb 100644
--- a/Demos/Device/MassStorage/SCSI.h
+++ b/Demos/Device/MassStorage/Lib/SCSI.h
diff --git a/Demos/Device/MassStorage/SCSI_Codes.h b/Demos/Device/MassStorage/Lib/SCSI_Codes.h
index 2b2213de2..2b2213de2 100644
--- a/Demos/Device/MassStorage/SCSI_Codes.h
+++ b/Demos/Device/MassStorage/Lib/SCSI_Codes.h
diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index afe9872ea..cbd3cd931 100644
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
@@ -42,8 +42,9 @@
 		#include <avr/power.h>

 

 		#include "Descriptors.h"

-		#include "SCSI.h"

-		#include "DataflashManager.h"

+

+		#include "Lib/SCSI.h"

+		#include "Lib/DataflashManager.h"

 

 		#include <LUFA/Version.h>                    // Library Version Information

 		#include <LUFA/Drivers/USB/USB.h>            // USB Functionality

diff --git a/Demos/Device/MassStorage/makefile b/Demos/Device/MassStorage/makefile
index 78abcfd07..93f895727 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
index 0f108c290..0f108c290 100644
--- a/Demos/Device/RNDISEthernet/ARP.c
+++ b/Demos/Device/RNDISEthernet/Lib/ARP.c
diff --git a/Demos/Device/RNDISEthernet/ARP.h b/Demos/Device/RNDISEthernet/Lib/ARP.h
index 8551df85b..8551df85b 100644
--- a/Demos/Device/RNDISEthernet/ARP.h
+++ b/Demos/Device/RNDISEthernet/Lib/ARP.h
diff --git a/Demos/Device/RNDISEthernet/DHCP.c b/Demos/Device/RNDISEthernet/Lib/DHCP.c
index 76711fb4f..76711fb4f 100644
--- a/Demos/Device/RNDISEthernet/DHCP.c
+++ b/Demos/Device/RNDISEthernet/Lib/DHCP.c
diff --git a/Demos/Device/RNDISEthernet/DHCP.h b/Demos/Device/RNDISEthernet/Lib/DHCP.h
index f0e68b994..f0e68b994 100644
--- a/Demos/Device/RNDISEthernet/DHCP.h
+++ b/Demos/Device/RNDISEthernet/Lib/DHCP.h
diff --git a/Demos/Device/RNDISEthernet/Ethernet.c b/Demos/Device/RNDISEthernet/Lib/Ethernet.c
index 3d34f716a..3d34f716a 100644
--- a/Demos/Device/RNDISEthernet/Ethernet.c
+++ b/Demos/Device/RNDISEthernet/Lib/Ethernet.c
diff --git a/Demos/Device/RNDISEthernet/Ethernet.h b/Demos/Device/RNDISEthernet/Lib/Ethernet.h
index b360f07ae..b360f07ae 100644
--- a/Demos/Device/RNDISEthernet/Ethernet.h
+++ b/Demos/Device/RNDISEthernet/Lib/Ethernet.h
diff --git a/Demos/Device/RNDISEthernet/EthernetProtocols.h b/Demos/Device/RNDISEthernet/Lib/EthernetProtocols.h
index 3ff3433ae..3ff3433ae 100644
--- a/Demos/Device/RNDISEthernet/EthernetProtocols.h
+++ b/Demos/Device/RNDISEthernet/Lib/EthernetProtocols.h
diff --git a/Demos/Device/RNDISEthernet/ICMP.c b/Demos/Device/RNDISEthernet/Lib/ICMP.c
index da4ffcfa1..da4ffcfa1 100644
--- a/Demos/Device/RNDISEthernet/ICMP.c
+++ b/Demos/Device/RNDISEthernet/Lib/ICMP.c
diff --git a/Demos/Device/RNDISEthernet/ICMP.h b/Demos/Device/RNDISEthernet/Lib/ICMP.h
index b20a557e9..b20a557e9 100644
--- a/Demos/Device/RNDISEthernet/ICMP.h
+++ b/Demos/Device/RNDISEthernet/Lib/ICMP.h
diff --git a/Demos/Device/RNDISEthernet/IP.c b/Demos/Device/RNDISEthernet/Lib/IP.c
index 8fb0b446d..8fb0b446d 100644
--- a/Demos/Device/RNDISEthernet/IP.c
+++ b/Demos/Device/RNDISEthernet/Lib/IP.c
diff --git a/Demos/Device/RNDISEthernet/IP.h b/Demos/Device/RNDISEthernet/Lib/IP.h
index fc1a46aef..fc1a46aef 100644
--- a/Demos/Device/RNDISEthernet/IP.h
+++ b/Demos/Device/RNDISEthernet/Lib/IP.h
diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.c b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.c
index add0333f2..add0333f2 100644
--- a/Demos/Device/RNDISEthernet/ProtocolDecoders.c
+++ b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.c
diff --git a/Demos/Device/RNDISEthernet/ProtocolDecoders.h b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.h
index fa0a869eb..fa0a869eb 100644
--- a/Demos/Device/RNDISEthernet/ProtocolDecoders.h
+++ b/Demos/Device/RNDISEthernet/Lib/ProtocolDecoders.h
diff --git a/Demos/Device/RNDISEthernet/RNDIS.c b/Demos/Device/RNDISEthernet/Lib/RNDIS.c
index c5202bcd1..c5202bcd1 100644
--- a/Demos/Device/RNDISEthernet/RNDIS.c
+++ b/Demos/Device/RNDISEthernet/Lib/RNDIS.c
diff --git a/Demos/Device/RNDISEthernet/RNDIS.h b/Demos/Device/RNDISEthernet/Lib/RNDIS.h
index 88c9a9eb9..88c9a9eb9 100644
--- a/Demos/Device/RNDISEthernet/RNDIS.h
+++ b/Demos/Device/RNDISEthernet/Lib/RNDIS.h
diff --git a/Demos/Device/RNDISEthernet/RNDISConstants.h b/Demos/Device/RNDISEthernet/Lib/RNDISConstants.h
index ad66f62db..ad66f62db 100644
--- a/Demos/Device/RNDISEthernet/RNDISConstants.h
+++ b/Demos/Device/RNDISEthernet/Lib/RNDISConstants.h
diff --git a/Demos/Device/RNDISEthernet/TCP.c b/Demos/Device/RNDISEthernet/Lib/TCP.c
index f259aad02..f259aad02 100644
--- a/Demos/Device/RNDISEthernet/TCP.c
+++ b/Demos/Device/RNDISEthernet/Lib/TCP.c
diff --git a/Demos/Device/RNDISEthernet/TCP.h b/Demos/Device/RNDISEthernet/Lib/TCP.h
index d4b72a519..d4b72a519 100644
--- a/Demos/Device/RNDISEthernet/TCP.h
+++ b/Demos/Device/RNDISEthernet/Lib/TCP.h
diff --git a/Demos/Device/RNDISEthernet/UDP.c b/Demos/Device/RNDISEthernet/Lib/UDP.c
index 1f571c3e9..1f571c3e9 100644
--- a/Demos/Device/RNDISEthernet/UDP.c
+++ b/Demos/Device/RNDISEthernet/Lib/UDP.c
diff --git a/Demos/Device/RNDISEthernet/UDP.h b/Demos/Device/RNDISEthernet/Lib/UDP.h
index 60bbe2185..60bbe2185 100644
--- a/Demos/Device/RNDISEthernet/UDP.h
+++ b/Demos/Device/RNDISEthernet/Lib/UDP.h
diff --git a/Demos/Device/RNDISEthernet/Webserver.c b/Demos/Device/RNDISEthernet/Lib/Webserver.c
index c07f2c8bd..c07f2c8bd 100644
--- a/Demos/Device/RNDISEthernet/Webserver.c
+++ b/Demos/Device/RNDISEthernet/Lib/Webserver.c
diff --git a/Demos/Device/RNDISEthernet/Webserver.h b/Demos/Device/RNDISEthernet/Lib/Webserver.h
index b2193ad1f..b2193ad1f 100644
--- a/Demos/Device/RNDISEthernet/Webserver.h
+++ b/Demos/Device/RNDISEthernet/Lib/Webserver.h
diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h
index 7c3c8dabe..703af4003 100644
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h
@@ -45,11 +45,12 @@
 		#include <stdio.h>

 

 		#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 <LUFA/Version.h>                         // Library Version Information

 		#include <LUFA/Drivers/USB/USB.h>                 // USB Functionality

diff --git a/Demos/Device/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile
index 15c33efc5..f40c37b05 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
index 1f477f17a..1f477f17a 100644
--- a/Demos/Device/USBtoSerial/RingBuff.c
+++ b/Demos/Device/USBtoSerial/Lib/RingBuff.c
diff --git a/Demos/Device/USBtoSerial/RingBuff.h b/Demos/Device/USBtoSerial/Lib/RingBuff.h
index 23288d87a..23288d87a 100644
--- a/Demos/Device/USBtoSerial/RingBuff.h
+++ b/Demos/Device/USBtoSerial/Lib/RingBuff.h
diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index cd1f42c3f..8e7e8aed8 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -43,7 +43,8 @@
 		#include <avr/power.h>

 

 		#include "Descriptors.h"

-		#include "RingBuff.h"

+

+		#include "Lib/RingBuff.h"

 

 		#include <LUFA/Version.h>                         // Library Version Information

 		#include <LUFA/Drivers/USB/USB.h>                 // USB Functionality

diff --git a/Demos/Device/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile
index 7da8b9740..708e87246 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
index 95aafca8c..95aafca8c 100644
--- a/Demos/Host/MassStorageHost/MassStoreCommands.c
+++ b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.c
diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.h b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.h
index 28f6a1561..28f6a1561 100644
--- a/Demos/Host/MassStorageHost/MassStoreCommands.h
+++ b/Demos/Host/MassStorageHost/Lib/MassStoreCommands.h
diff --git a/Demos/Host/MassStorageHost/SCSI_Codes.h b/Demos/Host/MassStorageHost/Lib/SCSI_Codes.h
index 2b2213de2..2b2213de2 100644
--- a/Demos/Host/MassStorageHost/SCSI_Codes.h
+++ b/Demos/Host/MassStorageHost/Lib/SCSI_Codes.h
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 1646ad75e..6e1e5cd9e 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -45,7 +45,8 @@
 		#include <ctype.h>

 

 		#include "ConfigDescriptor.h"

-		#include "MassStoreCommands.h"

+

+		#include "Lib/MassStoreCommands.h"

 

 		#include <LUFA/Version.h>                                // Library Version Information

 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes

diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile
index d4792ae40..f50f59887 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
index 38755aba8..38755aba8 100644
--- a/Demos/Host/StillImageHost/PIMACodes.h
+++ b/Demos/Host/StillImageHost/Lib/PIMACodes.h
diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
index 8f05e48f4..8f05e48f4 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/Lib/StillImageCommands.c
diff --git a/Demos/Host/StillImageHost/StillImageCommands.h b/Demos/Host/StillImageHost/Lib/StillImageCommands.h
index ad0ba55a2..ad0ba55a2 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.h
+++ b/Demos/Host/StillImageHost/Lib/StillImageCommands.h
diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 909ed89bc..b563767cc 100644
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -43,8 +43,9 @@
 		#include <stdio.h>

 		

 		#include "ConfigDescriptor.h"

-		#include "PIMACodes.h"

-		#include "StillImageCommands.h"

+

+		#include "Lib/PIMACodes.h"

+		#include "Lib/StillImageCommands.h"

 

 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes

 		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality

diff --git a/Demos/Host/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile
index bcb036f25..8c1ca0b45 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               \