Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBHUB]

Browse source 
- Check if the device is a composite device
- Report USB\COMPOSITE as compatible id when a usb compsite device is detected

svn path=/branches/usb-bringup-trunk/; revision=55134
This commit is contained in:
Johannes Anderwald 2012-01-23 23:29:54 +00:00
parent 98731d6286
commit e62233a8e7
1 changed files with 55 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/usb/usbhub_new/fdo.c
View file

@ -804,6 +804,34 @@ GetUsbStringDescriptor(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
ULONG
IsCompositeDevice(
PUSB_DEVICE_DESCRIPTOR DeviceDescriptor)
{
if (DeviceDescriptor->bDeviceClass == 0)
{
//
// composite device
//
return TRUE;
}
if (DeviceDescriptor->bDeviceClass == 0xEF &&
DeviceDescriptor->bDeviceSubClass == 0x02 &&
DeviceDescriptor->bDeviceProtocol == 0x01)
{
//
// USB-IF association descriptor
//
return TRUE;
}
//
// not a composite device
//
return FALSE;
}
NTSTATUS NTSTATUS
CreateDeviceIds( CreateDeviceIds(
PDEVICE_OBJECT UsbChildDeviceObject) PDEVICE_OBJECT UsbChildDeviceObject)
@ -813,15 +841,22 @@ CreateDeviceIds(
PWCHAR BufferPtr; PWCHAR BufferPtr;
WCHAR Buffer[100]; WCHAR Buffer[100];
PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension;
PUSB_DEVICE_DESCRIPTOR DeviceDescriptor;
//
// get child device extension
//
UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension;
// //
// Initialize the CompatibleIds String // Initialize the CompatibleIds String
// //
UsbChildExtension->usCompatibleIds.Length = 144; UsbChildExtension->usCompatibleIds.Length = 144; //FIXME
UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length;
//
// allocate mem for compatible id string
//
BufferPtr = ExAllocatePoolWithTag(NonPagedPool, BufferPtr = ExAllocatePoolWithTag(NonPagedPool,
UsbChildExtension->usCompatibleIds.Length, UsbChildExtension->usCompatibleIds.Length,
USB_HUB_TAG); USB_HUB_TAG);
@ -832,39 +867,43 @@ CreateDeviceIds(
} }
RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length); RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length);
Index = 0; Index = 0;
//
// get device descriptor
//
DeviceDescriptor = &UsbChildExtension->DeviceDesc;
// //
// Construct the CompatibleIds // Construct the CompatibleIds
// //
if (UsbChildExtension->DeviceDesc.bDeviceClass == 0) if (IsCompositeDevice(DeviceDescriptor))
{ {
PUSB_INTERFACE_DESCRIPTOR InterDesc = (PUSB_INTERFACE_DESCRIPTOR)
((ULONG_PTR)UsbChildExtension->FullConfigDesc + sizeof(USB_CONFIGURATION_DESCRIPTOR));
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x",
InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass,InterDesc->bInterfaceProtocol) + 1; DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1;
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x&SubClass_%02x", L"USB\\DevClass_%02x&SubClass_%02x",
InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass) + 1; DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1;
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x", L"USB\\DevClass_%02x",
InterDesc->bInterfaceClass) + 1; DeviceDescriptor->bDeviceClass) + 1;
Index += swprintf(&BufferPtr[Index],
L"USB\\COMPOSITE") + 1;
} }
else else
{ {
PUSB_DEVICE_DESCRIPTOR DevDesc = &UsbChildExtension->DeviceDesc;
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", L"USB\\Class_%02x&SubClass_%02x&Prot_%02x",
DevDesc->bDeviceClass,DevDesc->bDeviceSubClass,DevDesc->bDeviceProtocol) + 1; DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1;
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x&SubClass_%02x", L"USB\\Class_%02x&SubClass_%02x",
DevDesc->bDeviceClass,DevDesc->bDeviceSubClass) + 1; DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1;
Index += swprintf(&BufferPtr[Index], Index += swprintf(&BufferPtr[Index],
L"USB\\Class_%02x", L"USB\\Class_%02x",
DevDesc->bDeviceClass) + 1; DeviceDescriptor->bDeviceClass) + 1;
} }
BufferPtr[Index] = UNICODE_NULL; BufferPtr[Index] = UNICODE_NULL;
UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; UsbChildExtension->usCompatibleIds.Buffer = BufferPtr;
DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds);