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.

8 files changed, 48 insertions, 16 deletions

diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.c b/Demos/Device/ClassDriver/CDC/Descriptors.c
index 5a8cc7aed..c8e0a9c71 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 a764b2b32..33ceab9c5 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 8815b9e57..d76019556 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 739303edd..49befad38 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 b82492386..4dcc4bb26 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 5cf653a56..6d90b3d02 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 f88a5f82f..60f2c3200 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 f78f395a3..730acc601 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