mirror of
https://github.com/PabloMK7/citra.git
synced 2025-10-11 12:00:03 +00:00
frd: Stub several functions (#7010)
* mii: Improve mii data variable naming * frd: Stub several functions Allows the friend applet to open successfully. * frd: Address review comments
This commit is contained in:
Tobias
GitHub
parent
60d815fada
commit
1492d73ccb
6 changed files with 231 additions and 60 deletions
|
|
@ -9,8 +9,10 @@
|
|||
#include "common/assert.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "core/core.h"
|
||||
#include "core/hle/applets/mii_selector.h"
|
||||
#include "core/hle/ipc_helpers.h"
|
||||
#include "core/hle/kernel/event.h"
|
||||
#include "core/hle/mii.h"
|
||||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/cfg/cfg.h"
|
||||
#include "core/hle/service/frd/frd.h"
|
||||
|
|
@ -97,11 +99,6 @@ void Module::Interface::GetMyScreenName(Kernel::HLERequestContext& ctx) {
|
|||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(7, 0);
|
||||
|
||||
struct ScreenName {
|
||||
// 20 bytes according to 3dbrew
|
||||
std::array<char16_t, 10> name;
|
||||
};
|
||||
|
||||
auto cfg = Service::CFG::GetModule(frd->system);
|
||||
ASSERT_MSG(cfg, "CFG Module missing!");
|
||||
auto username = cfg->GetUsername();
|
||||
|
|
@ -113,7 +110,86 @@ void Module::Interface::GetMyScreenName(Kernel::HLERequestContext& ctx) {
|
|||
rb.PushRaw(screen_name);
|
||||
rb.Push(0);
|
||||
|
||||
LOG_INFO(Service_FRD, "returning the username defined in cfg");
|
||||
LOG_DEBUG(Service_FRD, "called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyComment(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(10, 0);
|
||||
|
||||
constexpr Comment comment{.name = {u'H', u'e', u'y', '!'}};
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.PushRaw<Comment>(comment);
|
||||
rb.Push(0);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyMii(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(0x19, 0);
|
||||
|
||||
const auto mii_data = HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data;
|
||||
Mii::ChecksummedMiiData mii{};
|
||||
mii.SetMiiData(mii_data);
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.PushRaw<Mii::ChecksummedMiiData>(mii);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyProfile(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(3, 0);
|
||||
|
||||
constexpr Profile profile{.region = 1, .country = 1, .area = 1, .language = 1, .platform = 1};
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.PushRaw<Profile>(profile);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyFavoriteGame(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(5, 0);
|
||||
|
||||
constexpr Game game{.title_id = 0x0004000E00030700, .version = 1};
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.PushRaw<Game>(game);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyPlayingGame(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(5, 0);
|
||||
|
||||
constexpr Game game{.title_id = 0x0004000E00030700, .version = 1};
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.PushRaw<Game>(game);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::GetMyPreference(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(4, 0);
|
||||
|
||||
constexpr u32 is_public = 1;
|
||||
constexpr u32 show_game = 1;
|
||||
constexpr u32 show_history = 0;
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.Push<u32>(is_public);
|
||||
rb.Push<u32>(show_game);
|
||||
rb.Push<u32>(show_history);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::UnscrambleLocalFriendCode(Kernel::HLERequestContext& ctx) {
|
||||
|
|
@ -158,6 +234,16 @@ void Module::Interface::SetClientSdkVersion(Kernel::HLERequestContext& ctx) {
|
|||
LOG_WARNING(Service_FRD, "(STUBBED) called, version: 0x{:08X}", version);
|
||||
}
|
||||
|
||||
void Module::Interface::IsOnline(Kernel::HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp(ctx);
|
||||
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
|
||||
|
||||
rb.Push(RESULT_SUCCESS);
|
||||
rb.Push(frd->logged_in);
|
||||
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
}
|
||||
|
||||
void Module::Interface::HasLoggedIn(Kernel::HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_FRD, "(STUBBED) called");
|
||||
|
||||
|
|
|
|||
|
|
@ -49,8 +49,29 @@ struct Profile {
|
|||
u8 country;
|
||||
u8 area;
|
||||
u8 language;
|
||||
u32 unknown;
|
||||
u8 platform;
|
||||
INSERT_PADDING_BYTES(0x3);
|
||||
};
|
||||
static_assert(sizeof(Profile) == 0x8, "Profile has incorrect size");
|
||||
|
||||
struct Game {
|
||||
u64 title_id;
|
||||
u16 version;
|
||||
INSERT_PADDING_BYTES(0x6);
|
||||
};
|
||||
static_assert(sizeof(Game) == 0x10, "Game has inccorect size");
|
||||
|
||||
struct ScreenName {
|
||||
// 20 bytes according to 3dbrew
|
||||
std::array<char16_t, 10> name;
|
||||
};
|
||||
static_assert(sizeof(ScreenName) == 0x14, "ScreenName has inccorect size");
|
||||
|
||||
struct Comment {
|
||||
// 32 bytes according to 3dbrew
|
||||
std::array<char16_t, 16> name;
|
||||
};
|
||||
static_assert(sizeof(Comment) == 0x20, "Comment has inccorect size");
|
||||
|
||||
class Module final {
|
||||
public:
|
||||
|
|
@ -128,6 +149,56 @@ public:
|
|||
*/
|
||||
void GetMyScreenName(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyMii service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : MiiStoreData structure
|
||||
*/
|
||||
void GetMyMii(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyProfile service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2-3 : Profile structure
|
||||
*/
|
||||
void GetMyProfile(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyComment service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : UTF16 encoded comment (max 16 symbols)
|
||||
*/
|
||||
void GetMyComment(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyFavoriteGame service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2-3 : Game structure
|
||||
*/
|
||||
void GetMyFavoriteGame(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyPlayingGame service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2-3 : Game structure
|
||||
*/
|
||||
void GetMyPlayingGame(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::GetMyPreference service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : Public mode (byte, 0 = private, non-zero = public)
|
||||
* 3 : Show current game (byte, 0 = don't show, non-zero = show)
|
||||
* 4 : Show game history (byte, 0 = don't show, non-zero = show)
|
||||
*/
|
||||
void GetMyPreference(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::UnscrambleLocalFriendCode service function
|
||||
* Inputs:
|
||||
|
|
@ -160,10 +231,18 @@ public:
|
|||
void Login(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::HasLoggedIn service function
|
||||
* FRD::IsOnline service function
|
||||
* Inputs:
|
||||
* none
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : Online state (8-bit, 0 = not online, non-zero = online)
|
||||
*/
|
||||
void IsOnline(Kernel::HLERequestContext& ctx);
|
||||
|
||||
/**
|
||||
* FRD::HasLoggedIn service function
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : If the user has logged in 1, otherwise 0
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@ namespace Service::FRD {
|
|||
FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:a", 8) {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0x0001, &FRD_A::HasLoggedIn, "HasLoggedIn"},
|
||||
{0x0002, nullptr, "IsOnline"},
|
||||
{0x0002, &FRD_A::IsOnline, "IsOnline"},
|
||||
{0x0003, &FRD_A::Login, "Login"},
|
||||
{0x0004, nullptr, "Logout"},
|
||||
{0x0005, &FRD_A::GetMyFriendKey, "GetMyFriendKey"},
|
||||
{0x0006, nullptr, "GetMyPreference"},
|
||||
{0x0007, nullptr, "GetMyProfile"},
|
||||
{0x0006, &FRD_A::GetMyPreference, "GetMyPreference"},
|
||||
{0x0007, &FRD_A::GetMyProfile, "GetMyProfile"},
|
||||
{0x0008, &FRD_A::GetMyPresence, "GetMyPresence"},
|
||||
{0x0009, &FRD_A::GetMyScreenName, "GetMyScreenName"},
|
||||
{0x000A, nullptr, "GetMyMii"},
|
||||
{0x000A, &FRD_A::GetMyMii, "GetMyMii"},
|
||||
{0x000B, nullptr, "GetMyLocalAccountId"},
|
||||
{0x000C, nullptr, "GetMyPlayingGame"},
|
||||
{0x000D, nullptr, "GetMyFavoriteGame"},
|
||||
{0x000C, &FRD_A::GetMyPlayingGame, "GetMyPlayingGame"},
|
||||
{0x000D, &FRD_A::GetMyFavoriteGame, "GetMyFavoriteGame"},
|
||||
{0x000E, nullptr, "GetMyNcPrincipalId"},
|
||||
{0x000F, nullptr, "GetMyComment"},
|
||||
{0x000F, &FRD_A::GetMyComment, "GetMyComment"},
|
||||
{0x0010, nullptr, "GetMyPassword"},
|
||||
{0x0011, &FRD_A::GetFriendKeyList, "GetFriendKeyList"},
|
||||
{0x0012, nullptr, "GetFriendPresence"},
|
||||
|
|
@ -64,6 +64,7 @@ FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "f
|
|||
{0x0033, nullptr, "GetMyApproachContext"},
|
||||
{0x0034, nullptr, "AddFriendWithApproach"},
|
||||
{0x0035, nullptr, "DecryptApproachContext"},
|
||||
{0x0405, nullptr, "SaveData"},
|
||||
{0x0406, nullptr, "AddFriendOnline"},
|
||||
{0x0409, nullptr, "RemoveFriend"},
|
||||
{0x040a, nullptr, "UpdatePlayingGame"},
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@ namespace Service::FRD {
|
|||
FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:u", 8) {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0x0001, &FRD_U::HasLoggedIn, "HasLoggedIn"},
|
||||
{0x0002, nullptr, "IsOnline"},
|
||||
{0x0002, &FRD_U::IsOnline, "IsOnline"},
|
||||
{0x0003, &FRD_U::Login, "Login"},
|
||||
{0x0004, nullptr, "Logout"},
|
||||
{0x0005, &FRD_U::GetMyFriendKey, "GetMyFriendKey"},
|
||||
{0x0006, nullptr, "GetMyPreference"},
|
||||
{0x0007, nullptr, "GetMyProfile"},
|
||||
{0x0006, &FRD_U::GetMyPreference, "GetMyPreference"},
|
||||
{0x0007, &FRD_U::GetMyProfile, "GetMyProfile"},
|
||||
{0x0008, &FRD_U::GetMyPresence, "GetMyPresence"},
|
||||
{0x0009, &FRD_U::GetMyScreenName, "GetMyScreenName"},
|
||||
{0x000A, nullptr, "GetMyMii"},
|
||||
{0x000A, &FRD_U::GetMyMii, "GetMyMii"},
|
||||
{0x000B, nullptr, "GetMyLocalAccountId"},
|
||||
{0x000C, nullptr, "GetMyPlayingGame"},
|
||||
{0x000D, nullptr, "GetMyFavoriteGame"},
|
||||
{0x000C, &FRD_U::GetMyPlayingGame, "GetMyPlayingGame"},
|
||||
{0x000D, &FRD_U::GetMyFavoriteGame, "GetMyFavoriteGame"},
|
||||
{0x000E, nullptr, "GetMyNcPrincipalId"},
|
||||
{0x000F, nullptr, "GetMyComment"},
|
||||
{0x000F, &FRD_U::GetMyComment, "GetMyComment"},
|
||||
{0x0010, nullptr, "GetMyPassword"},
|
||||
{0x0011, &FRD_U::GetFriendKeyList, "GetFriendKeyList"},
|
||||
{0x0012, nullptr, "GetFriendPresence"},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue