Minor clean-up

This commit is contained in:
Benjamin Höglinger-Stelzer
2020-05-13 21:58:37 +02:00
parent 5d2dd2a122
commit 15a9b2c896
3 changed files with 25 additions and 10 deletions

View File

@@ -76,14 +76,28 @@ namespace ViGEm::Bus::Targets
NTSTATUS SelectConfiguration(PURB Urb) override;
void AbortPipe() override;
NTSTATUS UsbClassInterface(PURB Urb) override;
NTSTATUS UsbGetDescriptorFromInterface(PURB Urb) override;
NTSTATUS UsbSelectInterface(PURB Urb) override;
NTSTATUS UsbGetStringDescriptorType(PURB Urb) override;
NTSTATUS UsbBulkOrInterruptTransfer(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer, WDFREQUEST Request) override;
NTSTATUS UsbControlTransfer(PURB Urb) override;
NTSTATUS SubmitReportImpl(PVOID NewReport) override;
private:
static EVT_WDF_TIMER PendingUsbRequestsTimerFunc;
static VOID ReverseByteArray(PUCHAR Array, INT Length);
static VOID GenerateRandomMacAddress(PMAC_ADDRESS Address);
static PCWSTR _deviceDescription;
static const int HID_REQUEST_GET_REPORT = 0x01;
@@ -134,12 +148,6 @@ namespace ViGEm::Bus::Targets
//
// Default MAC address of the host (not used)
//
MAC_ADDRESS _HostMacAddress;
static EVT_WDF_TIMER PendingUsbRequestsTimerFunc;
static VOID ReverseByteArray(PUCHAR Array, INT Length);
static VOID GenerateRandomMacAddress(PMAC_ADDRESS Address);
MAC_ADDRESS _HostMacAddress;
};
}

View File

@@ -126,6 +126,8 @@ namespace ViGEm::Bus::Core
protected:
static const ULONG _maxHardwareIdLength = 0xFF;
static const int MAX_INSTANCE_ID_LEN = 80;
static PCWSTR _deviceLocation;
static BOOLEAN USB_BUSIFFN UsbInterfaceIsDeviceHighSpeed(IN PVOID BusContext);
@@ -153,9 +155,7 @@ namespace ViGEm::Bus::Core
static EVT_WDF_IO_QUEUE_IO_INTERNAL_DEVICE_CONTROL EvtIoInternalDeviceControl;
static VOID PluginRequestCompletionWorkerRoutine(IN PVOID StartContext);
static const int MAX_INSTANCE_ID_LEN = 80;
virtual VOID GetConfigurationDescriptorType(PUCHAR Buffer, ULONG Length) = 0;
virtual NTSTATUS SelectConfiguration(PURB Urb) = 0;

View File

@@ -74,14 +74,21 @@ namespace ViGEm::Bus::Targets
void AbortPipe() override;
NTSTATUS UsbClassInterface(PURB Urb) override;
NTSTATUS UsbGetDescriptorFromInterface(PURB Urb) override;
NTSTATUS UsbSelectInterface(PURB Urb) override;
NTSTATUS UsbGetStringDescriptorType(PURB Urb) override;
NTSTATUS UsbBulkOrInterruptTransfer(_URB_BULK_OR_INTERRUPT_TRANSFER* pTransfer, WDFREQUEST Request) override;
NTSTATUS UsbControlTransfer(PURB Urb) override;
NTSTATUS SubmitReportImpl(PVOID NewReport) override;
NTSTATUS GetUserIndex(PULONG UserIndex) const;
private:
static PCWSTR _deviceDescription;