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

Merge pull request #4142 from mbc07/IPC_HLE_usb_ven 

[IPC HLE] Implement /dev/usb/ven with very basic functionality
This commit is contained in:
Scott Mansell 2016-09-07 13:51:55 +12:00 committed by GitHub
parent 18030ebfb4 8fa687eab4
commit 366a38a917
6 changed files with 179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/CMakeLists.txt
View File

@ -146,6 +146,7 @@ set(SRCS ActionReplay.cpp
IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
IPC_HLE/WII_IPC_HLE_Device_usb.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp
IPC_HLE/WII_IPC_HLE_WiiMote.cpp
IPC_HLE/WiiMote_HID_Attr.cpp
PowerPC/MMU.cpp

2
Source/Core/Core/Core.vcxproj
View File

@ -186,6 +186,7 @@
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
<ClCompile Include="IPC_HLE\WII_Socket.cpp" />
<ClCompile Include="MemTools.cpp" />
@ -389,6 +390,7 @@
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_stm.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h" />
<ClInclude Include="IPC_HLE\WII_Socket.h" />
<ClInclude Include="MachineContext.h" />

6
Source/Core/Core/Core.vcxproj.filters
View File

@ -724,6 +724,9 @@
<Filter>PowerPC\Jit64Common</Filter>
</ClCompile>
<ClCompile Include="Analytics.cpp" />
<ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.cpp">
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="BootManager.h" />
@ -1237,6 +1240,9 @@
<Filter>PowerPC\Jit64Common</Filter>
</ClInclude>
<ClInclude Include="Analytics.h" />
<ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_ven.h">
<Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -52,6 +52,7 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC
#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h"
#if defined(__LIBUSB__) || defined(_WIN32)
#include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
@ -147,6 +148,7 @@ void Reinit()
AddDevice<CWII_IPC_HLE_Device_net_ip_top>("/dev/net/ip/top");
AddDevice<CWII_IPC_HLE_Device_net_ssl>("/dev/net/ssl");
AddDevice<CWII_IPC_HLE_Device_usb_kbd>("/dev/usb/kbd");
AddDevice<CWII_IPC_HLE_Device_usb_ven>("/dev/usb/ven");
AddDevice<CWII_IPC_HLE_Device_sdio_slot0>("/dev/sdio/slot0");
AddDevice<CWII_IPC_HLE_Device_stub>("/dev/sdio/slot1");
#if defined(__LIBUSB__) || defined(_WIN32)

125
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.cpp Normal file
View File

@ -0,0 +1,125 @@
// Copyright 2016 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/StringUtil.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h"
CWII_IPC_HLE_Device_usb_ven::CWII_IPC_HLE_Device_usb_ven(u32 _DeviceID,
const std::string& _rDeviceName)
: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
{
}
CWII_IPC_HLE_Device_usb_ven::~CWII_IPC_HLE_Device_usb_ven()
{
}
IPCCommandResult CWII_IPC_HLE_Device_usb_ven::Open(u32 _CommandAddress, u32 _Mode)
{
Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
m_Active = true;
return GetDefaultReply();
}
IPCCommandResult CWII_IPC_HLE_Device_usb_ven::Close(u32 _CommandAddress, bool _bForce)
{
if (!_bForce)
Memory::Write_U32(0, _CommandAddress + 4);
m_Active = false;
return GetDefaultReply();
}
IPCCommandResult CWII_IPC_HLE_Device_usb_ven::IOCtlV(u32 _CommandAddress)
{
SIOCtlVBuffer CommandBuffer(_CommandAddress);
DEBUG_LOG(OSHLE, "%s - IOCtlV:", GetDeviceName().c_str());
DEBUG_LOG(OSHLE, " Parameter: 0x%x", CommandBuffer.Parameter);
DEBUG_LOG(OSHLE, " NumberIn: 0x%08x", CommandBuffer.NumberInBuffer);
DEBUG_LOG(OSHLE, " NumberOut: 0x%08x", CommandBuffer.NumberPayloadBuffer);
DEBUG_LOG(OSHLE, " BufferVector: 0x%08x", CommandBuffer.BufferVector);
DumpAsync(CommandBuffer.BufferVector, CommandBuffer.NumberInBuffer,
CommandBuffer.NumberPayloadBuffer);
Memory::Write_U32(0, _CommandAddress + 4);
return GetNoReply();
}
IPCCommandResult CWII_IPC_HLE_Device_usb_ven::IOCtl(u32 _CommandAddress)
{
IPCCommandResult Reply = GetNoReply();
u32 Command = Memory::Read_U32(_CommandAddress + 0x0c);
u32 BufferIn = Memory::Read_U32(_CommandAddress + 0x10);
u32 BufferInSize = Memory::Read_U32(_CommandAddress + 0x14);
u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
u32 BufferOutSize = Memory::Read_U32(_CommandAddress + 0x1c);
DEBUG_LOG(OSHLE, "%s - IOCtl: %x", GetDeviceName().c_str(), Command);
DEBUG_LOG(OSHLE, "%x:%x %x:%x", BufferIn, BufferInSize, BufferOut, BufferOutSize);
switch (Command)
{
case USBV5_IOCTL_GETVERSION:
Memory::Write_U32(0x50001, BufferOut);
Reply = GetDefaultReply();
break;
case USBV5_IOCTL_GETDEVICECHANGE:
{
// sent on change
static bool firstcall = true;
if (firstcall)
{
Reply = GetDefaultReply();
firstcall = false;
}
// num devices
Memory::Write_U32(0, _CommandAddress + 4);
return Reply;
}
break;
case USBV5_IOCTL_ATTACHFINISH:
Reply = GetDefaultReply();
break;
case USBV5_IOCTL_SUSPEND_RESUME:
DEBUG_LOG(OSHLE, "Device: %i Resumed: %i", Memory::Read_U32(BufferIn),
Memory::Read_U32(BufferIn + 4));
Reply = GetDefaultReply();
break;
case USBV5_IOCTL_GETDEVPARAMS:
{
s32 device = Memory::Read_U32(BufferIn);
u32 unk = Memory::Read_U32(BufferIn + 4);
DEBUG_LOG(OSHLE, "USBV5_IOCTL_GETDEVPARAMS device: %i unk: %i", device, unk);
Memory::Write_U32(0, BufferOut);
Reply = GetDefaultReply();
}
break;
default:
DEBUG_LOG(OSHLE, "%x:%x %x:%x", BufferIn, BufferInSize, BufferOut, BufferOutSize);
break;
}
Memory::Write_U32(0, _CommandAddress + 4);
return Reply;
}
u32 CWII_IPC_HLE_Device_usb_ven::Update()
{
return IWII_IPC_HLE_Device::Update();
}
void CWII_IPC_HLE_Device_usb_ven::DoState(PointerWrap& p)
{
}

43
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_ven.h Normal file
View File

@ -0,0 +1,43 @@
// Copyright 2016 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include "Core/IPC_HLE/WII_IPC_HLE.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
class CWII_IPC_HLE_Device_usb_ven : public IWII_IPC_HLE_Device
{
public:
CWII_IPC_HLE_Device_usb_ven(u32 _DeviceID, const std::string& _rDeviceName);
~CWII_IPC_HLE_Device_usb_ven() override;
virtual IPCCommandResult Open(u32 _CommandAddress, u32 _Mode);
virtual IPCCommandResult Close(u32 _CommandAddress, bool _bForce);
virtual IPCCommandResult IOCtlV(u32 _CommandAddress);
virtual IPCCommandResult IOCtl(u32 _CommandAddress);
virtual u32 Update();
void DoState(PointerWrap& p);
private:
enum USBIOCtl
{
USBV5_IOCTL_GETVERSION = 0,
USBV5_IOCTL_GETDEVICECHANGE = 1,
USBV5_IOCTL_SHUTDOWN = 2,
USBV5_IOCTL_GETDEVPARAMS = 3,
USBV5_IOCTL_ATTACHFINISH = 6,
USBV5_IOCTL_SETALTERNATE = 7,
USBV5_IOCTL_SUSPEND_RESUME = 16,
USBV5_IOCTL_CANCELENDPOINT = 17,
USBV5_IOCTL_CTRLMSG = 18,
USBV5_IOCTL_INTRMSG = 19,
USBV5_IOCTL_ISOMSG = 20,
USBV5_IOCTL_BULKMSG = 21
};
};