Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBPORT] Fix 64 bit issues

Browse source
This commit is contained in:
Timo Kreuzer 2018-02-27 21:56:06 +01:00
parent ff7cc6f37e
commit c1944118ca
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/usbport/device.c
View file

@ -479,7 +479,7 @@ USBPORT_InitInterfaceInfo(IN PUSBD_INTERFACE_INFORMATION InterfaceInfo,
{ {
PUSB_INTERFACE_DESCRIPTOR Descriptor; PUSB_INTERFACE_DESCRIPTOR Descriptor;
PUSBD_PIPE_INFORMATION Pipe; PUSBD_PIPE_INFORMATION Pipe;
USHORT Length; SIZE_T Length;
ULONG PipeFlags; ULONG PipeFlags;
ULONG NumberOfPipes; ULONG NumberOfPipes;
USBD_STATUS USBDStatus = USBD_STATUS_SUCCESS; USBD_STATUS USBDStatus = USBD_STATUS_SUCCESS;
@ -971,8 +971,8 @@ USBPORT_CreateDevice(IN OUT PUSB_DEVICE_HANDLE *pUsbdDeviceHandle,
BOOL IsOpenedPipe; BOOL IsOpenedPipe;
PVOID DeviceDescriptor; PVOID DeviceDescriptor;
USB_DEFAULT_PIPE_SETUP_PACKET SetupPacket; USB_DEFAULT_PIPE_SETUP_PACKET SetupPacket;
SIZE_T TransferedLen; ULONG TransferedLen;
SIZE_T DescriptorMinSize; ULONG DescriptorMinSize;
UCHAR MaxPacketSize; UCHAR MaxPacketSize;
PUSBPORT_DEVICE_EXTENSION FdoExtension; PUSBPORT_DEVICE_EXTENSION FdoExtension;
PUSBPORT_REGISTRATION_PACKET Packet; PUSBPORT_REGISTRATION_PACKET Packet;

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

@ -768,7 +768,7 @@ USBPORT_OpenPipe(IN PDEVICE_OBJECT FdoDevice,
PUSBPORT_DEVICE_EXTENSION FdoExtension; PUSBPORT_DEVICE_EXTENSION FdoExtension;
PUSBPORT_RHDEVICE_EXTENSION PdoExtension; PUSBPORT_RHDEVICE_EXTENSION PdoExtension;
PUSBPORT_REGISTRATION_PACKET Packet; PUSBPORT_REGISTRATION_PACKET Packet;
ULONG EndpointSize; SIZE_T EndpointSize;
PUSBPORT_ENDPOINT Endpoint; PUSBPORT_ENDPOINT Endpoint;
PUSBPORT_ENDPOINT_PROPERTIES EndpointProperties; PUSBPORT_ENDPOINT_PROPERTIES EndpointProperties;
PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor;

2
drivers/usb/usbport/ioctl.c
View file

@ -210,7 +210,7 @@ NTSTATUS
NTAPI NTAPI
USBPORT_GetUnicodeName(IN PDEVICE_OBJECT FdoDevice, USBPORT_GetUnicodeName(IN PDEVICE_OBJECT FdoDevice,
IN PIRP Irp, IN PIRP Irp,
IN PULONG Information) IN PULONG_PTR Information)
{ {
PUSB_HCD_DRIVERKEY_NAME DriverKey; PUSB_HCD_DRIVERKEY_NAME DriverKey;
PIO_STACK_LOCATION IoStack; PIO_STACK_LOCATION IoStack;

4
drivers/usb/usbport/pnp.c
View file

@ -961,7 +961,7 @@ USBPORT_ParseResources(IN PDEVICE_OBJECT FdoDevice,
{ {
if (PortDescriptor->Flags & CM_RESOURCE_PORT_IO) if (PortDescriptor->Flags & CM_RESOURCE_PORT_IO)
{ {
UsbPortResources->ResourceBase = (PVOID)PortDescriptor->u.Port.Start.LowPart; UsbPortResources->ResourceBase = (PVOID)(ULONG_PTR)PortDescriptor->u.Port.Start.QuadPart;
} }
else else
{ {
@ -1413,7 +1413,7 @@ USBPORT_GetDeviceHwIds(IN PDEVICE_OBJECT FdoDevice,
PUSBPORT_REGISTRATION_PACKET Packet; PUSBPORT_REGISTRATION_PACKET Packet;
PVOID Id; PVOID Id;
WCHAR Buffer[300] = {0}; WCHAR Buffer[300] = {0};
ULONG Length = 0; SIZE_T Length = 0;
size_t Remaining = sizeof(Buffer); size_t Remaining = sizeof(Buffer);
PWCHAR EndBuffer; PWCHAR EndBuffer;

2
drivers/usb/usbport/roothub.c
View file

@ -485,7 +485,7 @@ NTAPI
USBPORT_RootHubEndpoint0(IN PUSBPORT_TRANSFER Transfer) USBPORT_RootHubEndpoint0(IN PUSBPORT_TRANSFER Transfer)
{ {
PDEVICE_OBJECT FdoDevice; PDEVICE_OBJECT FdoDevice;
SIZE_T TransferLength; ULONG TransferLength;
PVOID Buffer; PVOID Buffer;
PURB Urb; PURB Urb;
PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket; PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket;

2
drivers/usb/usbport/usbport.c
View file

@ -2299,7 +2299,7 @@ USBPORT_MapTransfer(IN PDEVICE_OBJECT FdoDevice,
BOOLEAN WriteToDevice; BOOLEAN WriteToDevice;
PHYSICAL_ADDRESS PhAddr = {{0, 0}}; PHYSICAL_ADDRESS PhAddr = {{0, 0}};
PHYSICAL_ADDRESS PhAddress = {{0, 0}}; PHYSICAL_ADDRESS PhAddress = {{0, 0}};
SIZE_T TransferLength; ULONG TransferLength;
SIZE_T SgCurrentLength; SIZE_T SgCurrentLength;
SIZE_T ElementLength; SIZE_T ElementLength;
PUSBPORT_DEVICE_HANDLE DeviceHandle; PUSBPORT_DEVICE_HANDLE DeviceHandle;

2
sdk/include/reactos/drivers/usbport/usbmport.h
View file

@ -434,7 +434,7 @@ typedef VOID
PVOID, PVOID,
PVOID, PVOID,
USBD_STATUS, USBD_STATUS,
SIZE_T); ULONG);
typedef ULONG typedef ULONG
(NTAPI *PUSBPORT_COMPLETE_ISO_TRANSFER)( (NTAPI *PUSBPORT_COMPLETE_ISO_TRANSFER)(