Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-28 23:29:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBHUB_NEW]

Browse source 
- Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented.
- Remove an unused variable.

svn path=/branches/usb-bringup/; revision=51622
This commit is contained in:
Michael Martin 2011-05-07 16:10:09 +00:00
parent e9fe271ad6
commit 54c5af9906
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -688,21 +688,19 @@ GetUsbStringDescriptor(
//
// Get the index string descriptor length
// FIXME: Implement LangIds
//
Status = GetUsbDeviceDescriptor(ChildDeviceObject,
USB_STRING_DESCRIPTOR_TYPE,
Index,
0,
0x0409,
StringDesc,
sizeof(USB_STRING_DESCRIPTOR));
//
// If lenght is 4 only then either this is a bad index or the device is not reporting
//
if (StringDesc->bLength == 4)
if (!NT_SUCCESS(Status))
{
DPRINT1("USBHUB: Device Data Error\n");
return STATUS_UNSUCCESSFUL;
DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status);
ExFreePool(StringDesc);
return Status;
}
DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength);
@ -724,19 +722,21 @@ GetUsbStringDescriptor(
DPRINT1("Failed to allocate buffer for string!\n");
return STATUS_INSUFFICIENT_RESOURCES;
}
RtlZeroMemory(StringDesc, SizeNeeded);
//
// Get the string
//
Status = GetUsbDeviceDescriptor(ChildDeviceObject,
USB_STRING_DESCRIPTOR_TYPE,
Index,
0,
0x0409,
StringDesc,
SizeNeeded);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to get string from device\n");
DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status);
ExFreePool(StringDesc);
return Status;
}

2
drivers/usb/usbhub_new/usbhub.c
View file

@ -190,8 +190,6 @@ DriverEntry(
IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegistryPath)
{
ULONG i;
DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice;
DPRINT1("USBHUB: DriverEntry\n");