[janderwald] 51368: [USBEHCI_NEW] - Add reference count when the hub controller is created. Necessary to prevent the controller from getting deleted when the hub driver performs interface reference...
16 Apr
2011
16 Apr
'11
9:47 a.m.
Author: janderwald
Date: Sat Apr 16 09:47:43 2011
New Revision: 51368
URL: http://svn.reactos.org/svn/reactos?rev=51368&view=rev
Log:
[USBEHCI_NEW]
- Add reference count when the hub controller is created. Necessary to prevent the
controller from getting deleted when the hub driver performs interface reference removes
- Implement IRP_MN_QUERY_ID, based on mjmartin ehci driver
- Fix bug in IRP_MN_QUERY_BUS_INFORMATION, it is supposed to return a PNP_BUS_INFORMATION
not a simple guid
- Implement IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO,
IOCTL_INTERNAL_USB_GET_HUB_COUNT based on mjmartin ehci driver
- Add interfaces for communicating with the hub driver
- Dispatch internal device requests not wmi requests (EHCI_Dispatch)
Modified:
branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp
branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1]
(original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Sat Apr
16 09:47:43 2011
@@ -417,6 +417,11 @@
//
break;
}
+
+ //
+ // add reference to prevent it from getting deleting while hub driver
adds / removes references
+ //
+ m_HubController->AddRef();
}
if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations)
@@ -511,7 +516,7 @@
}
default:
{
- DPRINT1("CHCDController::HandlePnp Dispatch to lower device object
%lu\n", IoStack->MinorFunction);
+ DPRINT1("CHCDController::HandlePnp Dispatch to lower device object
%lx\n", IoStack->MinorFunction);
//
// forward irp to next device object
//
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1]
(original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sat Apr
16 09:47:43 2011
@@ -150,9 +150,13 @@
PIO_STACK_LOCATION IoStack;
PCOMMON_DEVICE_EXTENSION DeviceExtension;
PDEVICE_CAPABILITIES DeviceCapabilities;
- LPGUID Guid;
+ PPNP_BUS_INFORMATION BusInformation;
NTSTATUS Status;
- ULONG Index;
+ ULONG Index = 0, Length;
+ USHORT VendorID, DeviceID;
+ ULONG HiSpeed, NumPorts;
+ WCHAR Buffer[300];
+ LPWSTR DeviceName;
//
// get device extension
@@ -178,6 +182,147 @@
// register device interface
//
Status = SetDeviceInterface(TRUE);
+ break;
+ }
+ case IRP_MN_QUERY_ID:
+ {
+ DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n",
IoStack->Parameters.QueryId.IdType);
+
+ if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID)
+ {
+ if (m_Hardware)
+ {
+ //
+ // query device id
+ //
+ Status = m_Hardware->GetDeviceDetails(&VendorID,
&DeviceID, &NumPorts, &HiSpeed);
+
+ HiSpeed = TRUE;
+
+ if (HiSpeed)
+ {
+ //
+ // USB 2.0 hub
+ //
+ swprintf(Buffer, L"USB\\ROOT_HUB20");
+ }
+ else
+ {
+ //
+ // USB 1.1 hub
+ //
+ swprintf(Buffer, L"USB\\ROOT_HUB");
+ }
+
+ DPRINT1("Name %S\n", Buffer);
+
+ //
+ // calculate length
+ //
+ Length = (wcslen(Buffer) + 1);
+
+ //
+ // allocate buffer
+ //
+ DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Length *
sizeof(WCHAR), TAG_USBEHCI);
+
+ if (!DeviceName)
+ {
+ //
+ // no memory
+ //
+ Status = STATUS_INSUFFICIENT_RESOURCES;
+ break;
+ }
+
+ //
+ // copy device name
+ //
+ wcscpy(DeviceName, Buffer);
+
+ //
+ // store result
+ //
+ Irp->IoStatus.Information = (ULONG_PTR)DeviceName;
+ Status = STATUS_SUCCESS;
+ break;
+ }
+ Status = STATUS_UNSUCCESSFUL;
+ PC_ASSERT(0);
+ break;
+ }
+
+ if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs)
+ {
+ if (m_Hardware)
+ {
+ //
+ // query device id
+ //
+ Status = m_Hardware->GetDeviceDetails(&VendorID,
&DeviceID, &NumPorts, &HiSpeed);
+
+ HiSpeed = TRUE;
+
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("CHubController::HandlePnp> failed to get
hardware id %x\n", Status);
+ VendorID = 0x8086;
+ DeviceID = 0x3A37;
+ }
+
+ if (HiSpeed)
+ {
+ //
+ // USB 2.0 hub
+ //
+ Index += swprintf(&Buffer[Index],
L"USB\\ROOT_HUB20&VID%04x&PID%04x&REV0000", VendorID, DeviceID) + 1;
+ Index += swprintf(&Buffer[Index],
L"USB\\ROOT_HUB20&VID%04x&PID%04x", VendorID, DeviceID) + 1;
+ Index += swprintf(&Buffer[Index],
L"USB\\ROOT_HUB20") + 1;
+ }
+ else
+ {
+ //
+ // USB 1.1 hub
+ //
+ Index += swprintf(&Buffer[Index],
L"USB\\ROOT_HUB&VID%04x&PID%04x&REV0000", VendorID, DeviceID) + 1;
+ Index += swprintf(&Buffer[Index],
L"USB\\ROOT_HUB&VID%04x&PID%04x", VendorID, DeviceID) + 1;
+ Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB")
+ 1;
+ }
+
+ Buffer[Index] = UNICODE_NULL;
+ Index++;
+
+
+ DPRINT1("Name %S\n", Buffer);
+
+ //
+ // allocate buffer
+ //
+ DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Index *
sizeof(WCHAR), TAG_USBEHCI);
+
+ if (!DeviceName)
+ {
+ //
+ // no memory
+ //
+ Status = STATUS_INSUFFICIENT_RESOURCES;
+ break;
+ }
+
+ //
+ // copy device name
+ //
+ RtlMoveMemory(DeviceName, Buffer, Index * sizeof(WCHAR));
+
+ //
+ // store result
+ //
+ Irp->IoStatus.Information = (ULONG_PTR)DeviceName;
+ Status = STATUS_SUCCESS;
+ break;
+ }
+ }
+ Status = STATUS_SUCCESS;
break;
}
case IRP_MN_QUERY_CAPABILITIES:
@@ -246,6 +391,10 @@
// nullify pointer
//
m_HubControllerDeviceObject = 0;
+
+ //
+ // done
+ //
return STATUS_SUCCESS;
}
case IRP_MN_QUERY_BUS_INFORMATION:
@@ -253,17 +402,24 @@
DPRINT1("CHubController::HandlePnp
IRP_MN_QUERY_BUS_INFORMATION\n");
//
- // allocate buffer for bus guid
- //
- Guid = (LPGUID)ExAllocatePool(PagedPool, sizeof(GUID));
- if (Guid)
+ // allocate buffer for bus information
+ //
+ BusInformation = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool,
sizeof(PNP_BUS_INFORMATION));
+ if (BusInformation)
{
//
// copy BUS guid
//
- RtlMoveMemory(Guid, &GUID_BUS_TYPE_USB, sizeof(GUID));
+ RtlMoveMemory(&BusInformation->BusTypeGuid,
&GUID_BUS_TYPE_USB, sizeof(GUID));
+
+ //
+ // set bus type
+ //
+ BusInformation->LegacyBusType = PNPBus;
+ BusInformation->BusNumber = 0;
+
Status = STATUS_SUCCESS;
- Irp->IoStatus.Information = (ULONG_PTR)Guid;
+ Irp->IoStatus.Information = (ULONG_PTR)BusInformation;
}
else
{
@@ -286,7 +442,7 @@
default:
{
DPRINT1("CHubController::HandlePnp Unhandeled %x\n",
IoStack->MinorFunction);
- Status = STATUS_NOT_SUPPORTED;
+ Status = Irp->IoStatus.Status;
break;
}
}
@@ -310,6 +466,8 @@
IN OUT PIRP Irp)
{
UNIMPLEMENTED
+ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
+ IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_NOT_IMPLEMENTED;
}
@@ -319,26 +477,567 @@
IN PDEVICE_OBJECT DeviceObject,
IN OUT PIRP Irp)
{
- UNIMPLEMENTED
- return STATUS_NOT_IMPLEMENTED;
-}
-
+ PIO_STACK_LOCATION IoStack;
+ PCOMMON_DEVICE_EXTENSION DeviceExtension;
+ NTSTATUS Status = STATUS_NOT_IMPLEMENTED;
+
+ //
+ // get current stack location
+ //
+ IoStack = IoGetCurrentIrpStackLocation(Irp);
+
+ //
+ // get device extension
+ //
+ DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
+
+
+ DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu
OutputBufferLength %lu\n",
+ DeviceExtension->IsFDO,
+ IoStack->Parameters.DeviceIoControl.IoControlCode,
+ IoStack->Parameters.DeviceIoControl.InputBufferLength,
+ IoStack->Parameters.DeviceIoControl.OutputBufferLength);
+
+ //
+ // determine which request should be performed
+ //
+ switch(IoStack->Parameters.DeviceIoControl.IoControlCode)
+ {
+ case IOCTL_INTERNAL_USB_SUBMIT_URB:
+ {
+ DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB UNIMPLEMENTED\n");
+
+ //
+ // request completed
+ //
+ Status = STATUS_NOT_IMPLEMENTED;
+ break;
+ }
+ case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE:
+ {
+ DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n");
+
+ if (IoStack->Parameters.Others.Argument1)
+ {
+ //
+ // store object as device handle
+ //
+ *(PVOID *)IoStack->Parameters.Others.Argument1 = (PVOID)this;
+ Status = STATUS_SUCCESS;
+ }
+ else
+ {
+ //
+ // mis-behaving hub driver
+ //
+ Status = STATUS_INVALID_DEVICE_REQUEST;
+ }
+
+ //
+ // request completed
+ //
+ break;
+ }
+ case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO:
+ {
+ DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n");
+
+ //
+ // this is the first request send, it delivers the PDO to the caller
+ //
+ if (IoStack->Parameters.Others.Argument1)
+ {
+ //
+ // store root hub pdo object
+ //
+ *(PVOID *)IoStack->Parameters.Others.Argument1 = DeviceObject;
+ }
+
+ if (IoStack->Parameters.Others.Argument2)
+ {
+ //
+ // documentation claims to deliver the hcd controller object, although it
is wrong
+ //
+ *(PVOID *)IoStack->Parameters.Others.Argument2 = DeviceObject;
+ }
+
+ //
+ // request completed
+ //
+ Status = STATUS_SUCCESS;
+ break;
+ }
+ case IOCTL_INTERNAL_USB_GET_HUB_COUNT:
+ {
+ DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT\n");
+
+ //
+ // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver
+ // requests this ioctl to deliver the number of presents.
+
+ if (IoStack->Parameters.Others.Argument1)
+ {
+ //
+ // FIXME / verify: there is only one hub
+ //
+ *(PULONG)IoStack->Parameters.Others.Argument1 = 1;
+ }
+
+ //
+ // request completed
+ //
+ Status = STATUS_SUCCESS;
+ Irp->IoStatus.Information = sizeof(ULONG);
+ break;
+ }
+ }
+
+ Irp->IoStatus.Status = Status;
+ IoCompleteRequest(Irp, IO_NO_INCREMENT);
+ return Status;
+}
+
+//=================================================================================================
+//
+// Generic Interface functions
+//
+VOID
+USB_BUSIFFN
+USBI_InterfaceReference(
+ PVOID BusContext)
+{
+ CHubController * Controller = (CHubController*)BusContext;
+
+ DPRINT1("USBH_InterfaceReference\n");
+
+ //
+ // add reference
+ //
+ Controller->AddRef();
+}
+
+VOID
+USB_BUSIFFN
+USBI_InterfaceDereference(
+ PVOID BusContext)
+{
+ CHubController * Controller = (CHubController*)BusContext;
+
+ DPRINT1("USBH_InterfaceDereference\n");
+
+ //
+ // release
+ //
+ Controller->Release();
+}
+//=================================================================================================
+//
+// USB Hub Interface functions
+//
+NTSTATUS
+USB_BUSIFFN
+USBHI_CreateUsbDevice(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE *NewDevice,
+ PUSB_DEVICE_HANDLE HubDeviceHandle,
+ USHORT PortStatus,
+ USHORT PortNumber)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_InitializeUsbDevice(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE DeviceHandle)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_GetUsbDescriptors(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE DeviceHandle,
+ PUCHAR DeviceDescriptorBuffer,
+ PULONG DeviceDescriptorBufferLength,
+ PUCHAR ConfigDescriptorBuffer,
+ PULONG ConfigDescriptorBufferLength)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_RemoveUsbDevice(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE DeviceHandle,
+ ULONG Flags)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_RestoreUsbDevice(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE OldDeviceHandle,
+ PUSB_DEVICE_HANDLE NewDeviceHandle)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_GetPortHackFlags(
+ PVOID BusContext,
+ PULONG Flags)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_QueryDeviceInformation(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE DeviceHandle,
+ PVOID DeviceInformationBuffer,
+ ULONG DeviceInformationBufferLength,
+ PULONG LengthReturned)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_GetControllerInformation(
+ PVOID BusContext,
+ PVOID ControllerInformationBuffer,
+ ULONG ControllerInformationBufferLength,
+ PULONG LengthReturned)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_ControllerSelectiveSuspend(
+ PVOID BusContext,
+ BOOLEAN Enable)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_GetExtendedHubInformation(
+ PVOID BusContext,
+ PDEVICE_OBJECT HubPhysicalDeviceObject,
+ PVOID HubInformationBuffer,
+ ULONG HubInformationBufferLength,
+ PULONG LengthReturned)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_GetRootHubSymbolicName(
+ PVOID BusContext,
+ PVOID HubSymNameBuffer,
+ ULONG HubSymNameBufferLength,
+ PULONG HubSymNameActualLength)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+PVOID
+USB_BUSIFFN
+USBHI_GetDeviceBusContext(
+ PVOID HubBusContext,
+ PVOID DeviceHandle)
+{
+ UNIMPLEMENTED
+ return NULL;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_Initialize20Hub(
+ PVOID BusContext,
+ PUSB_DEVICE_HANDLE HubDeviceHandle,
+ ULONG TtCount)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBHI_RootHubInitNotification(
+ PVOID BusContext,
+ PVOID CallbackContext,
+ PRH_INIT_CALLBACK CallbackRoutine)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+VOID
+USB_BUSIFFN
+USBHI_FlushTransfers(
+ PVOID BusContext,
+ PVOID DeviceHandle)
+{
+ UNIMPLEMENTED
+}
+
+VOID
+USB_BUSIFFN
+USBHI_SetDeviceHandleData(
+ PVOID BusContext,
+ PVOID DeviceHandle,
+ PDEVICE_OBJECT UsbDevicePdo)
+{
+ UNIMPLEMENTED
+}
+
+//=================================================================================================
+//
+// USB Device Interface functions
+//
+
+VOID
+USB_BUSIFFN
+USBDI_GetUSBDIVersion(
+ PVOID BusContext,
+ PUSBD_VERSION_INFORMATION VersionInformation,
+ PULONG HcdCapabilites)
+{
+ UNIMPLEMENTED
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBDI_QueryBusTime(
+ PVOID BusContext,
+ PULONG CurrentFrame)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBDI_SubmitIsoOutUrb(
+ PVOID BusContext,
+ PURB Urb)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBDI_QueryBusInformation(
+ PVOID BusContext,
+ ULONG Level,
+ PVOID BusInformationBuffer,
+ PULONG BusInformationBufferLength,
+ PULONG BusInformationActualLength)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+BOOLEAN
+USB_BUSIFFN
+USBDI_IsDeviceHighSpeed(
+ PVOID BusContext)
+{
+ UNIMPLEMENTED
+ return TRUE;
+}
+
+NTSTATUS
+USB_BUSIFFN
+USBDI_EnumLogEntry(
+ PVOID BusContext,
+ ULONG DriverTag,
+ ULONG EnumTag,
+ ULONG P1,
+ ULONG P2)
+{
+ UNIMPLEMENTED
+ return STATUS_NOT_IMPLEMENTED;
+}
NTSTATUS
CHubController::HandleQueryInterface(
PIO_STACK_LOCATION IoStack)
{
+ PUSB_BUS_INTERFACE_HUB_V5 InterfaceHub;
+ PUSB_BUS_INTERFACE_USBDI_V2 InterfaceDI;
UNICODE_STRING GuidBuffer;
NTSTATUS Status;
if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType,
USB_BUS_INTERFACE_HUB_GUID))
{
- DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_HUB_GUID
Version %x\n", IoStack->Parameters.QueryInterface.Version);
-
+ //
+ // get request parameters
+ //
+ InterfaceHub =
(PUSB_BUS_INTERFACE_HUB_V5)IoStack->Parameters.QueryInterface.Interface;
+ InterfaceHub->Version = IoStack->Parameters.QueryInterface.Version;
+
+ //
+ // check version
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 6)
+ {
+ DPRINT1("USB_BUS_INTERFACE_HUB_GUID version %x not supported!\n",
IoStack->Parameters.QueryInterface.Version);
+
+ //
+ // version not supported
+ //
+ return STATUS_NOT_SUPPORTED;
+ }
+
+ //
+ // Interface version 0
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 0)
+ {
+ InterfaceHub->Size = IoStack->Parameters.QueryInterface.Size;
+ InterfaceHub->BusContext = PVOID(this);
+ InterfaceHub->InterfaceReference = USBI_InterfaceReference;
+ InterfaceHub->InterfaceDereference = USBI_InterfaceDereference;
+ }
+
+ //
+ // Interface version 1
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 1)
+ {
+ InterfaceHub->CreateUsbDevice = USBHI_CreateUsbDevice;
+ InterfaceHub->InitializeUsbDevice = USBHI_InitializeUsbDevice;
+ InterfaceHub->GetUsbDescriptors = USBHI_GetUsbDescriptors;
+ InterfaceHub->RemoveUsbDevice = USBHI_RemoveUsbDevice;
+ InterfaceHub->RestoreUsbDevice = USBHI_RestoreUsbDevice;
+ InterfaceHub->GetPortHackFlags = USBHI_GetPortHackFlags;
+ InterfaceHub->QueryDeviceInformation = USBHI_QueryDeviceInformation;
+ }
+
+ //
+ // Interface version 2
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 2)
+ {
+ InterfaceHub->GetControllerInformation = USBHI_GetControllerInformation;
+ InterfaceHub->ControllerSelectiveSuspend =
USBHI_ControllerSelectiveSuspend;
+ InterfaceHub->GetExtendedHubInformation = USBHI_GetExtendedHubInformation;
+ InterfaceHub->GetRootHubSymbolicName = USBHI_GetRootHubSymbolicName;
+ InterfaceHub->GetDeviceBusContext = USBHI_GetDeviceBusContext;
+ InterfaceHub->Initialize20Hub = USBHI_Initialize20Hub;
+
+ }
+
+ //
+ // Interface version 3
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 3)
+ {
+ InterfaceHub->RootHubInitNotification = USBHI_RootHubInitNotification;
+ }
+
+ //
+ // Interface version 4
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 4)
+ {
+ InterfaceHub->FlushTransfers = USBHI_FlushTransfers;
+ }
+
+ //
+ // Interface version 5
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 5)
+ {
+ InterfaceHub->SetDeviceHandleData = USBHI_SetDeviceHandleData;
+ }
+
+ //
+ // request completed
+ //
+ return STATUS_SUCCESS;
}
else if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType,
USB_BUS_INTERFACE_USBDI_GUID))
{
- DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_USBDI_GUID
Version %x\n", IoStack->Parameters.QueryInterface.Version);
+ //
+ // get request parameters
+ //
+ InterfaceDI = (PUSB_BUS_INTERFACE_USBDI_V2)
IoStack->Parameters.QueryInterface.Interface;
+ InterfaceDI->Version = IoStack->Parameters.QueryInterface.Version;
+
+ //
+ // check version
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 3)
+ {
+ DPRINT1("USB_BUS_INTERFACE_USBDI_GUID version %x not supported!\n",
IoStack->Parameters.QueryInterface.Version);
+
+ //
+ // version not supported
+ //
+ return STATUS_NOT_SUPPORTED;
+ }
+
+ //
+ // interface version 0
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 0)
+ {
+ InterfaceDI->Size = IoStack->Parameters.QueryInterface.Size;
+ InterfaceDI->BusContext = PVOID(this);
+ InterfaceDI->InterfaceReference = USBI_InterfaceReference;
+ InterfaceDI->InterfaceDereference = USBI_InterfaceDereference;
+ InterfaceDI->GetUSBDIVersion = USBDI_GetUSBDIVersion;
+ InterfaceDI->QueryBusTime = USBDI_QueryBusTime;
+ InterfaceDI->SubmitIsoOutUrb = USBDI_SubmitIsoOutUrb;
+ InterfaceDI->QueryBusInformation = USBDI_QueryBusInformation;
+ }
+
+ //
+ // interface version 1
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 1)
+ {
+ InterfaceDI->IsDeviceHighSpeed = USBDI_IsDeviceHighSpeed;
+ }
+
+ //
+ // interface version 2
+ //
+ if (IoStack->Parameters.QueryInterface.Version >= 2)
+ {
+ InterfaceDI->EnumLogEntry = USBDI_EnumLogEntry;
+ }
+
+ //
+ // request completed
+ //
+ return STATUS_SUCCESS;
}
else
{
@@ -351,7 +1050,7 @@
//
// print interface
//
- DPRINT1("HandleQueryInterface GUID: %wZ Version %x\n",
&GuidBuffer, IoStack->Parameters.QueryInterface.Version);
+ DPRINT1("HandleQueryInterface UNKNOWN INTERFACE GUID: %wZ Version
%x\n", &GuidBuffer, IoStack->Parameters.QueryInterface.Version);
//
// free guid buffer
Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp [iso-8859-1] Sat Apr 16
09:47:43 2011
@@ -98,7 +98,7 @@
//
return DeviceExtension->Dispatcher->HandlePower(DeviceObject, Irp);
}
- case IRP_MJ_SYSTEM_CONTROL:
+ case IRP_MJ_INTERNAL_DEVICE_CONTROL:
case IRP_MJ_DEVICE_CONTROL:
{
//
5167
days inactive
5167
days old
0 comments
1 participants
participants (1)
-
janderwald＠svn.reactos.org