6 files changed, 0 insertions, 435 deletions

diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp
deleted file mode 100644
index 7ad7798da..000000000
--- a/src/core/hle/service/frd/frd.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "common/assert.h"
-#include "common/logging/log.h"
-#include "common/string_util.h"
-#include "core/hle/ipc.h"
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/result.h"
-#include "core/hle/service/frd/frd.h"
-#include "core/hle/service/frd/frd_a.h"
-#include "core/hle/service/frd/frd_u.h"
-#include "core/hle/service/service.h"
-#include "core/memory.h"
-
-namespace Service {
-namespace FRD {
-
-static FriendKey my_friend_key = {0, 0, 0ull};
-static MyPresence my_presence = {};
-
-void GetMyPresence(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 shifted_out_size = cmd_buff[64];
-    u32 my_presence_addr = cmd_buff[65];
-
-    ASSERT(shifted_out_size == ((sizeof(MyPresence) << 14) | 2));
-
-    Memory::WriteBlock(my_presence_addr, &my_presence, sizeof(MyPresence));
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-
-    LOG_WARNING(Service_FRD, "(STUBBED) called");
-}
-
-void GetFriendKeyList(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 unknown = cmd_buff[1];
-    u32 frd_count = cmd_buff[2];
-    u32 frd_key_addr = cmd_buff[65];
-
-    FriendKey zero_key = {};
-    for (u32 i = 0; i < frd_count; ++i) {
-        Memory::WriteBlock(frd_key_addr + i * sizeof(FriendKey), &zero_key, sizeof(FriendKey));
-    }
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-    cmd_buff[2] = 0;                  // 0 friends
-    LOG_WARNING(Service_FRD, "(STUBBED) called, unknown=%d, frd_count=%d, frd_key_addr=0x%08X",
-                unknown, frd_count, frd_key_addr);
-}
-
-void GetFriendProfile(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 count = cmd_buff[1];
-    u32 frd_key_addr = cmd_buff[3];
-    u32 profiles_addr = cmd_buff[65];
-
-    Profile zero_profile = {};
-    for (u32 i = 0; i < count; ++i) {
-        Memory::WriteBlock(profiles_addr + i * sizeof(Profile), &zero_profile, sizeof(Profile));
-    }
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-    LOG_WARNING(Service_FRD,
-                "(STUBBED) called, count=%d, frd_key_addr=0x%08X, profiles_addr=0x%08X", count,
-                frd_key_addr, profiles_addr);
-}
-
-void GetFriendAttributeFlags(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 count = cmd_buff[1];
-    u32 frd_key_addr = cmd_buff[3];
-    u32 attr_flags_addr = cmd_buff[65];
-
-    for (u32 i = 0; i < count; ++i) {
-        // TODO:(mailwl) figure out AttributeFlag size and zero all buffer. Assume 1 byte
-        Memory::Write8(attr_flags_addr + i, 0);
-    }
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-    LOG_WARNING(Service_FRD,
-                "(STUBBED) called, count=%d, frd_key_addr=0x%08X, attr_flags_addr=0x%08X", count,
-                frd_key_addr, attr_flags_addr);
-}
-
-void GetMyFriendKey(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-    std::memcpy(&cmd_buff[2], &my_friend_key, sizeof(FriendKey));
-    LOG_WARNING(Service_FRD, "(STUBBED) called");
-}
-
-void GetMyScreenName(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-    // TODO: (mailwl) get the name from config
-    Common::UTF8ToUTF16("Citra").copy(reinterpret_cast<char16_t*>(&cmd_buff[2]), 11);
-    LOG_WARNING(Service_FRD, "(STUBBED) called");
-}
-
-void UnscrambleLocalFriendCode(Service::Interface* self) {
-    const size_t scrambled_friend_code_size = 12;
-    const size_t friend_code_size = 8;
-
-    IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1C, 1, 2);
-    const u32 friend_code_count = rp.Pop<u32>();
-    size_t in_buffer_size;
-    const VAddr scrambled_friend_codes = rp.PopStaticBuffer(&in_buffer_size, false);
-    ASSERT_MSG(in_buffer_size == (friend_code_count * scrambled_friend_code_size),
-               "Wrong input buffer size");
-
-    size_t out_buffer_size;
-    VAddr unscrambled_friend_codes = rp.PeekStaticBuffer(0, &out_buffer_size);
-    ASSERT_MSG(out_buffer_size == (friend_code_count * friend_code_size),
-               "Wrong output buffer size");
-
-    for (u32 current = 0; current < friend_code_count; ++current) {
-        // TODO(B3N30): Unscramble the codes and compare them against the friend list
-        //              Only write 0 if the code isn't in friend list, otherwise write the
-        //              unscrambled one
-        //
-        // Code for unscrambling (should be compared to HW):
-        // std::array<u16, 6> scambled_friend_code;
-        // Memory::ReadBlock(scrambled_friend_codes+(current*scrambled_friend_code_size),
-        // scambled_friend_code.data(), scrambled_friend_code_size); std::array<u16, 4>
-        // unscrambled_friend_code; unscrambled_friend_code[0] = scambled_friend_code[0] ^
-        // scambled_friend_code[5]; unscrambled_friend_code[1] = scambled_friend_code[1] ^
-        // scambled_friend_code[5]; unscrambled_friend_code[2] = scambled_friend_code[2] ^
-        // scambled_friend_code[5]; unscrambled_friend_code[3] = scambled_friend_code[3] ^
-        // scambled_friend_code[5];
-
-        u64 result = 0ull;
-        Memory::WriteBlock(unscrambled_friend_codes + (current * sizeof(result)), &result,
-                           sizeof(result));
-    }
-
-    LOG_WARNING(Service_FRD, "(STUBBED) called");
-    IPC::RequestBuilder rb = rp.MakeBuilder(1, 2);
-    rb.Push(RESULT_SUCCESS);
-    rb.PushStaticBuffer(unscrambled_friend_codes, out_buffer_size, 0);
-}
-
-void SetClientSdkVersion(Service::Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    const u32 version = cmd_buff[1];
-
-    self->SetVersion(version);
-
-    LOG_WARNING(Service_FRD, "(STUBBED) called, version: 0x%08X", version);
-
-    cmd_buff[1] = RESULT_SUCCESS.raw; // No error
-}
-
-void Init() {
-    using namespace Kernel;
-
-    AddService(new FRD_A_Interface);
-    AddService(new FRD_U_Interface);
-}
-
-void Shutdown() {}
-
-} // namespace FRD
-
-} // namespace Service
diff --git a/src/core/hle/service/frd/frd.h b/src/core/hle/service/frd/frd.h
deleted file mode 100644
index 66a87c8cd..000000000
--- a/src/core/hle/service/frd/frd.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Service {
-
-class Interface;
-
-namespace FRD {
-
-struct FriendKey {
-    u32 friend_id;
-    u32 unknown;
-    u64 friend_code;
-};
-
-struct MyPresence {
-    u8 unknown[0x12C];
-};
-
-struct Profile {
-    u8 region;
-    u8 country;
-    u8 area;
-    u8 language;
-    u32 unknown;
-};
-
-/**
- * FRD::GetMyPresence service function
- *  Inputs:
- *      64 : sizeof (MyPresence) << 14 | 2
- *      65 : Address of MyPresence structure
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-void GetMyPresence(Service::Interface* self);
-
-/**
- * FRD::GetFriendKeyList service function
- *  Inputs:
- *      1 : Unknown
- *      2 : Max friends count
- *      65 : Address of FriendKey List
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : FriendKey count filled
- */
-void GetFriendKeyList(Service::Interface* self);
-
-/**
- * FRD::GetFriendProfile service function
- *  Inputs:
- *      1 : Friends count
- *      2 : Friends count << 18 | 2
- *      3 : Address of FriendKey List
- *      64 : (count * sizeof (Profile)) << 10 | 2
- *      65 : Address of Profiles List
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-void GetFriendProfile(Service::Interface* self);
-
-/**
- * FRD::GetFriendAttributeFlags service function
- *  Inputs:
- *      1 : Friends count
- *      2 : Friends count << 18 | 2
- *      3 : Address of FriendKey List
- *      65 : Address of AttributeFlags
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-void GetFriendAttributeFlags(Service::Interface* self);
-
-/**
- * FRD::GetMyFriendKey service function
- *  Inputs:
- *      none
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2-5 : FriendKey
- */
-void GetMyFriendKey(Service::Interface* self);
-
-/**
- * FRD::GetMyScreenName service function
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : UTF16 encoded name (max 11 symbols)
- */
-void GetMyScreenName(Service::Interface* self);
-
-/**
- * FRD::UnscrambleLocalFriendCode service function
- *  Inputs:
- *      1 : Friend code count
- *      2 : ((count * 12) << 14) | 0x402
- *      3 : Pointer to encoded friend codes. Each is 12 bytes large
- *      64 : ((count * 8) << 14) | 2
- *      65 : Pointer to write decoded local friend codes to. Each is 8 bytes large.
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-void UnscrambleLocalFriendCode(Service::Interface* self);
-
-/**
- * FRD::SetClientSdkVersion service function
- *  Inputs:
- *      1 : Used SDK Version
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-void SetClientSdkVersion(Service::Interface* self);
-
-/// Initialize FRD service(s)
-void Init();
-
-/// Shutdown FRD service(s)
-void Shutdown();
-
-} // namespace FRD
-} // namespace Service
diff --git a/src/core/hle/service/frd/frd_a.cpp b/src/core/hle/service/frd/frd_a.cpp
deleted file mode 100644
index cfc37210b..000000000
--- a/src/core/hle/service/frd/frd_a.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/frd/frd_a.h"
-
-namespace Service {
-namespace FRD {
-
-// Empty arrays are illegal -- commented out until an entry is added.
-// const Interface::FunctionInfo FunctionTable[] = { };
-
-FRD_A_Interface::FRD_A_Interface() {
-    // Register(FunctionTable);
-}
-
-} // namespace FRD
-} // namespace Service
diff --git a/src/core/hle/service/frd/frd_a.h b/src/core/hle/service/frd/frd_a.h
deleted file mode 100644
index 006d1cadd..000000000
--- a/src/core/hle/service/frd/frd_a.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace FRD {
-
-class FRD_A_Interface : public Service::Interface {
-public:
-    FRD_A_Interface();
-
-    std::string GetPortName() const override {
-        return "frd:a";
-    }
-};
-
-} // namespace FRD
-} // namespace Service
diff --git a/src/core/hle/service/frd/frd_u.cpp b/src/core/hle/service/frd/frd_u.cpp
deleted file mode 100644
index 6970ff768..000000000
--- a/src/core/hle/service/frd/frd_u.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/frd/frd.h"
-#include "core/hle/service/frd/frd_u.h"
-
-namespace Service {
-namespace FRD {
-
-const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010000, nullptr, "HasLoggedIn"},
-    {0x00020000, nullptr, "IsOnline"},
-    {0x00030000, nullptr, "Login"},
-    {0x00040000, nullptr, "Logout"},
-    {0x00050000, GetMyFriendKey, "GetMyFriendKey"},
-    {0x00060000, nullptr, "GetMyPreference"},
-    {0x00070000, nullptr, "GetMyProfile"},
-    {0x00080000, GetMyPresence, "GetMyPresence"},
-    {0x00090000, GetMyScreenName, "GetMyScreenName"},
-    {0x000A0000, nullptr, "GetMyMii"},
-    {0x000B0000, nullptr, "GetMyLocalAccountId"},
-    {0x000C0000, nullptr, "GetMyPlayingGame"},
-    {0x000D0000, nullptr, "GetMyFavoriteGame"},
-    {0x000E0000, nullptr, "GetMyNcPrincipalId"},
-    {0x000F0000, nullptr, "GetMyComment"},
-    {0x00100040, nullptr, "GetMyPassword"},
-    {0x00110080, GetFriendKeyList, "GetFriendKeyList"},
-    {0x00120042, nullptr, "GetFriendPresence"},
-    {0x00130142, nullptr, "GetFriendScreenName"},
-    {0x00140044, nullptr, "GetFriendMii"},
-    {0x00150042, GetFriendProfile, "GetFriendProfile"},
-    {0x00160042, nullptr, "GetFriendRelationship"},
-    {0x00170042, GetFriendAttributeFlags, "GetFriendAttributeFlags"},
-    {0x00180044, nullptr, "GetFriendPlayingGame"},
-    {0x00190042, nullptr, "GetFriendFavoriteGame"},
-    {0x001A00C4, nullptr, "GetFriendInfo"},
-    {0x001B0080, nullptr, "IsIncludedInFriendList"},
-    {0x001C0042, UnscrambleLocalFriendCode, "UnscrambleLocalFriendCode"},
-    {0x001D0002, nullptr, "UpdateGameModeDescription"},
-    {0x001E02C2, nullptr, "UpdateGameMode"},
-    {0x001F0042, nullptr, "SendInvitation"},
-    {0x00200002, nullptr, "AttachToEventNotification"},
-    {0x00210040, nullptr, "SetNotificationMask"},
-    {0x00220040, nullptr, "GetEventNotification"},
-    {0x00230000, nullptr, "GetLastResponseResult"},
-    {0x00240040, nullptr, "PrincipalIdToFriendCode"},
-    {0x00250080, nullptr, "FriendCodeToPrincipalId"},
-    {0x00260080, nullptr, "IsValidFriendCode"},
-    {0x00270040, nullptr, "ResultToErrorCode"},
-    {0x00280244, nullptr, "RequestGameAuthentication"},
-    {0x00290000, nullptr, "GetGameAuthenticationData"},
-    {0x002A0204, nullptr, "RequestServiceLocator"},
-    {0x002B0000, nullptr, "GetServiceLocatorData"},
-    {0x002C0002, nullptr, "DetectNatProperties"},
-    {0x002D0000, nullptr, "GetNatProperties"},
-    {0x002E0000, nullptr, "GetServerTimeInterval"},
-    {0x002F0040, nullptr, "AllowHalfAwake"},
-    {0x00300000, nullptr, "GetServerTypes"},
-    {0x00310082, nullptr, "GetFriendComment"},
-    {0x00320042, SetClientSdkVersion, "SetClientSdkVersion"},
-    {0x00330000, nullptr, "GetMyApproachContext"},
-    {0x00340046, nullptr, "AddFriendWithApproach"},
-    {0x00350082, nullptr, "DecryptApproachContext"},
-};
-
-FRD_U_Interface::FRD_U_Interface() {
-    Register(FunctionTable);
-}
-
-} // namespace FRD
-} // namespace Service
diff --git a/src/core/hle/service/frd/frd_u.h b/src/core/hle/service/frd/frd_u.h
deleted file mode 100644
index 07e43f155..000000000
--- a/src/core/hle/service/frd/frd_u.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace FRD {
-
-class FRD_U_Interface : public Service::Interface {
-public:
-    FRD_U_Interface();
-
-    std::string GetPortName() const override {
-        return "frd:u";
-    }
-};
-
-} // namespace FRD
-} // namespace Service