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

Misc stubs.

This commit is contained in:
Ben Vanik 2015-06-02 00:14:24 -07:00
parent 7525b840db
commit c516447ae1
7 changed files with 91 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libxenia.vcxproj
View File

@ -168,6 +168,7 @@
<ClCompile Include="src\xenia\kernel\xam_msg.cc" />
<ClCompile Include="src\xenia\kernel\xam_net.cc" />
<ClCompile Include="src\xenia\kernel\xam_notify.cc" />
<ClCompile Include="src\xenia\kernel\xam_nui.cc" />
<ClCompile Include="src\xenia\kernel\xam_ui.cc" />
<ClCompile Include="src\xenia\kernel\xam_user.cc" />
<ClCompile Include="src\xenia\kernel\xam_video.cc" />

3
libxenia.vcxproj.filters
View File

@ -712,6 +712,9 @@
<ClCompile Include="src\xenia\kernel\util\shim_utils.cc">
<Filter>src\xenia\kernel\util</Filter>
</ClCompile>
<ClCompile Include="src\xenia\kernel\xam_nui.cc">
<Filter>src\xenia\kernel</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\xenia\emulator.h">

1
src/xenia/cpu/export_resolver.h
View File

@ -40,6 +40,7 @@ struct ExportTag {
static const type kFileSystem = 1 << 14;
static const type kModules = 1 << 15;
static const type kUserProfiles = 1 << 16;
static const type kNetworking = 1 << 17;
// Export will be logged on each call.
static const type kLog = 1 << 30;

1
src/xenia/kernel/xam_module.cc
View File

@ -27,6 +27,7 @@ XamModule::XamModule(Emulator* emulator, KernelState* kernel_state)
xam::RegisterMsgExports(export_resolver_, kernel_state_);
xam::RegisterNetExports(export_resolver_, kernel_state_);
xam::RegisterNotifyExports(export_resolver_, kernel_state_);
xam::RegisterNuiExports(export_resolver_, kernel_state_);
xam::RegisterUIExports(export_resolver_, kernel_state_);
xam::RegisterUserExports(export_resolver_, kernel_state_);
xam::RegisterVideoExports(export_resolver_, kernel_state_);

58
src/xenia/kernel/xam_net.cc
View File

@ -55,21 +55,24 @@ void StoreSockaddr(const sockaddr& addr, uint8_t* ptr) {
}
}
// typedef struct {
// BYTE cfgSizeOfStruct;
// BYTE cfgFlags;
// BYTE cfgSockMaxDgramSockets;
// BYTE cfgSockMaxStreamSockets;
// BYTE cfgSockDefaultRecvBufsizeInK;
// BYTE cfgSockDefaultSendBufsizeInK;
// BYTE cfgKeyRegMax;
// BYTE cfgSecRegMax;
// BYTE cfgQosDataLimitDiv4;
// BYTE cfgQosProbeTimeoutInSeconds;
// BYTE cfgQosProbeRetries;
// BYTE cfgQosSrvMaxSimultaneousResponses;
// BYTE cfgQosPairWaitTimeInSeconds;
//} XNetStartupParams;
// https://github.com/joolswills/mameox/blob/master/MAMEoX/Sources/xbox_Network.cpp#L136
struct XNetStartupParams {
BYTE cfgSizeOfStruct;
BYTE cfgFlags;
BYTE cfgSockMaxDgramSockets;
BYTE cfgSockMaxStreamSockets;
BYTE cfgSockDefaultRecvBufsizeInK;
BYTE cfgSockDefaultSendBufsizeInK;
BYTE cfgKeyRegMax;
BYTE cfgSecRegMax;
BYTE cfgQosDataLimitDiv4;
BYTE cfgQosProbeTimeoutInSeconds;
BYTE cfgQosProbeRetries;
BYTE cfgQosSrvMaxSimultaneousResponses;
BYTE cfgQosPairWaitTimeInSeconds;
};
XNetStartupParams xnet_startup_params = {0};
SHIM_CALL NetDll_XNetStartup_shim(PPCContext* ppc_context,
KernelState* kernel_state) {
@ -78,6 +81,13 @@ SHIM_CALL NetDll_XNetStartup_shim(PPCContext* ppc_context,
XELOGD("NetDll_XNetStartup(%d, %.8X)", arg0, params_ptr);
if (params_ptr) {
auto params =
kernel_memory()->TranslateVirtual<XNetStartupParams*>(params_ptr);
assert_true(params->cfgSizeOfStruct == sizeof(XNetStartupParams));
std::memcpy(&xnet_startup_params, params, sizeof(XNetStartupParams));
}
SHIM_SET_RETURN_32(0);
}
@ -91,6 +101,24 @@ SHIM_CALL NetDll_XNetCleanup_shim(PPCContext* ppc_context,
SHIM_SET_RETURN_32(0);
}
dword_result_t NetDll_XNetGetOpt(dword_t one, dword_t option_id,
lpvoid_t buffer_ptr, lpdword_t buffer_size) {
assert_true(one == 1);
switch (option_id) {
case 1:
if (*buffer_size < sizeof(XNetStartupParams)) {
*buffer_size = sizeof(XNetStartupParams);
return WSAEMSGSIZE;
}
std::memcpy(buffer_ptr, &xnet_startup_params, sizeof(XNetStartupParams));
return 0;
default:
XELOGE("NetDll_XNetGetOpt: option %d unimplemented", option_id);
return WSAEINVAL;
}
}
DECLARE_XAM_EXPORT(NetDll_XNetGetOpt, ExportTag::kNetworking);
SHIM_CALL NetDll_XNetRandom_shim(PPCContext* ppc_context,
KernelState* kernel_state) {
uint32_t arg0 = SHIM_GET_ARG_32(0);

40
src/xenia/kernel/xam_nui.cc Normal file
View File

@ -0,0 +1,40 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2015 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#include "xenia/base/logging.h"
#include "xenia/emulator.h"
#include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/util/shim_utils.h"
#include "xenia/kernel/xam_private.h"
#include "xenia/xbox.h"
namespace xe {
namespace kernel {
struct X_NUI_DEVICE_STATUS {
xe::be<uint32_t> unk0;
xe::be<uint32_t> unk1;
xe::be<uint32_t> unk2;
xe::be<uint32_t> status;
xe::be<uint32_t> unk4;
xe::be<uint32_t> unk5;
};
static_assert(sizeof(X_NUI_DEVICE_STATUS) == 24, "Size matters");
void XamNuiGetDeviceStatus(pointer_t<X_NUI_DEVICE_STATUS> status_ptr) {
status_ptr.Zero();
status_ptr->status = 0; // Not connected.
}
DECLARE_XAM_EXPORT(XamNuiGetDeviceStatus, ExportTag::kStub);
} // namespace kernel
} // namespace xe
void xe::kernel::xam::RegisterNuiExports(
xe::cpu::ExportResolver* export_resolver, KernelState* kernel_state) {}

2
src/xenia/kernel/xam_private.h
View File

@ -34,6 +34,8 @@ void RegisterNetExports(xe::cpu::ExportResolver* export_resolver,
KernelState* kernel_state);
void RegisterNotifyExports(xe::cpu::ExportResolver* export_resolver,
KernelState* kernel_state);
void RegisterNuiExports(xe::cpu::ExportResolver* export_resolver,
KernelState* kernel_state);
void RegisterUIExports(xe::cpu::ExportResolver* export_resolver,
KernelState* kernel_state);
void RegisterUserExports(xe::cpu::ExportResolver* export_resolver,