mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 00:43:21 +00:00
[USB-BRINGUP-TRUNK]
- Fix usbohci build svn path=/branches/usb-bringup-trunk/; revision=55032
This commit is contained in:
parent
5c6676a9a6
commit
d8d06f0903
|
@ -19,7 +19,6 @@ add_library(usbohci SHARED
|
||||||
|
|
||||||
target_link_libraries(usbohci
|
target_link_libraries(usbohci
|
||||||
libcntpr
|
libcntpr
|
||||||
stlport
|
|
||||||
${PSEH_LIB})
|
${PSEH_LIB})
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
|
|
|
@ -997,7 +997,7 @@ CUSBHardwareDevice::ClearPortStatus(
|
||||||
ULONG PortId,
|
ULONG PortId,
|
||||||
ULONG Status)
|
ULONG Status)
|
||||||
{
|
{
|
||||||
ULONG Value, Index = 0;
|
ULONG Value;
|
||||||
|
|
||||||
DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status);
|
DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status);
|
||||||
|
|
||||||
|
@ -1383,7 +1383,6 @@ OhciDefferedRoutine(
|
||||||
{
|
{
|
||||||
CUSBHardwareDevice *This;
|
CUSBHardwareDevice *This;
|
||||||
ULONG CStatus, Index, PortStatus;
|
ULONG CStatus, Index, PortStatus;
|
||||||
POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor;
|
|
||||||
ULONG DoneHead;
|
ULONG DoneHead;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -1028,7 +1028,6 @@ CUSBDevice::SelectInterface(
|
||||||
IN USBD_CONFIGURATION_HANDLE ConfigurationHandle,
|
IN USBD_CONFIGURATION_HANDLE ConfigurationHandle,
|
||||||
IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo)
|
IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo)
|
||||||
{
|
{
|
||||||
ULONG ConfigurationIndex = 0;
|
|
||||||
PUSB_CONFIGURATION_DESCRIPTOR Configuration;
|
PUSB_CONFIGURATION_DESCRIPTOR Configuration;
|
||||||
ULONG PipeIndex;
|
ULONG PipeIndex;
|
||||||
USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup;
|
USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup;
|
||||||
|
|
|
@ -169,7 +169,6 @@ CUSBQueue::AddUSBRequest(
|
||||||
{
|
{
|
||||||
NTSTATUS Status;
|
NTSTATUS Status;
|
||||||
ULONG Type;
|
ULONG Type;
|
||||||
KIRQL OldLevel;
|
|
||||||
POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor;
|
POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor;
|
||||||
POHCI_ENDPOINT_DESCRIPTOR Descriptor;
|
POHCI_ENDPOINT_DESCRIPTOR Descriptor;
|
||||||
POHCI_ISO_TD CurrentDescriptor;
|
POHCI_ISO_TD CurrentDescriptor;
|
||||||
|
@ -289,6 +288,14 @@ CUSBQueue::AddUSBRequest(
|
||||||
|
|
||||||
PrintEndpointList(m_IsoHeadEndpointDescriptor);
|
PrintEndpointList(m_IsoHeadEndpointDescriptor);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//
|
||||||
|
// bad request type
|
||||||
|
//
|
||||||
|
Request->Release();
|
||||||
|
return STATUS_INVALID_PARAMETER;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// set descriptor active
|
// set descriptor active
|
||||||
|
@ -308,7 +315,6 @@ CUSBQueue::AddUSBRequest(
|
||||||
m_Hardware->HeadEndpointDescriptorModified(Type);
|
m_Hardware->HeadEndpointDescriptorModified(Type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue