Move check for devices not supporting internal serials in demos which make use of USE_INTERNAL_SERIAL to Descriptors.c from Descriptors.h so that the warning is only generated at most once per compilation.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@802 d5102386-fcda-11dd-9fdb-3debd5008f28

16 files changed, 96 insertions, 32 deletions

diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.c b/Demos/Device/ClassDriver/CDC/Descriptors.c
index 5a8cc7ae..c8e0a9c7 100644
--- a/Demos/Device/ClassDriver/CDC/Descriptors.c
+++ b/Demos/Device/ClassDriver/CDC/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.h b/Demos/Device/ClassDriver/CDC/Descriptors.h
index a764b2b3..33ceab9c 100644
--- a/Demos/Device/ClassDriver/CDC/Descriptors.h
+++ b/Demos/Device/ClassDriver/CDC/Descriptors.h
@@ -41,10 +41,6 @@
 

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

 		#include <LUFA/Drivers/USB/Class/CDC.h>

-		

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

 

 	/* Macros: */

 		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

diff --git a/Demos/Device/ClassDriver/DualCDC/Descriptors.c b/Demos/Device/ClassDriver/DualCDC/Descriptors.c
index 8815b9e5..d7601955 100644
--- a/Demos/Device/ClassDriver/DualCDC/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualCDC/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/ClassDriver/DualCDC/Descriptors.h b/Demos/Device/ClassDriver/DualCDC/Descriptors.h
index 739303ed..49befad3 100644
--- a/Demos/Device/ClassDriver/DualCDC/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualCDC/Descriptors.h
@@ -42,10 +42,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 		#include <LUFA/Drivers/USB/Class/CDC.h>

 

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

-

 	/* Macros: */

 		/** Endpoint number of the first CDC interface's device-to-host notification IN endpoint. */

 		#define CDC1_NOTIFICATION_EPNUM        3

diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.c b/Demos/Device/ClassDriver/MassStorage/Descriptors.c
index b8249238..4dcc4bb2 100644
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.h b/Demos/Device/ClassDriver/MassStorage/Descriptors.h
index 5cf653a5..6d90b3d0 100644
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.h
@@ -42,10 +42,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 		#include <LUFA/Drivers/USB/Class/MassStorage.h>

 

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

-

 	/* Macros: */

 		/** Endpoint number of the Mass Storage device-to-host data IN endpoint. */

 		#define MASS_STORAGE_IN_EPNUM          3	

diff --git a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.c b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.c
index f88a5f82..60f2c320 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
index f78f395a..730acc60 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/USBtoSerial/Descriptors.h
@@ -42,10 +42,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 		#include <LUFA/Drivers/USB/Class/CDC.h>

 

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

-

 	/* Macros: */

 		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

 		#define CDC_NOTIFICATION_EPNUM         2

diff --git a/Demos/Device/LowLevel/CDC/Descriptors.c b/Demos/Device/LowLevel/CDC/Descriptors.c
index e81b0342..2d857a69 100644
--- a/Demos/Device/LowLevel/CDC/Descriptors.c
+++ b/Demos/Device/LowLevel/CDC/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/LowLevel/CDC/Descriptors.h b/Demos/Device/LowLevel/CDC/Descriptors.h
index a3d101e8..08e2e353 100644
--- a/Demos/Device/LowLevel/CDC/Descriptors.h
+++ b/Demos/Device/LowLevel/CDC/Descriptors.h
@@ -40,10 +40,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 

 		#include <avr/pgmspace.h>

-

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

 		

 	/* Macros: */

 		/** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a

diff --git a/Demos/Device/LowLevel/DualCDC/Descriptors.c b/Demos/Device/LowLevel/DualCDC/Descriptors.c
index a7f7b039..e64bfb1a 100644
--- a/Demos/Device/LowLevel/DualCDC/Descriptors.c
+++ b/Demos/Device/LowLevel/DualCDC/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/LowLevel/DualCDC/Descriptors.h b/Demos/Device/LowLevel/DualCDC/Descriptors.h
index 781ba5c3..de4dd27a 100644
--- a/Demos/Device/LowLevel/DualCDC/Descriptors.h
+++ b/Demos/Device/LowLevel/DualCDC/Descriptors.h
@@ -40,10 +40,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 

 		#include <avr/pgmspace.h>

-

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

 		

 	/* Macros: */

 		/** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a

diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.c b/Demos/Device/LowLevel/MassStorage/Descriptors.c
index b8249238..4dcc4bb2 100644
--- a/Demos/Device/LowLevel/MassStorage/Descriptors.c
+++ b/Demos/Device/LowLevel/MassStorage/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.h b/Demos/Device/LowLevel/MassStorage/Descriptors.h
index 9b9dd7d3..0fa147b7 100644
--- a/Demos/Device/LowLevel/MassStorage/Descriptors.h
+++ b/Demos/Device/LowLevel/MassStorage/Descriptors.h
@@ -41,10 +41,6 @@
 

 		#include <avr/pgmspace.h>

 

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

-

 	/* Macros: */

 		/** Endpoint number of the Mass Storage device-to-host data IN endpoint. */

 		#define MASS_STORAGE_IN_EPNUM          3	

diff --git a/Demos/Device/LowLevel/USBtoSerial/Descriptors.c b/Demos/Device/LowLevel/USBtoSerial/Descriptors.c
index d3f7e921..495ab3e7 100644
--- a/Demos/Device/LowLevel/USBtoSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/USBtoSerial/Descriptors.c
@@ -37,6 +37,18 @@
 

 #include "Descriptors.h"

 

+/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as

+ * the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.

+ * This allows the host to track a device across insertions on different ports, allowing them to retain allocated

+ * resources like COM port numbers and drivers. On demos using this feature, give a warning on unsupported devices

+ * so that the user can supply their own serial number descriptor instead or remove the USE_INTERNAL_SERIAL value

+ * from the Device Descriptor (forcing the host to generate a serial number for each device from the VID, PID and

+ * port location).

+ */

+#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

+	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+#endif

+

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

  *  device characteristics, including the supported USB version, control endpoint size and the

  *  number of device configurations. The descriptor is read out by the USB host when the enumeration

diff --git a/Demos/Device/LowLevel/USBtoSerial/Descriptors.h b/Demos/Device/LowLevel/USBtoSerial/Descriptors.h
index a3d101e8..08e2e353 100644
--- a/Demos/Device/LowLevel/USBtoSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/USBtoSerial/Descriptors.h
@@ -40,10 +40,6 @@
 		#include <LUFA/Drivers/USB/USB.h>

 

 		#include <avr/pgmspace.h>

-

-		#if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-			#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

-		#endif

 		

 	/* Macros: */

 		/** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a