Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 01:24:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[usb/usbehci]

Browse source 
- Check the Interface GUID instead of only the version and size.
- Handle up to USB_BUS_INTERFACE_USBDI_V2 and USB_BUS_INTERFACE_HUB_V5. Driver gets further in win2k.
- Basic implementation of Direct Call Function CreateUsbDevice.
- Fix GetRootHubSymbolicName to return RootHub20.
- Change return status to not supported for functions not implemented yet.

svn path=/trunk/; revision=46760
This commit is contained in:
Michael Martin 2010-04-07 10:25:36 +00:00
parent 01f84db1d4
commit 56eef6c56d
2 changed files with 126 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
reactos/drivers/usb/usbehci/pdo.c
View file

@ -17,6 +17,7 @@
#include <wdmguid.h> #include <wdmguid.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
#include <guiddef.h>
/* Lifted from Linux with slight changes */ /* Lifted from Linux with slight changes */
const UCHAR ROOTHUB2_DEVICE_DESCRIPTOR [] = const UCHAR ROOTHUB2_DEVICE_DESCRIPTOR [] =
@ -98,7 +99,8 @@ UrbWorkerThread(PVOID Context)
PVOID InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub) PVOID InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub)
{ {
PUSB_DEVICE UsbDevicePointer = NULL; PUSB_DEVICE UsbDevicePointer = NULL;
UsbDevicePointer = ExAllocatePool(NonPagedPool, sizeof(USB_DEVICE)); UsbDevicePointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEVICE), USB_POOL_TAG);
if (!UsbDevicePointer) if (!UsbDevicePointer)
{ {
DPRINT1("Out of memory\n"); DPRINT1("Out of memory\n");
@ -538,75 +540,132 @@ PdoDispatchPnp(
case IRP_MN_QUERY_INTERFACE: case IRP_MN_QUERY_INTERFACE:
{ {
UNICODE_STRING GuidString; UNICODE_STRING GuidString;
UNICODE_STRING InterfacMatchString;
PUSB_BUS_INTERFACE_HUB_V5 InterfaceHub; PUSB_BUS_INTERFACE_HUB_V5 InterfaceHub;
PUSB_BUS_INTERFACE_USBDI_V2 InterfaceDI; PUSB_BUS_INTERFACE_USBDI_V2 InterfaceDI;
PPDO_DEVICE_EXTENSION PdoDeviceExtension; PPDO_DEVICE_EXTENSION PdoDeviceExtension;
PFDO_DEVICE_EXTENSION FdoDeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExtension;
NTSTATUS CompareStatus;
PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension;
Status = RtlStringFromGUID(Stack->Parameters.QueryInterface.InterfaceType, &GuidString); /* Assume success */
if (!NT_SUCCESS(Status)) Status = STATUS_SUCCESS;
Information = 0;
CompareStatus = RtlStringFromGUID(Stack->Parameters.QueryInterface.InterfaceType, &GuidString);
if (!NT_SUCCESS(CompareStatus))
{ {
DPRINT1("Failed to create string from GUID!\n"); DPRINT1("Failed to create string from GUID!\n");
} }
DPRINT1("Interface GUID requested %wZ\n", &GuidString); DPRINT1("Interface GUID requested %wZ\n", &GuidString);
DPRINT1("QueryInterface.Size %x\n", Stack->Parameters.QueryInterface.Size); DPRINT1("QueryInterface.Size %x\n", Stack->Parameters.QueryInterface.Size);
DPRINT1("QueryInterface.Version %x\n", Stack->Parameters.QueryInterface.Version); DPRINT1("QueryInterface.Version %x\n", Stack->Parameters.QueryInterface.Version);
Status = STATUS_SUCCESS; CompareStatus = RtlStringFromGUID(&USB_BUS_INTERFACE_HUB_GUID, &InterfacMatchString);
Information = 0; if (!NT_SUCCESS(CompareStatus))
/* FIXME: Check the actual Guid */
if (Stack->Parameters.QueryInterface.Size == sizeof(USB_BUS_INTERFACE_USBDI_V2) && (Stack->Parameters.QueryInterface.Version == 2))
{ {
InterfaceDI = (PUSB_BUS_INTERFACE_USBDI_V2) Stack->Parameters.QueryInterface.Interface; DPRINT1("Failed to create string from GUID!\n");
InterfaceDI->Size = sizeof(USB_BUS_INTERFACE_USBDI_V2);
InterfaceDI->Version = 2;
InterfaceDI->BusContext = PdoDeviceExtension->DeviceObject;
InterfaceDI->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference;
InterfaceDI->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference;
InterfaceDI->GetUSBDIVersion = GetUSBDIVersion;
InterfaceDI->QueryBusTime = QueryBusTime;
InterfaceDI->SubmitIsoOutUrb = SubmitIsoOutUrb;
InterfaceDI->QueryBusInformation = QueryBusInformation;
InterfaceDI->IsDeviceHighSpeed = IsDeviceHighSpeed;
InterfaceDI->EnumLogEntry = EnumLogEntry;
} }
/* FIXME: Check the actual Guid */
else if (Stack->Parameters.QueryInterface.Size == sizeof(USB_BUS_INTERFACE_HUB_V5) && CompareStatus = RtlCompareUnicodeString(&InterfacMatchString, &GuidString, TRUE);
(Stack->Parameters.QueryInterface.Version == 5))
if (NT_SUCCESS(CompareStatus))
{ {
InterfaceHub = (PUSB_BUS_INTERFACE_HUB_V5)Stack->Parameters.QueryInterface.Interface; InterfaceHub = (PUSB_BUS_INTERFACE_HUB_V5)Stack->Parameters.QueryInterface.Interface;
InterfaceHub->Version = 5; InterfaceHub->Version = Stack->Parameters.QueryInterface.Version;
InterfaceHub->Size = sizeof(USB_BUS_INTERFACE_HUB_V5); if (Stack->Parameters.QueryInterface.Version >= 0)
InterfaceHub->BusContext = PdoDeviceExtension->DeviceObject; {
InterfaceHub->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference; InterfaceHub->Size = Stack->Parameters.QueryInterface.Size;
InterfaceHub->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference; InterfaceHub->BusContext = PdoDeviceExtension->DeviceObject;
InterfaceHub->CreateUsbDevice = CreateUsbDevice; InterfaceHub->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference;
InterfaceHub->InitializeUsbDevice = InitializeUsbDevice; InterfaceHub->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference;
InterfaceHub->GetUsbDescriptors = GetUsbDescriptors; }
InterfaceHub->RemoveUsbDevice = RemoveUsbDevice; if (Stack->Parameters.QueryInterface.Version >= 1)
InterfaceHub->RestoreUsbDevice = RestoreUsbDevice; {
InterfaceHub->GetPortHackFlags = GetPortHackFlags; InterfaceHub->CreateUsbDevice = CreateUsbDevice;
InterfaceHub->QueryDeviceInformation = QueryDeviceInformation; InterfaceHub->InitializeUsbDevice = InitializeUsbDevice;
InterfaceHub->GetControllerInformation = GetControllerInformation; InterfaceHub->GetUsbDescriptors = GetUsbDescriptors;
InterfaceHub->ControllerSelectiveSuspend = ControllerSelectiveSuspend; InterfaceHub->RemoveUsbDevice = RemoveUsbDevice;
InterfaceHub->GetExtendedHubInformation = GetExtendedHubInformation; InterfaceHub->RestoreUsbDevice = RestoreUsbDevice;
InterfaceHub->GetRootHubSymbolicName = GetRootHubSymbolicName; InterfaceHub->GetPortHackFlags = GetPortHackFlags;
InterfaceHub->GetDeviceBusContext = GetDeviceBusContext; InterfaceHub->QueryDeviceInformation = QueryDeviceInformation;
InterfaceHub->Initialize20Hub = Initialize20Hub; }
InterfaceHub->RootHubInitNotification = RootHubInitNotification; if (Stack->Parameters.QueryInterface.Version >= 2)
InterfaceHub->FlushTransfers = FlushTransfers; {
InterfaceHub->SetDeviceHandleData = SetDeviceHandleData; InterfaceHub->GetControllerInformation = GetControllerInformation;
InterfaceHub->ControllerSelectiveSuspend = ControllerSelectiveSuspend;
InterfaceHub->GetExtendedHubInformation = GetExtendedHubInformation;
InterfaceHub->GetRootHubSymbolicName = GetRootHubSymbolicName;
InterfaceHub->GetDeviceBusContext = GetDeviceBusContext;
InterfaceHub->Initialize20Hub = Initialize20Hub;
}
if (Stack->Parameters.QueryInterface.Version >= 3)
{
InterfaceHub->RootHubInitNotification = RootHubInitNotification;
}
if (Stack->Parameters.QueryInterface.Version >= 4)
{
InterfaceHub->FlushTransfers = FlushTransfers;
}
if (Stack->Parameters.QueryInterface.Version >= 5)
{
InterfaceHub->SetDeviceHandleData = SetDeviceHandleData;
}
if (Stack->Parameters.QueryInterface.Version >= 6)
{
DPRINT1("Unknown version!\n");
}
break;
} }
else
CompareStatus = RtlStringFromGUID(&USB_BUS_INTERFACE_USBDI_GUID, &InterfacMatchString);
if (!NT_SUCCESS(CompareStatus))
{ {
DPRINT1("Not Supported\n"); DPRINT1("Failed to create string from GUID!\n");
Status = Irp->IoStatus.Status;
Information = Irp->IoStatus.Information;
} }
CompareStatus = RtlCompareUnicodeString(&InterfacMatchString, &GuidString, TRUE);
if (NT_SUCCESS(CompareStatus))
{
InterfaceDI = (PUSB_BUS_INTERFACE_USBDI_V2) Stack->Parameters.QueryInterface.Interface;
InterfaceDI->Version = Stack->Parameters.QueryInterface.Version;
if (Stack->Parameters.QueryInterface.Version >= 0)
{
//InterfaceDI->Size = sizeof(USB_BUS_INTERFACE_USBDI_V2);
InterfaceDI->Size = Stack->Parameters.QueryInterface.Size;
InterfaceDI->BusContext = PdoDeviceExtension->DeviceObject;
InterfaceDI->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference;
InterfaceDI->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference;
InterfaceDI->GetUSBDIVersion = GetUSBDIVersion;
InterfaceDI->QueryBusTime = QueryBusTime;
InterfaceDI->SubmitIsoOutUrb = SubmitIsoOutUrb;
InterfaceDI->QueryBusInformation = QueryBusInformation;
}
if (Stack->Parameters.QueryInterface.Version >= 1)
{
InterfaceDI->IsDeviceHighSpeed = IsDeviceHighSpeed;
}
if (Stack->Parameters.QueryInterface.Version >= 2)
{
InterfaceDI->EnumLogEntry = EnumLogEntry;
}
if (Stack->Parameters.QueryInterface.Version >= 3)
{
DPRINT1("Not Supported!\n");
}
break;
}
DPRINT1("Not Supported\n");
Status = Irp->IoStatus.Status;
Information = Irp->IoStatus.Information;
break; break;
} }
case IRP_MN_QUERY_BUS_INFORMATION: case IRP_MN_QUERY_BUS_INFORMATION:

30
reactos/drivers/usb/usbehci/usbiffn.c
View file

@ -58,6 +58,10 @@ CreateUsbDevice(PVOID BusContext,
USHORT PortStatus, USHORT PortNumber) USHORT PortStatus, USHORT PortNumber)
{ {
DPRINT1("CreateUsbDevice called\n"); DPRINT1("CreateUsbDevice called\n");
DPRINT1("PortStatus %x\n", PortStatus);
DPRINT1("PortNumber %x\n", PortNumber);
*NewDevice = ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEVICE), USB_POOL_TAG);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -100,7 +104,7 @@ USB_BUSIFFN
RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags) RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags)
{ {
DPRINT1("RemoveUsbDevice called\n"); DPRINT1("RemoveUsbDevice called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
@ -108,7 +112,7 @@ USB_BUSIFFN
RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle) RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle)
{ {
DPRINT1("RestoreUsbDevice called\n"); DPRINT1("RestoreUsbDevice called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
@ -116,7 +120,7 @@ USB_BUSIFFN
GetPortHackFlags(PVOID BusContext, PULONG Flags) GetPortHackFlags(PVOID BusContext, PULONG Flags)
{ {
DPRINT1("GetPortHackFlags called\n"); DPRINT1("GetPortHackFlags called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
@ -172,7 +176,6 @@ QueryDeviceInformation(PVOID BusContext,
{ {
RtlCopyMemory(&DeviceInfo->PipeList[i].EndpointDescriptor, &UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); RtlCopyMemory(&DeviceInfo->PipeList[i].EndpointDescriptor, &UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR));
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -230,7 +233,7 @@ GetExtendedHubInformation(PVOID BusContext,
PPDO_DEVICE_EXTENSION PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; PPDO_DEVICE_EXTENSION PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension;
PFDO_DEVICE_EXTENSION FdoDeviceExntension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExntension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension;
LONG i; LONG i;
DPRINT1("GetExtendedHubInformation\n");
/* Set the default return value */ /* Set the default return value */
*LengthReturned = 0; *LengthReturned = 0;
/* Caller must have set InformationLevel to 0 */ /* Caller must have set InformationLevel to 0 */
@ -266,7 +269,7 @@ GetRootHubSymbolicName(PVOID BusContext,
if (HubSymNameBufferLength < 20) if (HubSymNameBufferLength < 20)
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
//RtlStringCbCopy(HubSymNameBuffer, HubSymNameBufferLength, L"ROOT_HUB20"); RtlCopyMemory(HubSymNameBuffer, L"ROOT_HUB20", HubSymNameBufferLength);
*HubSymNameActualLength = 20; *HubSymNameActualLength = 20;
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -284,7 +287,12 @@ NTSTATUS
USB_BUSIFFN USB_BUSIFFN
Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount) Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount)
{ {
DPRINT1("Initialize20Hub called\n"); DPRINT1("Initialize20Hub called, HubDeviceHandle: %x\n", HubDeviceHandle);
/* FIXME: */
/* Create the Irp Queue for SCE */
/* Should queue be created for each device or each enpoint??? */
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -331,7 +339,7 @@ USB_BUSIFFN
QueryBusTime(PVOID BusContext, PULONG CurrentFrame) QueryBusTime(PVOID BusContext, PULONG CurrentFrame)
{ {
DPRINT1("QueryBusTime called\n"); DPRINT1("QueryBusTime called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
@ -339,7 +347,7 @@ USB_BUSIFFN
SubmitIsoOutUrb(PVOID BusContext, PURB Urb) SubmitIsoOutUrb(PVOID BusContext, PURB Urb)
{ {
DPRINT1("SubmitIsoOutUrb called\n"); DPRINT1("SubmitIsoOutUrb called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS NTSTATUS
@ -351,7 +359,7 @@ QueryBusInformation(PVOID BusContext,
PULONG BusInformationActualLength) PULONG BusInformationActualLength)
{ {
DPRINT1("QueryBusInformation called\n"); DPRINT1("QueryBusInformation called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }
BOOLEAN BOOLEAN
@ -367,6 +375,6 @@ USB_BUSIFFN
EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2)
{ {
DPRINT1("EnumLogEntry called\n"); DPRINT1("EnumLogEntry called\n");
return STATUS_SUCCESS; return STATUS_NOT_SUPPORTED;
} }