ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 04:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[usb/usbehci]

Browse Source 
- Instead of converting GUID to UNICODE_STRING and comparing, use IsEqualGUIDAligned. Thanks Ged.
- Remove a unneeded header.

svn path=/trunk/; revision=46761
This commit is contained in:
Michael Martin
2010-04-07 11:09:36 +00:00
parent 56eef6c56d
commit f1c016d7cd
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/usb/usbehci/pdo.c
+7 -26
View File
@@ -17,7 +17,6 @@
#include <wdmguid.h>
#include <stdio.h>
#include <debug.h>
#include <guiddef.h>
/* Lifted from Linux with slight changes */
const UCHAR ROOTHUB2_DEVICE_DESCRIPTOR [] =
@@ -540,22 +539,16 @@ PdoDispatchPnp(
case IRP_MN_QUERY_INTERFACE:
{
UNICODE_STRING GuidString;
UNICODE_STRING InterfacMatchString;
PUSB_BUS_INTERFACE_HUB_V5 InterfaceHub;
PUSB_BUS_INTERFACE_USBDI_V2 InterfaceDI;
PPDO_DEVICE_EXTENSION PdoDeviceExtension;
PFDO_DEVICE_EXTENSION FdoDeviceExtension;
NTSTATUS CompareStatus;
PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension;
/* Assume success */
Status = STATUS_SUCCESS;
Information = 0;
CompareStatus = RtlStringFromGUID(Stack->Parameters.QueryInterface.InterfaceType, &GuidString);
if (!NT_SUCCESS(CompareStatus))
Status = RtlStringFromGUID(Stack->Parameters.QueryInterface.InterfaceType, &GuidString);
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to create string from GUID!\n");
}
@@ -564,15 +557,11 @@ PdoDispatchPnp(
DPRINT1("QueryInterface.Size %x\n", Stack->Parameters.QueryInterface.Size);
DPRINT1("QueryInterface.Version %x\n", Stack->Parameters.QueryInterface.Version);
CompareStatus = RtlStringFromGUID(&USB_BUS_INTERFACE_HUB_GUID, &InterfacMatchString);
if (!NT_SUCCESS(CompareStatus))
{
DPRINT1("Failed to create string from GUID!\n");
}
/* Assume success */
Status = STATUS_SUCCESS;
Information = 0;
CompareStatus = RtlCompareUnicodeString(&InterfacMatchString, &GuidString, TRUE);
if (NT_SUCCESS(CompareStatus))
if (IsEqualGUIDAligned(Stack->Parameters.QueryInterface.InterfaceType, &USB_BUS_INTERFACE_HUB_GUID))
{
InterfaceHub = (PUSB_BUS_INTERFACE_HUB_V5)Stack->Parameters.QueryInterface.Interface;
InterfaceHub->Version = Stack->Parameters.QueryInterface.Version;
@@ -622,15 +611,7 @@ PdoDispatchPnp(
break;
}
CompareStatus = RtlStringFromGUID(&USB_BUS_INTERFACE_USBDI_GUID, &InterfacMatchString);
if (!NT_SUCCESS(CompareStatus))
{
DPRINT1("Failed to create string from GUID!\n");
}
CompareStatus = RtlCompareUnicodeString(&InterfacMatchString, &GuidString, TRUE);
if (NT_SUCCESS(CompareStatus))
if (IsEqualGUIDAligned(Stack->Parameters.QueryInterface.InterfaceType, &USB_BUS_INTERFACE_USBDI_GUID))
{
InterfaceDI = (PUSB_BUS_INTERFACE_USBDI_V2) Stack->Parameters.QueryInterface.Interface;
InterfaceDI->Version = Stack->Parameters.QueryInterface.Version;