Added new HOST_STATE_WaitForDeviceRemoval host state machine state for non-blocking...

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

diff --git a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
index e9f575c..f68f957 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
@@ -34,28 +34,15 @@ uint8_t ProcessDeviceDescriptor(void)
 {\r
        USB_Descriptor_Device_t DeviceDescriptor;\r
 \r
 {\r
        USB_Descriptor_Device_t DeviceDescriptor;\r
 \r

-       /* Standard request to get the device descriptor */\r
-       USB_ControlRequest = (USB_Request_Header_t)\r
-               {\r
-                       bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                       bRequest:      REQ_GetDescriptor,\r
-                       wValue:        (DTYPE_Device << 8),\r
-                       wIndex:        0,\r
-                       wLength:       sizeof(USB_Descriptor_Device_t),\r
-               };\r
-\r
-       /* Select the control pipe for the request transfer */\r
-       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
-\r

        /* Send the request to retrieve the device descriptor */\r
        /* Send the request to retrieve the device descriptor */\r

-       if (USB_Host_SendControlRequest((void*)&DeviceDescriptor) != HOST_SENDCONTROL_Successful)\r
+       if (USB_Host_GetDeviceDescriptor(&DeviceDescriptor) != HOST_SENDCONTROL_Successful)\r

          return ControlErrorDuringDeviceRead;\r
          \r
        /* Validate returned data - ensure the returned data is a device descriptor */\r
        if (DeviceDescriptor.Header.Type != DTYPE_Device)\r
          return InvalidDeviceDataReturned;\r
          \r
          return ControlErrorDuringDeviceRead;\r
          \r
        /* Validate returned data - ensure the returned data is a device descriptor */\r
        if (DeviceDescriptor.Header.Type != DTYPE_Device)\r
          return InvalidDeviceDataReturned;\r
          \r

-       if ((DeviceDescriptor.Class != BLUETOOTH_DEVICE_CLASS) ||\r
+       if ((DeviceDescriptor.Class    != BLUETOOTH_DEVICE_CLASS)    ||\r

            (DeviceDescriptor.SubClass != BLUETOOTH_DEVICE_SUBCLASS) ||\r
            (DeviceDescriptor.Protocol != BLUETOOTH_DEVICE_PROTOCOL))\r
        {\r
            (DeviceDescriptor.SubClass != BLUETOOTH_DEVICE_SUBCLASS) ||\r
            (DeviceDescriptor.Protocol != BLUETOOTH_DEVICE_PROTOCOL))\r
        {\r