Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 18:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBPORT] Use constants in USBPORT_OpenPipe().

Browse source
This commit is contained in:
Vadim Galyant 2017-11-27 16:56:19 +09:00 committed by Amine Khaldi
parent d2b088e9d6
commit 0b78ad8eb2
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/usb/usbport/endpoint.c
View file

@ -642,13 +642,13 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
if (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2) if (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2)
{ {
DPRINT1("USBPORT_OpenPipe: FIXME USB2 EndpointSize\n"); EndpointSize += sizeof(USB2_TT_ENDPOINT);
} }
if (PipeHandle->EndpointDescriptor.wMaxPacketSize == 0) if (PipeHandle->EndpointDescriptor.wMaxPacketSize == 0)
{ {
USBPORT_AddPipeHandle(DeviceHandle, PipeHandle); USBPORT_AddPipeHandle(DeviceHandle, PipeHandle);
PipeHandle->Flags = (PipeHandle->Flags & ~PIPE_HANDLE_FLAG_CLOSED) | PipeHandle->Flags = (PipeHandle->Flags & ~PIPE_HANDLE_FLAG_CLOSED) |
PIPE_HANDLE_FLAG_NULL_PACKET_SIZE; PIPE_HANDLE_FLAG_NULL_PACKET_SIZE;
@ -739,14 +739,14 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
Interval = EndpointDescriptor->bInterval; Interval = EndpointDescriptor->bInterval;
} }
EndpointProperties->Period = 32; EndpointProperties->Period = ENDPOINT_INTERRUPT_32ms;
if (Interval && (Interval < 32)) if (Interval && (Interval < USB2_FRAMES))
{ {
if ((EndpointProperties->DeviceSpeed != UsbLowSpeed) || if ((EndpointProperties->DeviceSpeed != UsbLowSpeed) ||
(Interval >= 8)) (Interval >= ENDPOINT_INTERRUPT_8ms))
{ {
if (!(Interval & 0x20)) if (!(Interval & ENDPOINT_INTERRUPT_32ms))
{ {
Period = EndpointProperties->Period; Period = EndpointProperties->Period;
@ -761,7 +761,7 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
} }
else else
{ {
EndpointProperties->Period = 8; EndpointProperties->Period = ENDPOINT_INTERRUPT_8ms;
} }
} }
} }
@ -770,15 +770,20 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
{ {
if (EndpointProperties->DeviceSpeed == UsbHighSpeed) if (EndpointProperties->DeviceSpeed == UsbHighSpeed)
{ {
EndpointProperties->Period = EndpointProperties->Period =
USBPORT_NormalizeHsInterval(EndpointDescriptor->bInterval); USBPORT_NormalizeHsInterval(EndpointDescriptor->bInterval);
} }
else else
{ {
EndpointProperties->Period = 1; EndpointProperties->Period = ENDPOINT_INTERRUPT_1ms;
} }
} }
if ((DeviceHandle->Flags & DEVICE_HANDLE_FLAG_ROOTHUB) != 0)
{
Endpoint->Flags |= ENDPOINT_FLAG_ROOTHUB_EP0;
}
if (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2) if (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2)
{ {
IsAllocatedBandwidth = USBPORT_AllocateBandwidthUSB2(FdoDevice, Endpoint); IsAllocatedBandwidth = USBPORT_AllocateBandwidthUSB2(FdoDevice, Endpoint);