Fix unfinished printer host demo - some printer languages use embedded NULLs and...

[pub/USBasp.git] / Demos / Host / Incomplete / PrinterHost / ConfigDescriptor.c

diff --git a/Demos/Host/Incomplete/PrinterHost/ConfigDescriptor.c b/Demos/Host/Incomplete/PrinterHost/ConfigDescriptor.c
index ed4bdb9..d4eaff9 100644 (file)
--- a/Demos/Host/Incomplete/PrinterHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/PrinterHost/ConfigDescriptor.c
@@ -30,13 +30,16 @@
 \r
 #include "ConfigDescriptor.h"\r
 \r
+uint8_t PrinterInterfaceNumber;\r
+uint8_t PrinterAltSetting;\r
+\r
+\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
        uint8_t* ConfigDescriptorData;\r
        uint16_t ConfigDescriptorSize;\r
        uint8_t  ErrorCode;\r
        uint8_t  FoundEndpoints = 0;\r
-       uint8_t  FoundEndpointMask;\r
        \r
        /* Get Configuration Descriptor size from the device */\r
        if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r
@@ -58,35 +61,21 @@ uint8_t ProcessConfigurationDescriptor(void)
        \r
        /* Get the printer interface from the configuration descriptor */\r
        if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
-                                                  NextPrinterInterface)))\r
+                                                  DComp_NextBidirectionalPrinterInterface)))\r
        {\r
                /* Descriptor not found, error out */\r
                return NoInterfaceFound;\r
        }\r
-\r
-       /* Get the printer's communication protocol */\r
-       PrinterProtocol = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).Protocol;\r
        \r
-       /* Determine what endpoints to look for from the protocol */\r
-       switch (PrinterProtocol)\r
-       {\r
-               case PROTOCOL_UNIDIRECTIONAL:\r
-                       FoundEndpointMask = (1 << PRINTER_DATA_OUT_PIPE);\r
-                       break;\r
-               case PROTOCOL_BIDIRECTIONAL:\r
-               case PROTOCOL_IEEE1284:\r
-                       FoundEndpointMask = ((1 << PRINTER_DATA_OUT_PIPE) | (1 << PRINTER_DATA_IN_PIPE));\r
-                       break;\r
-               default:\r
-                       return NoInterfaceFound;\r
-       }\r
+       PrinterInterfaceNumber = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).InterfaceNumber;\r
+       PrinterAltSetting      = DESCRIPTOR_CAST(ConfigDescriptorData, USB_Descriptor_Interface_t).AlternateSetting;\r
 \r
-       /* Get the IN and OUT data endpoints for the mass storage interface */\r
-       while (FoundEndpoints != FoundEndpointMask)\r
+       /* Get the IN and OUT data endpoints for the printer interface */\r
+       while (FoundEndpoints != ((1 << PRINTER_DATA_OUT_PIPE) | (1 << PRINTER_DATA_IN_PIPE)))\r
        {\r
                /* Fetch the next bulk endpoint from the current printer interface */\r
                if ((ErrorCode = USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
-                                                          NextInterfaceBulkDataEndpoint)))\r
+                                                          DComp_NextInterfaceBulkDataEndpoint)))\r
                {\r
                        /* Descriptor not found, error out */\r
                        return NoEndpointFound;\r
@@ -123,15 +112,16 @@ uint8_t ProcessConfigurationDescriptor(void)
        return SuccessfulConfigRead;\r
 }\r
 \r
-uint8_t NextPrinterInterface(void* CurrentDescriptor)\r
+uint8_t DComp_NextBidirectionalPrinterInterface(void* CurrentDescriptor)\r
 {\r
-       /* PURPOSE: Find next mass storage class interface descriptor */\r
+       /* PURPOSE: Find next bidirectional protocol printer class interface descriptor */\r
 \r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
                /* Check the descriptor class and protocol, break out if correct class/protocol interface found */\r
                if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == PRINTER_CLASS)    &&\r
-                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == PRINTER_SUBCLASS))\r
+                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == PRINTER_SUBCLASS) &&\r
+                       (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == PRINTER_PROTOCOL))\r
                {\r
                        return DESCRIPTOR_SEARCH_Found;\r
                }\r
@@ -140,7 +130,7 @@ uint8_t NextPrinterInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
-uint8_t NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)\r
+uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor)\r
 {\r
        /* PURPOSE: Find next interface bulk endpoint descriptor before next interface descriptor */\r
 \r