Author: tfaber
Date: Sun Sep 3 08:47:37 2017
New Revision: 75747
URL: http://svn.reactos.org/svn/reactos?rev=75747&view=rev
Log:
[NTFS]
- Merge to trunk r75746
Added:
branches/GSoC_2016/NTFS/drivers/usb/usbport/iso.c
- copied unchanged from r75746, trunk/reactos/drivers/usb/usbport/iso.c
Modified:
branches/GSoC_2016/NTFS/ (props changed)
branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt
branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c
branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c
branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h
branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h
Propchange: branches/GSoC_2016/NTFS/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 3 08:47:37 2017
@@ -23,4 +23,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:71196-75743
+/trunk/reactos:71196-75746
Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt?rev=75747&r1=75746&r2=75747&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt [iso-8859-1]
Sun Sep 3 08:47:37 2017
@@ -7,6 +7,7 @@
endpoint.c
iface.c
ioctl.c
+ iso.c
pnp.c
power.c
queue.c
Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c?rev=75747&r1=75746&r2=75747&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c [iso-8859-1] (original)
+++ branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c [iso-8859-1] Sun Sep 3
08:47:37 2017
@@ -531,7 +531,7 @@
PIRP irp;
KIRQL OldIrql;
- DPRINT_CORE("USBPORT_CancelTransferIrp: Irp - %p\n", Irp);
+ DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp);
PdoExtension = DeviceObject->DeviceExtension;
FdoDevice = PdoExtension->FdoDevice;
@@ -549,7 +549,7 @@
Transfer = Urb->UrbControlTransfer.hca.Reserved8[0];
Endpoint = Transfer->Endpoint;
- DPRINT_CORE("USBPORT_CancelTransferIrp: irp - %p, Urb - %p, Transfer -
%p\n",
+ DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p,
Transfer - %p\n",
irp,
Urb,
Transfer);
Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c?rev=75747&r1=75746&r2=75747&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c [iso-8859-1]
(original)
+++ branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c [iso-8859-1]
Sun Sep 3 08:47:37 2017
@@ -588,7 +588,7 @@
PDEVICE_OBJECT FdoDevice;
PUSBPORT_DEVICE_EXTENSION FdoExtension;
- DPRINT("USBPORT_SoftInterruptDpc: ... \n");
+ DPRINT_INT("USBPORT_SoftInterruptDpc: ... \n");
FdoDevice = DeferredContext;
FdoExtension = FdoDevice->DeviceExtension;
@@ -606,7 +606,7 @@
PUSBPORT_DEVICE_EXTENSION FdoExtension;
LARGE_INTEGER DueTime = {{0, 0}};
- DPRINT("USBPORT_SoftInterrupt: ... \n");
+ DPRINT_INT("USBPORT_SoftInterrupt: ... \n");
FdoExtension = FdoDevice->DeviceExtension;
@@ -1079,7 +1079,8 @@
FdoExtension = FdoDevice->DeviceExtension;
Packet = &FdoExtension->MiniPortInterface->Packet;
- DPRINT_INT("USBPORT_InterruptService: FdoExtension->Flags - %lx\n",
+ DPRINT_INT("USBPORT_InterruptService: FdoExtension[%p]->Flags - %08X\n",
+ FdoExtension,
FdoExtension->Flags);
if (FdoExtension->Flags & USBPORT_FLAG_INTERRUPT_ENABLED &&
@@ -1936,7 +1937,7 @@
//MiniPortInterface->DriverUnload(DriverObject); // Call MiniPort
_HCI_Unload
}
-ULONG
+VOID
NTAPI
USBPORT_MiniportCompleteTransfer(IN PVOID MiniPortExtension,
IN PVOID MiniPortEndpoint,
@@ -1969,18 +1970,7 @@
&Transfer->TransferLink,
&FdoExtension->DoneTransferSpinLock);
- return KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL);
-}
-
-ULONG
-NTAPI
-USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension,
- IN PVOID MiniPortEndpoint,
- IN PVOID TransferParameters,
- IN ULONG TransferLength)
-{
- DPRINT1("USBPORT_CompleteIsoTransfer: UNIMPLEMENTED. FIXME.\n");
- return 0;
+ KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL);
}
VOID
@@ -2309,7 +2299,7 @@
do
{
- ElementLength = 0x1000 - (PhAddress.LowPart & 0xFFF);
+ ElementLength = PAGE_SIZE - (PhAddress.LowPart & (PAGE_SIZE - 1));
if (ElementLength > SgCurrentLength)
ElementLength = SgCurrentLength;
@@ -2331,9 +2321,9 @@
}
while (SgCurrentLength);
- if ((PhAddr.LowPart == PhAddress.LowPart) &&
- (PhAddr.HighPart == PhAddress.HighPart))
- {
+ if (PhAddr.QuadPart == PhAddress.QuadPart)
+ {
+ DPRINT1("USBPORT_MapTransfer: PhAddr == PhAddress\n");
ASSERT(FALSE);
}
Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h?rev=75747&r1=75746&r2=75747&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h [iso-8859-1]
(original)
+++ branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h [iso-8859-1]
Sun Sep 3 08:47:37 2017
@@ -862,6 +862,22 @@
IN PDEVICE_OBJECT RootHubPdo,
IN PUNICODE_STRING DestinationString);
+/* iso.c */
+USBD_STATUS
+NTAPI
+USBPORT_InitializeIsoTransfer(
+ IN PDEVICE_OBJECT FdoDevice,
+ IN struct _URB_ISOCH_TRANSFER * Urb,
+ IN PUSBPORT_TRANSFER Transfer);
+
+ULONG
+NTAPI
+USBPORT_CompleteIsoTransfer(
+ IN PVOID MiniPortExtension,
+ IN PVOID MiniPortEndpoint,
+ IN PVOID TransferParameters,
+ IN ULONG TransferLength);
+
/* pnp.c */
NTSTATUS
NTAPI
Modified: branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h?rev=75747&r1=75746&r2=75747&view=diff
==============================================================================
--- branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h
[iso-8859-1] (original)
+++ branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h
[iso-8859-1] Sun Sep 3 08:47:37 2017
@@ -43,7 +43,7 @@
typedef struct _USBPORT_RESOURCES {
ULONG ResourcesTypes;
- ULONG HcFlavor;
+ USB_CONTROLLER_FLAVOR HcFlavor;
ULONG InterruptVector;
KIRQL InterruptLevel;
UCHAR Padded1[3];
@@ -364,7 +364,7 @@
PVOID,
PVOID);
-typedef ULONG
+typedef VOID
(NTAPI *PUSBPORT_COMPLETE_TRANSFER)(
PVOID,
PVOID,
@@ -581,6 +581,8 @@
C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 32 + 76 * sizeof(PVOID));
#define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device
+#define USBPORT_MAX_DEVICE_ADDRESS 127
+
typedef struct _USBPORT_ENDPOINT_PROPERTIES {
USHORT DeviceAddress;
USHORT EndpointAddress;
