ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB_VEN: Move internal constant to .cpp

This commit is contained in:
Léo Lam 2017-11-02 22:01:38 +01:00
parent ef8b3cb960
commit c6038155cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/IOS/USB/USB_VEN/VEN.cpp
View File

@ -49,6 +49,8 @@ struct DeviceEntry
#pragma pack(pop) #pragma pack(pop)
} }
constexpr u32 USBV5_VERSION = 0x50001;
USB_VEN::USB_VEN(Kernel& ios, const std::string& device_name) : USBHost(ios, device_name) USB_VEN::USB_VEN(Kernel& ios, const std::string& device_name) : USBHost(ios, device_name)
{ {
} }
@ -72,7 +74,7 @@ IPCCommandResult USB_VEN::IOCtl(const IOCtlRequest& request)
switch (request.request) switch (request.request)
{ {
case USB::IOCTL_USBV5_GETVERSION: case USB::IOCTL_USBV5_GETVERSION:
Memory::Write_U32(VERSION, request.buffer_out); Memory::Write_U32(USBV5_VERSION, request.buffer_out);
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);
case USB::IOCTL_USBV5_GETDEVICECHANGE: case USB::IOCTL_USBV5_GETDEVICECHANGE:
return GetDeviceChange(request); return GetDeviceChange(request);

2
Source/Core/Core/IOS/USB/USB_VEN/VEN.h
View File

@ -54,8 +54,6 @@ private:
void OnDeviceChangeEnd() override; void OnDeviceChangeEnd() override;
void TriggerDeviceChangeReply(); void TriggerDeviceChangeReply();
static constexpr u32 VERSION = 0x50001;
bool m_devicechange_first_call = true; bool m_devicechange_first_call = true;
std::mutex m_devicechange_hook_address_mutex; std::mutex m_devicechange_hook_address_mutex;
std::unique_ptr<IOCtlRequest> m_devicechange_hook_request; std::unique_ptr<IOCtlRequest> m_devicechange_hook_request;