diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf b/Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf
index 04af23b64c6..b505cf51a08 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - Dual CDC Device Demo"
+PROJECT_NAME = "LUFA Library - Dual Virtual Serial Device Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.c b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
similarity index 100%
rename from Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.c
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.h b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
similarity index 100%
rename from Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.h
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.txt b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt
similarity index 100%
rename from Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.txt
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.txt
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualCDC.inf b/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf
similarity index 100%
rename from Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualCDC.inf
rename to Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualVirtualSerial.inf
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/makefile b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
index 466865a6d79..d8cf086b8e1 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = DualCDC
+TARGET = DualVirtualSerial
# Object files directory
diff --git a/Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf b/Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf
index fa91d220753..57d10235944 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf
+++ b/Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - CDC Device Demo"
+PROJECT_NAME = "LUFA Library - Virtual Serial Device Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Device/ClassDriver/VirtualSerial/LUFA CDC.inf b/Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerial/LUFA CDC.inf
rename to Demos/Device/ClassDriver/VirtualSerial/LUFA VirtualSerial.inf
diff --git a/Demos/Device/ClassDriver/VirtualSerial/CDC.c b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerial/CDC.c
rename to Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
diff --git a/Demos/Device/ClassDriver/VirtualSerial/CDC.h b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerial/CDC.h
rename to Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
diff --git a/Demos/Device/ClassDriver/VirtualSerial/CDC.txt b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.txt
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerial/CDC.txt
rename to Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.txt
diff --git a/Demos/Device/ClassDriver/VirtualSerial/makefile b/Demos/Device/ClassDriver/VirtualSerial/makefile
index 8b67fd3ba44..024bf928920 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerial/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = CDC
+TARGET = VirtualSerial
# Object files directory
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf b/Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf
index 38e30f5f7f2..30849907a78 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - Combined CDC and Mouse Device Demo"
+PROJECT_NAME = "LUFA Library - Combined Virtual Serial and Mouse Device Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA CDCMouse.inf b/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerialMouse/LUFA CDCMouse.inf
rename to Demos/Device/ClassDriver/VirtualSerialMouse/LUFA VirtualSerialMouse.inf
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.c b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.c
rename to Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.h b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.h
rename to Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.txt b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt
similarity index 100%
rename from Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.txt
rename to Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.txt
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/makefile b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
index 85e3e97a387..990760e85f0 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = CDCMouse
+TARGET = VirtualSerialMouse
# Object files directory
diff --git a/Demos/Device/ClassDriver/makefile b/Demos/Device/ClassDriver/makefile
index 288e01fe448..13a317635d3 100644
--- a/Demos/Device/ClassDriver/makefile
+++ b/Demos/Device/ClassDriver/makefile
@@ -20,14 +20,8 @@ all:
make -C AudioOutput clean
make -C AudioOutput all
- make -C CDC clean
- make -C CDC all
-
- make -C CDCMouse clean
- make -C CDCMouse all
-
- make -C DualCDC clean
- make -C DualCDC all
+ make -C DualVirtualSerial clean
+ make -C DualVirtualSerial all
make -C GenericHID clean
make -C GenericHID all
@@ -56,12 +50,16 @@ all:
make -C RNDISEthernet clean
make -C RNDISEthernet all
+ make -C VirtualSerial clean
+ make -C VirtualSerial all
+
+ make -C VirtualSerialMouse clean
+ make -C VirtualSerialMouse all
+
%:
make -C AudioInput $@
make -C AudioOutput $@
- make -C CDC $@
- make -C CDCMouse $@
- make -C DualCDC $@
+ make -C DualVirtualSerial $@
make -C GenericHID $@
make -C Joystick $@
make -C Keyboard $@
@@ -71,3 +69,5 @@ all:
make -C MIDI $@
make -C Mouse $@
make -C RNDISEthernet $@
+ make -C VirtualSerial $@
+ make -C VirtualSerialMouse $@
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf b/Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf
index 04af23b64c6..b505cf51a08 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - Dual CDC Device Demo"
+PROJECT_NAME = "LUFA Library - Dual Virtual Serial Device Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.c b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
similarity index 100%
rename from Demos/Device/LowLevel/DualVirtualSerial/DualCDC.c
rename to Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.h b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
similarity index 100%
rename from Demos/Device/LowLevel/DualVirtualSerial/DualCDC.h
rename to Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.txt b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt
similarity index 100%
rename from Demos/Device/LowLevel/DualVirtualSerial/DualCDC.txt
rename to Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.txt
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualCDC.inf b/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf
similarity index 100%
rename from Demos/Device/LowLevel/DualVirtualSerial/LUFA DualCDC.inf
rename to Demos/Device/LowLevel/DualVirtualSerial/LUFA DualVirtualSerial.inf
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/makefile b/Demos/Device/LowLevel/DualVirtualSerial/makefile
index 802a4dd5cf3..ef10bb38d82 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/makefile
+++ b/Demos/Device/LowLevel/DualVirtualSerial/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = DualCDC
+TARGET = DualVirtualSerial
# Object files directory
diff --git a/Demos/Device/LowLevel/VirtualSerial/Doxygen.conf b/Demos/Device/LowLevel/VirtualSerial/Doxygen.conf
index fa91d220753..57d10235944 100644
--- a/Demos/Device/LowLevel/VirtualSerial/Doxygen.conf
+++ b/Demos/Device/LowLevel/VirtualSerial/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - CDC Device Demo"
+PROJECT_NAME = "LUFA Library - Virtual Serial Device Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Device/LowLevel/VirtualSerial/LUFA CDC.inf b/Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf
similarity index 100%
rename from Demos/Device/LowLevel/VirtualSerial/LUFA CDC.inf
rename to Demos/Device/LowLevel/VirtualSerial/LUFA VirtualSerial.inf
diff --git a/Demos/Device/LowLevel/VirtualSerial/CDC.c b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
similarity index 100%
rename from Demos/Device/LowLevel/VirtualSerial/CDC.c
rename to Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
diff --git a/Demos/Device/LowLevel/VirtualSerial/CDC.h b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
similarity index 100%
rename from Demos/Device/LowLevel/VirtualSerial/CDC.h
rename to Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
diff --git a/Demos/Device/LowLevel/VirtualSerial/CDC.txt b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.txt
similarity index 100%
rename from Demos/Device/LowLevel/VirtualSerial/CDC.txt
rename to Demos/Device/LowLevel/VirtualSerial/VirtualSerial.txt
diff --git a/Demos/Device/LowLevel/VirtualSerial/makefile b/Demos/Device/LowLevel/VirtualSerial/makefile
index 934b3d014e0..6528651341c 100644
--- a/Demos/Device/LowLevel/VirtualSerial/makefile
+++ b/Demos/Device/LowLevel/VirtualSerial/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = CDC
+TARGET = VirtualSerial
# Object files directory
diff --git a/Demos/Device/LowLevel/makefile b/Demos/Device/LowLevel/makefile
index 68bcac61af3..991b37e4968 100644
--- a/Demos/Device/LowLevel/makefile
+++ b/Demos/Device/LowLevel/makefile
@@ -20,11 +20,8 @@ all:
make -C AudioOutput clean
make -C AudioOutput all
- make -C CDC clean
- make -C CDC all
-
- make -C DualCDC clean
- make -C DualCDC all
+ make -C DualVirtualSerial clean
+ make -C DualVirtualSerial all
make -C GenericHID clean
make -C GenericHID all
@@ -50,11 +47,13 @@ all:
make -C RNDISEthernet clean
make -C RNDISEthernet all
+ make -C VirtualSerial clean
+ make -C VirtualSerial all
+
%:
make -C AudioInput $@
make -C AudioOutput $@
- make -C CDC $@
- make -C DualCDC $@
+ make -C DualVirtualSerial $@
make -C GenericHID $@
make -C Joystick $@
make -C Keyboard $@
@@ -63,3 +62,4 @@ all:
make -C MIDI $@
make -C Mouse $@
make -C RNDISEthernet $@
+ make -C VirtualSerial $@
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf b/Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf
index 3f2e0b92036..097bd05cccc 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - CDC Host Demo"
+PROJECT_NAME = "LUFA Library - Virtual Serial Host Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
similarity index 100%
rename from Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.c
rename to Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.h b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
similarity index 100%
rename from Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.h
rename to Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.txt b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.txt
similarity index 100%
rename from Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.txt
rename to Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.txt
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/makefile b/Demos/Host/ClassDriver/VirtualSerialHost/makefile
index 345fbe45a80..2942a6debbd 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/makefile
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = CDCHost
+TARGET = VirtualSerialHost
# Object files directory
diff --git a/Demos/Host/ClassDriver/makefile b/Demos/Host/ClassDriver/makefile
index e7ad330d43c..fb9487c9832 100644
--- a/Demos/Host/ClassDriver/makefile
+++ b/Demos/Host/ClassDriver/makefile
@@ -14,9 +14,6 @@
# code.
all:
- make -C CDCHost clean
- make -C CDCHost all
-
make -C JoystickHostWithParser clean
make -C JoystickHostWithParser all
@@ -46,9 +43,11 @@ all:
make -C StillImageHost clean
make -C StillImageHost all
+
+ make -C VirtualSerialHost clean
+ make -C VirtualSerialHost all
%:
- make -C CDCHost $@
make -C JoystickHostWithParser $@
make -C KeyboardHost $@
make -C KeyboardHostWithParser $@
@@ -58,3 +57,4 @@ all:
make -C PrinterHost $@
make -C RNDISEthernetHost $@
make -C StillImageHost $@
+ make -C VirtualSerialHost $@
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf b/Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf
index 3f2e0b92036..097bd05cccc 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf
+++ b/Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "LUFA Library - CDC Host Demo"
+PROJECT_NAME = "LUFA Library - Virtual Serial Host Demo"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.c b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
similarity index 100%
rename from Demos/Host/LowLevel/VirtualSerialHost/CDCHost.c
rename to Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.h b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
similarity index 100%
rename from Demos/Host/LowLevel/VirtualSerialHost/CDCHost.h
rename to Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.txt b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.txt
similarity index 100%
rename from Demos/Host/LowLevel/VirtualSerialHost/CDCHost.txt
rename to Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.txt
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/makefile b/Demos/Host/LowLevel/VirtualSerialHost/makefile
index 6c9c7c8f8bf..168b1b47495 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/makefile
+++ b/Demos/Host/LowLevel/VirtualSerialHost/makefile
@@ -102,7 +102,7 @@ FORMAT = ihex
# Target file name (without extension).
-TARGET = CDCHost
+TARGET = VirtualSerialHost
# Object files directory
diff --git a/Demos/Host/LowLevel/makefile b/Demos/Host/LowLevel/makefile
index a69b25ba4d8..e812856787e 100644
--- a/Demos/Host/LowLevel/makefile
+++ b/Demos/Host/LowLevel/makefile
@@ -14,9 +14,6 @@
# code.
all:
- make -C CDCHost clean
- make -C CDCHost all
-
make -C GenericHIDHost clean
make -C GenericHIDHost all
@@ -47,8 +44,10 @@ all:
make -C RNDISEthernetHost clean
make -C RNDISEthernetHost all
+ make -C VirtualSerialHost clean
+ make -C VirtualSerialHost all
+
%:
- make -C CDCHost $@
make -C GenericHIDHost $@
make -C JoystickHostWithParser $@
make -C KeyboardHost $@
@@ -60,3 +59,4 @@ all:
make -C PrinterHost $@
make -C StillImageHost $@
make -C RNDISEthernetHost $@
+ make -C VirtualSerialHost $@
diff --git a/LUFA.pnproj b/LUFA.pnproj
index 4fc2d05d967..ad42f6b3946 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file