Extend incomplete RNDISHost demo -- can not enumerate a RNDIS device correctly and...

[pub/USBasp.git] / Demos / Host / LowLevel / CDCHost / ConfigDescriptor.c

diff --git a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c b/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
index f9671e2..d0fc994 100644 (file)
--- a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
@@ -43,12 +43,12 @@
  *\r
  *  This routine searches for a CDC interface descriptor containing bulk data IN and OUT endpoints, and an interrupt event endpoint.\r
  *\r
  *\r
  *  This routine searches for a CDC interface descriptor containing bulk data IN and OUT endpoints, and an interrupt event endpoint.\r
  *\r

- *  \return An error code from the CDCHost_GetConfigDescriptorDataCodes_t enum.\r
+ *  \return An error code from the \ref CDCHost_GetConfigDescriptorDataCodes_t enum.\r

  */\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
        uint8_t  ConfigDescriptorData[512];\r
  */\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
        uint8_t  ConfigDescriptorData[512];\r

-       uint8_t* CurrConfigLocation = ConfigDescriptorData;\r
+       void*    CurrConfigLocation = ConfigDescriptorData;\r

        uint16_t CurrConfigBytesRem;\r
        uint8_t  FoundEndpoints = 0;\r
 \r
        uint16_t CurrConfigBytesRem;\r
        uint8_t  FoundEndpoints = 0;\r
 \r


@@ -73,12 +73,12 @@ uint8_t ProcessConfigurationDescriptor(void)
                return NoCDCInterfaceFound;\r
        }\r
 \r
                return NoCDCInterfaceFound;\r
        }\r
 \r

-       /* Get the IN and OUT data endpoints for the CDC interface */\r
+       /* Get the IN and OUT data and IN notification endpoints for the CDC interface */\r

        while (FoundEndpoints != ((1 << CDC_NOTIFICATIONPIPE) | (1 << CDC_DATAPIPE_IN) | (1 << CDC_DATAPIPE_OUT)))\r
        {\r
                /* Fetch the next bulk or interrupt endpoint from the current CDC interface */\r
                if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,\r
        while (FoundEndpoints != ((1 << CDC_NOTIFICATIONPIPE) | (1 << CDC_DATAPIPE_IN) | (1 << CDC_DATAPIPE_OUT)))\r
        {\r
                /* Fetch the next bulk or interrupt endpoint from the current CDC interface */\r
                if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,\r

-                                             DComp_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                                             DComp_NextCDCDataInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r

                {\r
                        /* Check to see if the control interface's notification pipe has been found, if so search for the data interface */\r
                        if (FoundEndpoints & (1 << CDC_NOTIFICATIONPIPE))\r
                {\r
                        /* Check to see if the control interface's notification pipe has been found, if so search for the data interface */\r
                        if (FoundEndpoints & (1 << CDC_NOTIFICATIONPIPE))\r


@@ -115,14 +115,14 @@ uint8_t ProcessConfigurationDescriptor(void)
 \r
                        /* Fetch the next bulk or interrupt endpoint from the current CDC interface */\r
                        if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,\r
 \r
                        /* Fetch the next bulk or interrupt endpoint from the current CDC interface */\r
                        if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation,\r

-                                                     DComp_NextInterfaceCDCDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r
+                                                     DComp_NextCDCDataInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)\r

                        {\r
                                /* Descriptor not found, error out */\r
                                return NoEndpointFound;\r
                        }\r
                }\r
                \r
                        {\r
                                /* Descriptor not found, error out */\r
                                return NoEndpointFound;\r
                        }\r
                }\r
                \r

-               USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);\r
+               USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(CurrConfigLocation, USB_Descriptor_Endpoint_t);\r

 \r
                /* Check if the found endpoint is a interrupt or bulk type descriptor */\r
                if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r
 \r
                /* Check if the found endpoint is a interrupt or bulk type descriptor */\r
                if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)\r


@@ -226,7 +226,7 @@ uint8_t DComp_NextCDCDataInterface(void* CurrentDescriptor)
  *\r
  *  \return A value from the DSEARCH_Return_ErrorCodes_t enum\r
  */\r
  *\r
  *  \return A value from the DSEARCH_Return_ErrorCodes_t enum\r
  */\r

-uint8_t DComp_NextInterfaceCDCDataEndpoint(void* CurrentDescriptor)\r
+uint8_t DComp_NextCDCDataInterfaceEndpoint(void* CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r