From b3db45fdb7f049420a3a4e87a688f96c9e475257 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 14:32:36 -0400 Subject: [PATCH 01/10] Convert Xusb_PrepareHardware --- sys/xusb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/xusb.c b/sys/xusb.c index 90e5a70..18d0bff 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -102,7 +102,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data3, @@ -114,7 +114,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data4[5], GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data4[6], GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data4[7], - status)); + status); return status; } @@ -126,7 +126,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data3, @@ -138,7 +138,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data4[5], GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data4[6], GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data4[7], - status)); + status); return status; } @@ -150,7 +150,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data3, @@ -162,7 +162,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data4[5], GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data4[6], GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data4[7], - status)); + status); return status; } @@ -190,7 +190,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfDeviceAddQueryInterface failed status 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfDeviceAddQueryInterface failed status 0x%x\n", status); return status; } From 78aa25497392c57f520cdde8e2c1eac8baea06cb Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 14:34:14 -0400 Subject: [PATCH 02/10] Convert Xusb_AssignPdoContext --- sys/xusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/xusb.c b/sys/xusb.c index 18d0bff..2c03a6a 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -205,7 +205,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION WDF_OBJECT_ATTRIBUTES_INIT(&attributes); attributes.ParentObject = Device; - KdPrint((DRIVERNAME "Initializing XUSB context...\n")); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "Initializing XUSB context...\n"); PXUSB_DEVICE_DATA xusb = XusbGetData(Device); @@ -225,7 +225,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION status = WdfIoQueueCreate(Device, &holdingInQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xusb->HoldingUsbInRequests); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfIoQueueCreate (HoldingUsbInRequests) failed 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfIoQueueCreate (HoldingUsbInRequests) failed 0x%x\n", status); return status; } From d4b82250666a958bb564f48785c9c59cd0c790d0 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 14:35:32 -0400 Subject: [PATCH 03/10] Convert Xusb_SelectConfiguration --- sys/xusb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/xusb.c b/sys/xusb.c index 2c03a6a..884a05e 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -394,11 +394,11 @@ VOID Xusb_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVIC VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) { - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0x5D; @@ -424,11 +424,11 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0x5D; @@ -470,11 +470,11 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0x5D; @@ -492,11 +492,11 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0xFD; From 351d872272c9e45c2a0bc2c873a5729138873c53 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:11:19 -0400 Subject: [PATCH 04/10] Removed /n's --- sys/xusb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/xusb.c b/sys/xusb.c index 884a05e..43bd20e 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -102,7 +102,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data3, @@ -126,7 +126,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data3, @@ -150,7 +150,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)\n", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data3, @@ -190,7 +190,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfDeviceAddQueryInterface failed status 0x%x\n", status); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfDeviceAddQueryInterface failed status 0x%x", status); return status; } @@ -205,7 +205,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION WDF_OBJECT_ATTRIBUTES_INIT(&attributes); attributes.ParentObject = Device; - TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "Initializing XUSB context...\n"); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XUSB, "Initializing XUSB context..."); PXUSB_DEVICE_DATA xusb = XusbGetData(Device); @@ -225,7 +225,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION status = WdfIoQueueCreate(Device, &holdingInQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xusb->HoldingUsbInRequests); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfIoQueueCreate (HoldingUsbInRequests) failed 0x%x\n", status); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfIoQueueCreate (HoldingUsbInRequests) failed 0x%x", status); return status; } @@ -394,7 +394,7 @@ VOID Xusb_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVIC VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) { - TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, @@ -424,7 +424,7 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, @@ -470,7 +470,7 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, @@ -492,7 +492,7 @@ VOID Xusb_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XUSB, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, From 2133df8e4d6d8b7706aa0ea0af25337765045adf Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:15:50 -0400 Subject: [PATCH 05/10] Update Xusb_PrepareHardware --- sys/xusb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/xusb.c b/sys/xusb.c index 43bd20e..44dfd87 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -102,7 +102,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (Failed with status %!STATUS!)", GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_0.Data3, @@ -126,7 +126,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (Failed with status %!STATUS!)", GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_1.Data3, @@ -150,7 +150,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (status 0x%x)", + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "Couldn't register unknown interface GUID: %08X-%04X-%04X-%02X%02X%02X%02X%02X%02X%02X%02X (Failed with status %!STATUS!)", GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data1, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data2, GUID_DEVINTERFACE_XUSB_UNKNOWN_2.Data3, @@ -190,7 +190,7 @@ NTSTATUS Xusb_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfDeviceAddQueryInterface failed status 0x%x", status); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfDeviceAddQueryInterface failed with status %!STATUS!", status); return status; } From bda8b60c8f0452bb08e015ed9b812b14e655c1e0 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:16:45 -0400 Subject: [PATCH 06/10] Update Xusb_AssignPdoContext --- sys/xusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/xusb.c b/sys/xusb.c index 44dfd87..8dee2a2 100644 --- a/sys/xusb.c +++ b/sys/xusb.c @@ -225,7 +225,7 @@ NTSTATUS Xusb_AssignPdoContext(WDFDEVICE Device, PPDO_IDENTIFICATION_DESCRIPTION status = WdfIoQueueCreate(Device, &holdingInQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xusb->HoldingUsbInRequests); if (!NT_SUCCESS(status)) { - TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfIoQueueCreate (HoldingUsbInRequests) failed 0x%x", status); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XUSB, "WdfIoQueueCreate (HoldingUsbInRequests) failed with status %!STATUS!", status); return status; } From a9115fc487da3996bd740b2a4790a349c142bf64 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:26:06 -0400 Subject: [PATCH 07/10] Convert Xgip_PrepareHardware --- sys/xgip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/xgip.c b/sys/xgip.c index b113bd9..f07bd60 100644 --- a/sys/xgip.c +++ b/sys/xgip.c @@ -105,7 +105,7 @@ NTSTATUS Xgip_PrepareHardware(WDFDEVICE Device) status = WdfDeviceAddQueryInterface(Device, &ifaceCfg); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfDeviceAddQueryInterface failed status 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfDeviceAddQueryInterface failed with status %!STATUS!", status); return status; } @@ -382,7 +382,7 @@ VOID Xgip_SysInitTimerFunc( urb->UrbBulkOrInterruptTransfer.TransferBufferLength = (ULONG)size; RtlCopyBytes(urb->UrbBulkOrInterruptTransfer.TransferBuffer, Buffer, size); - KdPrint((DRIVERNAME "[%X] Buffer length: %d\n", + KdPrint((DRIVERNAME "[%X] Buffer length: %d\n", ((PUCHAR)urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0], urb->UrbBulkOrInterruptTransfer.TransferBufferLength)); From 293dfbf764598098e0322a8dd9c5289b0397944a Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:29:19 -0400 Subject: [PATCH 08/10] Convert Xgip_AssignPdoContext --- sys/xgip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/xgip.c b/sys/xgip.c index f07bd60..33a05a0 100644 --- a/sys/xgip.c +++ b/sys/xgip.c @@ -128,7 +128,7 @@ NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device) PXGIP_DEVICE_DATA xgip = XgipGetData(Device); - KdPrint((DRIVERNAME "Initializing XGIP context...\n")); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Initializing XGIP context..."); RtlZeroMemory(xgip, sizeof(XGIP_DEVICE_DATA)); @@ -145,7 +145,7 @@ NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device) status = WdfIoQueueCreate(Device, &pendingUsbQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xgip->PendingUsbInRequests); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfIoQueueCreate failed 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfIoQueueCreate failed with status %!STATUS!", status); return status; } @@ -155,7 +155,7 @@ NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device) status = WdfIoQueueCreate(Device, ¬ificationsQueueConfig, WDF_NO_OBJECT_ATTRIBUTES, &xgip->PendingNotificationRequests); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfIoQueueCreate failed 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfIoQueueCreate failed with status %!STATUS!", status); return status; } @@ -167,7 +167,7 @@ NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device) status = WdfCollectionCreate(&collectionAttribs, &xgip->XboxgipSysInitCollection); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfCollectionCreate failed 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfCollectionCreate failed with status %!STATUS!", status); return status; } @@ -186,7 +186,7 @@ NTSTATUS Xgip_AssignPdoContext(WDFDEVICE Device) status = WdfTimerCreate(&timerConfig, &timerAttribs, &xgip->XboxgipSysInitTimer); if (!NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "WdfTimerCreate failed 0x%x\n", status)); + TraceEvents(TRACE_LEVEL_ERROR, TRACE_XGIP, "WdfTimerCreate failed with status %!STATUS!", status); return status; } From 693483b072f522b2652243ed570881c0cb0c4e4b Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:30:42 -0400 Subject: [PATCH 09/10] Convert Xgip_SelectConfiguration --- sys/xgip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/xgip.c b/sys/xgip.c index 33a05a0..5284b4c 100644 --- a/sys/xgip.c +++ b/sys/xgip.c @@ -292,11 +292,11 @@ VOID Xgip_GetDeviceDescriptorType(PUSB_DEVICE_DESCRIPTOR pDescriptor, PPDO_DEVIC VOID Xgip_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) { - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0x47; @@ -322,11 +322,11 @@ VOID Xgip_SelectConfiguration(PUSBD_INTERFACE_INFORMATION pInfo) pInfo = (PUSBD_INTERFACE_INFORMATION)((PCHAR)pInfo + pInfo->Length); - KdPrint((DRIVERNAME ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, ">> >> >> URB_FUNCTION_SELECT_CONFIGURATION: Length %d, Interface %d, Alternate %d, Pipes %d", (int)pInfo->Length, (int)pInfo->InterfaceNumber, (int)pInfo->AlternateSetting, - pInfo->NumberOfPipes)); + pInfo->NumberOfPipes); pInfo->Class = 0xFF; pInfo->SubClass = 0x47; From fc04ccc0998c6096cd1bcc52c5d6c599c1972468 Mon Sep 17 00:00:00 2001 From: megadrago88 Date: Sat, 12 May 2018 15:33:23 -0400 Subject: [PATCH 10/10] convert Xgip_SysInitTimerFunc --- sys/xgip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/xgip.c b/sys/xgip.c index 5284b4c..387d26a 100644 --- a/sys/xgip.c +++ b/sys/xgip.c @@ -355,14 +355,14 @@ VOID Xgip_SysInitTimerFunc( // Is TRUE when collection is filled up if (xgip->XboxgipSysInitReady) { - KdPrint((DRIVERNAME "XBOXGIP ready, completing requests...\n")); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "XBOXGIP ready, completing requests..."); // Get pending IN request status = WdfIoQueueRetrieveNextRequest(xgip->PendingUsbInRequests, &usbRequest); if (NT_SUCCESS(status)) { - KdPrint((DRIVERNAME "Request found\n")); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Request found"); // Get top memory object mem = (WDFMEMORY)WdfCollectionGetFirstItem(xgip->XboxgipSysInitCollection); @@ -382,9 +382,9 @@ VOID Xgip_SysInitTimerFunc( urb->UrbBulkOrInterruptTransfer.TransferBufferLength = (ULONG)size; RtlCopyBytes(urb->UrbBulkOrInterruptTransfer.TransferBuffer, Buffer, size); - KdPrint((DRIVERNAME "[%X] Buffer length: %d\n", + TraceEvents(TRACE_LEVEL_INFORMATION, TRACE_XGIP, "[%X] Buffer length: %d", ((PUCHAR)urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0], - urb->UrbBulkOrInterruptTransfer.TransferBufferLength)); + urb->UrbBulkOrInterruptTransfer.TransferBufferLength); // Complete pending request WdfRequestComplete(usbRequest, status); @@ -397,7 +397,7 @@ VOID Xgip_SysInitTimerFunc( // Stop timer when collection is purged if (WdfCollectionGetCount(xgip->XboxgipSysInitCollection) == 0) { - KdPrint((DRIVERNAME "Collection finished\n")); + TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_XGIP, "Collection finished"); WdfTimerStop(xgip->XboxgipSysInitTimer, FALSE); }