X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f9f1bcc25c17b031029200cd9648d76d4ee39dc4..24f730fce3f2022762011d795c3feada5ef874b3:/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c?ds=sidebyside diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c index d09e4c493..73e0abe87 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.c @@ -43,16 +43,16 @@ * * This routine searches for a HID interface descriptor containing at least one Interrupt type IN endpoint and HID descriptor. * - * \return An error code from the KeyboardHostWithParser_GetConfigDescriptorDataCodes_t enum. + * \return An error code from the \ref KeyboardHostWithParser_GetConfigDescriptorDataCodes_t enum. */ uint8_t ProcessConfigurationDescriptor(void) { uint8_t ConfigDescriptorData[512]; - uint8_t* CurrConfigLocation = ConfigDescriptorData; + void* CurrConfigLocation = ConfigDescriptorData; uint16_t CurrConfigBytesRem; /* Retrieve the entire configuration descriptor into the allocated buffer */ - switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) + switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) { case HOST_GETCONFIG_Successful: break; @@ -85,7 +85,7 @@ uint8_t ProcessConfigurationDescriptor(void) /* Get the keyboard interface's data endpoint descriptor */ if (USB_GetNextDescriptorComp(&CurrConfigBytesRem, &CurrConfigLocation, - DComp_NextInterfaceKeyboardDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DComp_NextKeyboardInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { /* Descriptor not found, error out */ return NoEndpointFound; @@ -134,7 +134,7 @@ uint8_t DComp_NextKeyboardInterface(void* CurrentDescriptor) * * \return A value from the DSEARCH_Return_ErrorCodes_t enum */ -uint8_t DComp_NextInterfaceKeyboardDataEndpoint(void* CurrentDescriptor) +uint8_t DComp_NextKeyboardInterfaceDataEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) {