Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint...

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

diff --git a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
index 0c1c820..948c4fc 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/ConfigDescriptor.c
@@ -37,7 +37,7 @@ uint8_t ProcessConfigurationDescriptor(void)
        uint8_t  FoundEndpoints = 0;\r
        \r
        /* Get Configuration Descriptor size from the device */\r
        uint8_t  FoundEndpoints = 0;\r
        \r
        /* Get Configuration Descriptor size from the device */\r

-       if (USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r
+       if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, NULL) != HOST_SENDCONTROL_Successful)\r

          return ControlErrorDuringConfigRead;\r
        \r
        /* Ensure that the Configuration Descriptor isn't too large */\r
          return ControlErrorDuringConfigRead;\r
        \r
        /* Ensure that the Configuration Descriptor isn't too large */\r


@@ -48,7 +48,7 @@ uint8_t ProcessConfigurationDescriptor(void)
        ConfigDescriptorData = alloca(ConfigDescriptorSize);\r
 \r
        /* Retrieve the entire configuration descriptor into the allocated buffer */\r
        ConfigDescriptorData = alloca(ConfigDescriptorSize);\r
 \r
        /* Retrieve the entire configuration descriptor into the allocated buffer */\r

-       USB_GetDeviceConfigDescriptor(&ConfigDescriptorSize, ConfigDescriptorData);\r
+       USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData);\r

        \r
        /* Validate returned data - ensure first entry is a configuration header descriptor */\r
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
        \r
        /* Validate returned data - ensure first entry is a configuration header descriptor */\r
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r


@@ -86,7 +86,6 @@ uint8_t ProcessConfigurationDescriptor(void)
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_SINGLE);\r
 \r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_SINGLE);\r
 \r

-                               Pipe_SetInfiniteINRequests();\r

                                Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r
                                \r
                                /* Set the flag indicating that the events notification pipe has been found */\r
                                Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r
                                \r
                                /* Set the flag indicating that the events notification pipe has been found */\r


@@ -102,8 +101,6 @@ uint8_t ProcessConfigurationDescriptor(void)
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_SINGLE);\r
 \r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                                                                   PIPE_BANK_SINGLE);\r
 \r

-                               Pipe_SetInfiniteINRequests();\r
-\r

                                /* Set the flag indicating that the data IN pipe has been found */\r
                                FoundEndpoints |= (1 << BLUETOOTH_DATA_IN_PIPE);\r
                        }\r
                                /* Set the flag indicating that the data IN pipe has been found */\r
                                FoundEndpoints |= (1 << BLUETOOTH_DATA_IN_PIPE);\r
                        }\r