summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-11-22 21:58:00 +0100
committerZach Hilman <zachhilman@gmail.com>2018-11-22 21:58:11 +0100
commitf820e58be4532d7c845c828ba6ec609a5b277723 (patch)
treea42d50e1d662bee9bcb88b218fac8405f82cefbf /src
parentapplets: Add StubApplet (diff)
downloadyuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar.gz
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar.bz2
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar.lz
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar.xz
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.tar.zst
yuzu-f820e58be4532d7c845c828ba6ec609a5b277723.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp10
-rw-r--r--src/core/hle/service/am/applets/stub_applet.cpp5
-rw-r--r--src/core/hle/service/am/applets/stub_applet.h7
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 11181a0af..f4127701f 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -6,8 +6,6 @@
#include <cinttypes>
#include <cstring>
#include <stack>
-#include "applets/applets.h"
-#include "applets/software_keyboard.h"
#include "audio_core/audio_renderer.h"
#include "core/core.h"
#include "core/hle/ipc_helpers.h"
@@ -18,6 +16,9 @@
#include "core/hle/service/am/am.h"
#include "core/hle/service/am/applet_ae.h"
#include "core/hle/service/am/applet_oe.h"
+#include "core/hle/service/am/applets/applets.h"
+#include "core/hle/service/am/applets/software_keyboard.h"
+#include "core/hle/service/am/applets/stub_applet.h"
#include "core/hle/service/am/idle.h"
#include "core/hle/service/am/omm.h"
#include "core/hle/service/am/spsm.h"
@@ -761,8 +762,9 @@ static std::shared_ptr<Applets::Applet> GetAppletFromId(AppletId id) {
case AppletId::SoftwareKeyboard:
return std::make_shared<Applets::SoftwareKeyboard>();
default:
- UNREACHABLE_MSG("Unimplemented AppletId [{:08X}]!", static_cast<u32>(id));
- return nullptr;
+ LOG_ERROR(Service_AM, "Unimplemented AppletId [{:08X}]! -- Falling back to stub!",
+ static_cast<u32>(id));
+ return std::make_shared<Applets::StubApplet>();
}
}
diff --git a/src/core/hle/service/am/applets/stub_applet.cpp b/src/core/hle/service/am/applets/stub_applet.cpp
index c9bd3d973..ed166b87d 100644
--- a/src/core/hle/service/am/applets/stub_applet.cpp
+++ b/src/core/hle/service/am/applets/stub_applet.cpp
@@ -2,7 +2,12 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <string>
+
#include "common/hex_util.h"
+#include "common/logging/log.h"
+#include "core/hle/result.h"
+#include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/stub_applet.h"
namespace Service::AM::Applets {
diff --git a/src/core/hle/service/am/applets/stub_applet.h b/src/core/hle/service/am/applets/stub_applet.h
index 41add5fe6..7d8dc968d 100644
--- a/src/core/hle/service/am/applets/stub_applet.h
+++ b/src/core/hle/service/am/applets/stub_applet.h
@@ -4,13 +4,6 @@
#pragma once
-#include <array>
-#include <string>
-#include <vector>
-
-#include "common/common_funcs.h"
-#include "common/swap.h"
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/applets.h"
namespace Service::AM::Applets {