2 files changed, 6 insertions, 15 deletions
diff --git a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
index b269820e4..30096743f 100644
--- a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.c
@@ -132,10 +132,10 @@ uint8_t DComp_NextBidirectionalPrinterInterface(void* CurrentDescriptor)
 {
 	if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
 	{
-		/* Check the descriptor class and protocol, break out if correct class/protocol interface found */
-		if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == PRINTER_CLASS)    &&
-		    (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == PRINTER_SUBCLASS) &&
-			(DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == PRINTER_PROTOCOL))
+		/* Check the descriptor class, subclass and protocol, break out if correct value interface found */
+		if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == PRNT_CSCP_PrinterClass)    &&
+		    (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == PRNT_CSCP_PrinterSubclass) &&
+			(DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == PRNT_CSCP_BidirectionalProtocol))
 		{
 			return DESCRIPTOR_SEARCH_Found;
 		}
diff --git a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
index b25f3bdc7..9b9750362 100644
--- a/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/PrinterHost/ConfigDescriptor.h
@@ -38,15 +38,6 @@
 		#include "Lib/PrinterCommands.h"
 
 	/* Macros: */
-		/** Interface Class value for the Printer Device class. */
-		#define PRINTER_CLASS                    0x07
-
-		/** Interface Subclass value for the Printer Device class. */
-		#define PRINTER_SUBCLASS                 0x01
-
-		/** Interface Protocol value for a Bidirectional communication encapsulation. */
-		#define PRINTER_PROTOCOL                 0x02
-
 		/** Pipe number of the Printer data IN pipe. */
 		#define PRINTER_DATA_IN_PIPE             1
 
@@ -68,12 +59,12 @@
 		/** Interface index of the Bidirectional Printer interface within the device, once the Configuration
 		 *  Descriptor has been processed.
 		 */
-		uint8_t PrinterInterfaceNumber;
+		extern uint8_t PrinterInterfaceNumber;
 
 		/** Interface Alternate Setting index of the Bidirectional Printer interface within the device, once
 		 *  the Configuration Descriptor has been processed.
 		 */
-		uint8_t PrinterAltSetting;
+		extern uint8_t PrinterAltSetting;
 
 	/* Function Prototypes: */
 		uint8_t ProcessConfigurationDescriptor(void);