diff --git a/sys/Ds4Pdo.cpp b/sys/Ds4Pdo.cpp index 16ed3b6..dc51b6f 100644 --- a/sys/Ds4Pdo.cpp +++ b/sys/Ds4Pdo.cpp @@ -981,7 +981,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetDS4::UsbBulkOrInterruptTransfer(_UR if (pTransfer->TransferFlags & USBD_TRANSFER_DIRECTION_IN && pTransfer->PipeHandle == reinterpret_cast(0xFFFF0084)) { - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_USBPDO, ">> >> >> Incoming request, queuing..."); diff --git a/sys/EmulationTargetPDO.cpp b/sys/EmulationTargetPDO.cpp index 1b80b82..e16bdef 100644 --- a/sys/EmulationTargetPDO.cpp +++ b/sys/EmulationTargetPDO.cpp @@ -459,7 +459,7 @@ VOID ViGEm::Bus::Core::EmulationTargetPDO::EvtIoInternalDeviceControl( PIO_STACK_LOCATION irpStack; //PUCHAR blobBuffer; - TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSPDO, "%!FUNC! Entry"); + TraceDbg(TRACE_BUSPDO, "%!FUNC! Entry"); // No help from the framework available from here on irp = WdfRequestWdmGetIrp(Request); @@ -534,7 +534,7 @@ VOID ViGEm::Bus::Core::EmulationTargetPDO::EvtIoInternalDeviceControl( case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_BUSPDO, ">> >> URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER"); @@ -723,5 +723,5 @@ VOID ViGEm::Bus::Core::EmulationTargetPDO::EvtIoInternalDeviceControl( WdfRequestComplete(Request, status); } - TraceEvents(TRACE_LEVEL_VERBOSE, TRACE_BUSPDO, "%!FUNC! Exit with status %!STATUS!", status); + TraceDbg(TRACE_BUSPDO, "%!FUNC! Exit with status %!STATUS!", status); } diff --git a/sys/XusbPdo.cpp b/sys/XusbPdo.cpp index 6040d98..0b23596 100644 --- a/sys/XusbPdo.cpp +++ b/sys/XusbPdo.cpp @@ -719,7 +719,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U // Data coming FROM us TO higher driver if (pTransfer->TransferFlags & USBD_TRANSFER_DIRECTION_IN) { - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_USBPDO, ">> >> >> Incoming request, queuing..."); @@ -818,7 +818,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U } // Data coming FROM the higher driver TO us - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_USBPDO, ">> >> >> URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: Handle %p, Flags %X, Length %d", pTransfer->PipeHandle, @@ -829,7 +829,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U { auto Buffer = static_cast(pTransfer->TransferBuffer); - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_USBPDO, "-- LED Buffer: %02X %02X %02X", Buffer[0], Buffer[1], Buffer[2]); @@ -842,7 +842,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U if (Buffer[2] == 0x04)this->LedNumber = 2; if (Buffer[2] == 0x05)this->LedNumber = 3; - TraceEvents(TRACE_LEVEL_INFORMATION, + TraceDbg( TRACE_USBPDO, "-- LED Number: %d", this->LedNumber); @@ -859,7 +859,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U { auto Buffer = static_cast(pTransfer->TransferBuffer); - TraceEvents(TRACE_LEVEL_VERBOSE, + TraceDbg( TRACE_USBPDO, "-- Rumble Buffer: %02X %02X %02X %02X %02X %02X %02X %02X", Buffer[0], @@ -911,7 +911,7 @@ NTSTATUS ViGEm::Bus::Targets::EmulationTargetXUSB::UsbBulkOrInterruptTransfer(_U { TraceEvents(TRACE_LEVEL_WARNING, TRACE_USBPDO, - "!! [XUSB] WdfIoQueueRetrieveNextRequest failed with status %!STATUS!", + "!! WdfIoQueueRetrieveNextRequest failed with status %!STATUS!", status); } diff --git a/sys/trace.h b/sys/trace.h index 4de6691..a8e1cf5 100644 --- a/sys/trace.h +++ b/sys/trace.h @@ -68,5 +68,6 @@ // begin_wpp config // FUNC Trace{FLAG=MYDRIVER_ALL_INFO}(LEVEL, MSG, ...); // FUNC TraceEvents(LEVEL, FLAGS, MSG, ...); +// FUNC TraceDbg{LEVEL=TRACE_LEVEL_INFORMATION}(FLAGS, MSG, ...); // end_wpp //