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

[Kernel] Rename UnknownFEApp to XamApp.

This commit is contained in:
gibbed 2020-04-13 10:48:09 -05:00 committed by Rick Gibbed
parent fdfc55c8fd
commit ae7555e9ff
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/kernel/xam/app_manager.cc
View File

@ -2,7 +2,7 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2014 Ben Vanik. All rights reserved. * * Copyright 2020 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
@ -10,7 +10,7 @@
#include "xenia/kernel/xam/app_manager.h" #include "xenia/kernel/xam/app_manager.h"
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/xam/apps/unknown_fe_app.h" #include "xenia/kernel/xam/apps/xam_app.h"
#include "xenia/kernel/xam/apps/xgi_app.h" #include "xenia/kernel/xam/apps/xgi_app.h"
#include "xenia/kernel/xam/apps/xlivebase_app.h" #include "xenia/kernel/xam/apps/xlivebase_app.h"
#include "xenia/kernel/xam/apps/xmp_app.h" #include "xenia/kernel/xam/apps/xmp_app.h"
@ -28,7 +28,7 @@ void AppManager::RegisterApps(KernelState* kernel_state, AppManager* manager) {
manager->RegisterApp(std::make_unique<apps::XmpApp>(kernel_state)); manager->RegisterApp(std::make_unique<apps::XmpApp>(kernel_state));
manager->RegisterApp(std::make_unique<apps::XgiApp>(kernel_state)); manager->RegisterApp(std::make_unique<apps::XgiApp>(kernel_state));
manager->RegisterApp(std::make_unique<apps::XLiveBaseApp>(kernel_state)); manager->RegisterApp(std::make_unique<apps::XLiveBaseApp>(kernel_state));
manager->RegisterApp(std::make_unique<apps::UnknownFEApp>(kernel_state)); manager->RegisterApp(std::make_unique<apps::XamApp>(kernel_state));
} }
void AppManager::RegisterApp(std::unique_ptr<App> app) { void AppManager::RegisterApp(std::unique_ptr<App> app) {

22
src/xenia/kernel/xam/apps/unknown_fe_app.cc → src/xenia/kernel/xam/apps/xam_app.cc
View File

@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2015 Ben Vanik. All rights reserved. * * Copyright 2020 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
#include "xenia/kernel/xam/apps/unknown_fe_app.h" #include "xenia/kernel/xam/apps/xam_app.h"
#include "xenia/base/logging.h" #include "xenia/base/logging.h"
#include "xenia/base/threading.h" #include "xenia/base/threading.h"
@ -17,12 +17,10 @@ namespace kernel {
namespace xam { namespace xam {
namespace apps { namespace apps {
UnknownFEApp::UnknownFEApp(KernelState* kernel_state) XamApp::XamApp(KernelState* kernel_state) : App(kernel_state, 0xFE) {}
: App(kernel_state, 0xFE) {}
X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message, X_RESULT XamApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
uint32_t buffer_ptr, uint32_t buffer_length) {
uint32_t buffer_length) {
// NOTE: buffer_length may be zero or valid. // NOTE: buffer_length may be zero or valid.
auto buffer = memory_->TranslateVirtual(buffer_ptr); auto buffer = memory_->TranslateVirtual(buffer_ptr);
switch (message) { switch (message) {
@ -36,13 +34,13 @@ X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message,
assert_true(buffer_length == sizeof(message_data)); assert_true(buffer_length == sizeof(message_data));
auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_44); auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_44);
*unk = 0; *unk = 0;
XELOGD("UnknownFEApp(0x00020021)('{}', {:08X}, {:08X}, {:08X})", XELOGD("XamApp(0x00020021)('{}', {:08X}, {:08X}, {:08X})", data->unk_00,
data->unk_00, (uint32_t)data->unk_40, (uint32_t)data->unk_44, (uint32_t)data->unk_40, (uint32_t)data->unk_44,
(uint32_t)data->unk_48); (uint32_t)data->unk_48);
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
case 0x00021012: { case 0x00021012: {
XELOGD("UnknownFEApp(0x00021012)"); XELOGD("XamApp(0x00021012)");
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
case 0x00022005: { case 0x00022005: {
@ -53,13 +51,13 @@ X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message,
assert_true(buffer_length == sizeof(message_data)); assert_true(buffer_length == sizeof(message_data));
auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_00); auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_00);
auto adr = *unk; auto adr = *unk;
XELOGD("UnknownFEApp(0x00022005)(%.8X, %.8X)", (uint32_t)data->unk_00, XELOGD("XamApp(0x00022005)(%.8X, %.8X)", (uint32_t)data->unk_00,
(uint32_t)data->unk_04); (uint32_t)data->unk_04);
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
} }
XELOGE( XELOGE(
"Unimplemented 0xFE message app={:08X}, msg={:08X}, arg1={:08X}, " "Unimplemented XAM message app={:08X}, msg={:08X}, arg1={:08X}, "
"arg2={:08X}", "arg2={:08X}",
app_id(), message, buffer_ptr, buffer_length); app_id(), message, buffer_ptr, buffer_length);
return X_STATUS_UNSUCCESSFUL; return X_STATUS_UNSUCCESSFUL;

12
src/xenia/kernel/xam/apps/unknown_fe_app.h → src/xenia/kernel/xam/apps/xam_app.h
View File

@ -2,13 +2,13 @@
****************************************************************************** ******************************************************************************
* Xenia : Xbox 360 Emulator Research Project * * Xenia : Xbox 360 Emulator Research Project *
****************************************************************************** ******************************************************************************
* Copyright 2015 Ben Vanik. All rights reserved. * * Copyright 2020 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. * * Released under the BSD license - see LICENSE in the root for more details. *
****************************************************************************** ******************************************************************************
*/ */
#ifndef XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_ #ifndef XENIA_KERNEL_XAM_APPS_XAM_APP_H_
#define XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_ #define XENIA_KERNEL_XAM_APPS_XAM_APP_H_
#include "xenia/kernel/kernel_state.h" #include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/xam/app_manager.h" #include "xenia/kernel/xam/app_manager.h"
@ -18,9 +18,9 @@ namespace kernel {
namespace xam { namespace xam {
namespace apps { namespace apps {
class UnknownFEApp : public App { class XamApp : public App {
public: public:
explicit UnknownFEApp(KernelState* kernel_state); explicit XamApp(KernelState* kernel_state);
X_RESULT DispatchMessageSync(uint32_t message, uint32_t buffer_ptr, X_RESULT DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
uint32_t buffer_length) override; uint32_t buffer_length) override;
@ -31,4 +31,4 @@ class UnknownFEApp : public App {
} // namespace kernel } // namespace kernel
} // namespace xe } // namespace xe
#endif // XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_ #endif // XENIA_KERNEL_XAM_APPS_XAM_APP_H_