diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 5578fa680..3e1578969 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -37,11 +37,14 @@ set(SRCS hle/service/act_u.cpp hle/service/am_app.cpp hle/service/am_net.cpp + hle/service/am_sys.cpp hle/service/apt_a.cpp hle/service/apt_s.cpp hle/service/apt_u.cpp + hle/service/boss_p.cpp hle/service/boss_u.cpp hle/service/cam_u.cpp + hle/service/cecd_s.cpp hle/service/cecd_u.cpp hle/service/cfg/cfg.cpp hle/service/cfg/cfg_i.cpp @@ -50,6 +53,7 @@ set(SRCS hle/service/csnd_snd.cpp hle/service/dsp_dsp.cpp hle/service/err_f.cpp + hle/service/frd_a.cpp hle/service/frd_u.cpp hle/service/fs/archive.cpp hle/service/fs/fs_user.cpp @@ -57,14 +61,17 @@ set(SRCS hle/service/hid/hid.cpp hle/service/hid/hid_user.cpp hle/service/hid/hid_spvr.cpp + hle/service/gsp_lcd.cpp hle/service/http_c.cpp hle/service/ir_rst.cpp hle/service/ir_u.cpp hle/service/ldr_ro.cpp hle/service/mic_u.cpp hle/service/ndm_u.cpp + hle/service/news_s.cpp hle/service/news_u.cpp hle/service/nim_aoc.cpp + hle/service/ns_s.cpp hle/service/nwm_uds.cpp hle/service/pm_app.cpp hle/service/ptm_play.cpp @@ -138,11 +145,14 @@ set(HEADERS hle/service/act_u.h hle/service/am_app.h hle/service/am_net.h + hle/service/am_sys.h hle/service/apt_a.h hle/service/apt_s.h hle/service/apt_u.h + hle/service/boss_p.h hle/service/boss_u.h hle/service/cam_u.h + hle/service/cecd_s.h hle/service/cecd_u.h hle/service/cfg/cfg.h hle/service/cfg/cfg_i.h @@ -151,6 +161,7 @@ set(HEADERS hle/service/csnd_snd.h hle/service/dsp_dsp.h hle/service/err_f.h + hle/service/frd_a.h hle/service/frd_u.h hle/service/fs/archive.h hle/service/fs/fs_user.h @@ -158,14 +169,17 @@ set(HEADERS hle/service/hid/hid.h hle/service/hid/hid_spvr.h hle/service/hid/hid_user.h + hle/service/gsp_lcd.h hle/service/http_c.h hle/service/ir_rst.h hle/service/ir_u.h hle/service/ldr_ro.h hle/service/mic_u.h hle/service/ndm_u.h + hle/service/news_s.h hle/service/news_u.h hle/service/nim_aoc.h + hle/service/ns_s.h hle/service/nwm_uds.h hle/service/pm_app.h hle/service/ptm_play.h diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 0805f42ae..33e4e76f8 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -17,7 +17,7 @@ namespace FileSys { -static std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) { +std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) { std::vector vec_data = path.AsBinary(); const u32* data = reinterpret_cast(vec_data.data()); u32 save_low = data[1]; @@ -25,7 +25,7 @@ static std::string GetExtSaveDataPath(const std::string& mount_point, const Path return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_high, save_low); } -static std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { +std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { if (shared) return Common::StringFromFormat("%sdata/%s/extdata/", mount_point.c_str(), SYSTEM_ID.c_str()); diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h index fb7f209d2..802a11b5f 100644 --- a/src/core/file_sys/archive_extsavedata.h +++ b/src/core/file_sys/archive_extsavedata.h @@ -42,4 +42,21 @@ protected: std::string concrete_mount_point; }; +/** + * Constructs a path to the concrete ExtData archive in the host filesystem based on the + * input Path and base mount point. + * @param mount_point The base mount point of the ExtSaveData archives. + * @param path The path that identifies the requested concrete ExtSaveData archive. + * @returns The complete path to the specified extdata archive in the host filesystem + */ +std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path); + +/** + * Constructs a path to the base folder to hold concrete ExtSaveData archives in the host file system. + * @param mount_point The base folder where this folder resides, ie. SDMC or NAND. + * @param shared Whether this ExtSaveData container is for SharedExtSaveDatas or not. + * @returns The path to the base ExtSaveData archives' folder in the host file system + */ +std::string GetExtDataContainerPath(const std::string& mount_point, bool shared); + } // namespace FileSys diff --git a/src/core/hle/service/am_sys.cpp b/src/core/hle/service/am_sys.cpp new file mode 100644 index 000000000..b63c8c087 --- /dev/null +++ b/src/core/hle/service/am_sys.cpp @@ -0,0 +1,24 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/log.h" +#include "core/hle/hle.h" +#include "core/hle/service/am_sys.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace AM_SYS + +namespace AM_SYS { + +// Empty arrays are illegal -- commented out until an entry is added. +//const Interface::FunctionInfo FunctionTable[] = { }; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/am_sys.h b/src/core/hle/service/am_sys.h new file mode 100644 index 000000000..bb6178a43 --- /dev/null +++ b/src/core/hle/service/am_sys.h @@ -0,0 +1,23 @@ +// 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 AM_SYS + +namespace AM_SYS { + +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "am:sys"; + } +}; + +} // namespace diff --git a/src/core/hle/service/boss_p.cpp b/src/core/hle/service/boss_p.cpp new file mode 100644 index 000000000..f245a38e9 --- /dev/null +++ b/src/core/hle/service/boss_p.cpp @@ -0,0 +1,24 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/log.h" +#include "core/hle/hle.h" +#include "core/hle/service/boss_p.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace BOSS_P + +namespace BOSS_P { + +// Empty arrays are illegal -- commented out until an entry is added. +// const Interface::FunctionInfo FunctionTable[] = { }; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/boss_p.h b/src/core/hle/service/boss_p.h new file mode 100644 index 000000000..71f1e7464 --- /dev/null +++ b/src/core/hle/service/boss_p.h @@ -0,0 +1,23 @@ +// 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 BOSS_P + +namespace BOSS_P { + +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "boss:P"; + } +}; + +} // namespace diff --git a/src/core/hle/service/cecd_s.cpp b/src/core/hle/service/cecd_s.cpp new file mode 100644 index 000000000..9c4992f13 --- /dev/null +++ b/src/core/hle/service/cecd_s.cpp @@ -0,0 +1,24 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/log.h" +#include "core/hle/hle.h" +#include "core/hle/service/cecd_s.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace CECD_S + +namespace CECD_S { + +// Empty arrays are illegal -- commented out until an entry is added. +//const Interface::FunctionInfo FunctionTable[] = { }; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/cecd_s.h b/src/core/hle/service/cecd_s.h new file mode 100644 index 000000000..d880d0391 --- /dev/null +++ b/src/core/hle/service/cecd_s.h @@ -0,0 +1,23 @@ +// 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 CECD_S + +namespace CECD_S { + +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "cecd:s"; + } +}; + +} // namespace diff --git a/src/core/hle/service/frd_a.cpp b/src/core/hle/service/frd_a.cpp new file mode 100644 index 000000000..53edc2cd8 --- /dev/null +++ b/src/core/hle/service/frd_a.cpp @@ -0,0 +1,24 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/log.h" +#include "core/hle/hle.h" +#include "core/hle/service/frd_a.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace FRD_A + +namespace FRD_A { + +// Empty arrays are illegal -- commented out until an entry is added. +// const Interface::FunctionInfo FunctionTable[] = { }; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/frd_a.h b/src/core/hle/service/frd_a.h new file mode 100644 index 000000000..f068c6108 --- /dev/null +++ b/src/core/hle/service/frd_a.h @@ -0,0 +1,23 @@ +// 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 FRD_A + +namespace FRD_A { + +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "frd:a"; + } +}; + +} // namespace diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 958dd9344..1bb4e4b23 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -432,6 +432,28 @@ ResultCode FormatSaveData() { return archive_itr->second->backend->Format(FileSys::Path()); } +ResultCode CreateExtSaveData(u32 high, u32 low) { + // Construct the binary path to the archive first + std::vector binary_path; + binary_path.reserve(12); + // The first word is all zero to specify a NAND archive + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back(0); + // Next is the low word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((low >> (8 * i)) & 0xFF); + // Next is the high word + for (unsigned i = 0; i < 4; ++i) + binary_path.push_back((high >> i) & 0xFF); + FileSys::Path path(binary_path); + std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX); + std::string base_path = FileSys::GetExtDataContainerPath(nand_directory, true); + std::string extsavedata_path = FileSys::GetExtSaveDataPath(base_path, path); + if (!FileUtil::CreateFullPath(extsavedata_path)) + return ResultCode(-1); // TODO(Subv): Find the right error code + return RESULT_SUCCESS; +} + /// Initialize archives void ArchiveInit() { next_handle = 1; diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 2cdfaa7e9..ba674d7f6 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -131,6 +131,14 @@ ResultVal OpenDirectoryFromArchive(ArchiveHandle archive_handle, const F */ ResultCode FormatSaveData(); +/** + * Creates a blank SharedExtSaveData archive for the specified extdata ID + * @param high The high word of the extdata id to create + * @param low The low word of the extdata id to create + * @return ResultCode 0 on success or the corresponding code on error + */ +ResultCode CreateExtSaveData(u32 high, u32 low); + /// Initialize archives void ArchiveInit(); diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index 56f3117f4..c495b6f3c 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -484,6 +484,15 @@ static void FormatThisUserSaveData(Service::Interface* self) { cmd_buff[1] = FormatSaveData().raw; } +static void CreateExtSaveData(Service::Interface* self) { + // TODO(Subv): Figure out the other parameters. + u32* cmd_buff = Kernel::GetCommandBuffer(); + u32 save_high = cmd_buff[1]; + u32 save_low = cmd_buff[2]; + // TODO(Subv): For now it is assumed that only SharedExtSaveData can be created like this + cmd_buff[1] = CreateExtSaveData(save_high, save_low).raw; +} + const FSUserInterface::FunctionInfo FunctionTable[] = { {0x000100C6, nullptr, "Dummy1"}, {0x040100C4, nullptr, "Control"}, @@ -567,6 +576,8 @@ const FSUserInterface::FunctionInfo FunctionTable[] = { {0x084E0342, nullptr, "UpdateSha256Context"}, {0x084F0102, nullptr, "ReadSpecialFile"}, {0x08500040, nullptr, "GetSpecialFileSize"}, + {0x08510242, CreateExtSaveData, "CreateExtSaveData"}, + {0x08520100, nullptr, "DeleteExtSaveData"}, {0x08580000, nullptr, "GetMovableSedHashedKeyYRandomData"}, {0x08610042, nullptr, "InitializeWithSdkVersion"}, {0x08620040, nullptr, "SetPriority"}, diff --git a/src/core/hle/service/gsp_lcd.cpp b/src/core/hle/service/gsp_lcd.cpp new file mode 100644 index 000000000..6213472ff --- /dev/null +++ b/src/core/hle/service/gsp_lcd.cpp @@ -0,0 +1,26 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + + +#include "common/log.h" +#include "common/bit_field.h" + +#include "core/hle/service/gsp_lcd.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace GSP_LCD + +namespace GSP_LCD { + +/*const Interface::FunctionInfo FunctionTable[] = { +};*/ + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/gsp_lcd.h b/src/core/hle/service/gsp_lcd.h new file mode 100644 index 000000000..56b3cfe86 --- /dev/null +++ b/src/core/hle/service/gsp_lcd.h @@ -0,0 +1,24 @@ +// 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 GSP_LCD + +namespace GSP_LCD { + +/// Interface to "gsp::Lcd" service +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "gsp::Lcd"; + } +}; + +} // namespace diff --git a/src/core/hle/service/news_s.cpp b/src/core/hle/service/news_s.cpp new file mode 100644 index 000000000..1850f59bd --- /dev/null +++ b/src/core/hle/service/news_s.cpp @@ -0,0 +1,25 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "common/log.h" +#include "core/hle/hle.h" +#include "core/hle/service/news_s.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace NEWS_S + +namespace NEWS_S { + +const Interface::FunctionInfo FunctionTable[] = { + {0x000100C6, nullptr, "AddNotification"}, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/news_s.h b/src/core/hle/service/news_s.h new file mode 100644 index 000000000..f8b4636d5 --- /dev/null +++ b/src/core/hle/service/news_s.h @@ -0,0 +1,23 @@ +// 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 NEWS_S + +namespace NEWS_S { + +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "news:s"; + } +}; + +} // namespace diff --git a/src/core/hle/service/ns_s.cpp b/src/core/hle/service/ns_s.cpp new file mode 100644 index 000000000..b9aca4257 --- /dev/null +++ b/src/core/hle/service/ns_s.cpp @@ -0,0 +1,27 @@ +// Copyright 2015 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + + +#include "common/common.h" + +#include "core/hle/hle.h" +#include "core/hle/service/ns_s.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace NS_S + +namespace NS_S { + +const Interface::FunctionInfo FunctionTable[] = { + {0x000200C0, nullptr, "LaunchTitle"}, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +} // namespace diff --git a/src/core/hle/service/ns_s.h b/src/core/hle/service/ns_s.h new file mode 100644 index 000000000..8d8e849b8 --- /dev/null +++ b/src/core/hle/service/ns_s.h @@ -0,0 +1,24 @@ +// 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 NS_S + +namespace NS_S { + +/// Interface to "NS:S" service +class Interface : public Service::Interface { +public: + Interface(); + + std::string GetPortName() const override { + return "ns:s"; + } +}; + +} // namespace diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 444a4eab1..355196fd3 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -10,12 +10,15 @@ #include "core/hle/service/act_u.h" #include "core/hle/service/am_app.h" #include "core/hle/service/am_net.h" +#include "core/hle/service/am_sys.h" #include "core/hle/service/apt_a.h" #include "core/hle/service/apt_s.h" #include "core/hle/service/apt_u.h" +#include "core/hle/service/boss_p.h" #include "core/hle/service/boss_u.h" #include "core/hle/service/cam_u.h" #include "core/hle/service/cecd_u.h" +#include "core/hle/service/cecd_s.h" #include "core/hle/service/cfg/cfg_i.h" #include "core/hle/service/cfg/cfg_s.h" #include "core/hle/service/cfg/cfg_u.h" @@ -23,18 +26,22 @@ #include "core/hle/service/dsp_dsp.h" #include "core/hle/service/err_f.h" #include "core/hle/service/fs/fs_user.h" +#include "core/hle/service/frd_a.h" #include "core/hle/service/frd_u.h" #include "core/hle/service/gsp_gpu.h" #include "core/hle/service/hid/hid_spvr.h" #include "core/hle/service/hid/hid_user.h" +#include "core/hle/service/gsp_lcd.h" #include "core/hle/service/http_c.h" #include "core/hle/service/ir_rst.h" #include "core/hle/service/ir_u.h" #include "core/hle/service/ldr_ro.h" #include "core/hle/service/mic_u.h" #include "core/hle/service/ndm_u.h" +#include "core/hle/service/news_s.h" #include "core/hle/service/news_u.h" #include "core/hle/service/nim_aoc.h" +#include "core/hle/service/ns_s.h" #include "core/hle/service/nwm_uds.h" #include "core/hle/service/pm_app.h" #include "core/hle/service/ptm_play.h" @@ -90,11 +97,14 @@ void Init() { g_manager->AddService(new ACT_U::Interface); g_manager->AddService(new AM_APP::Interface); g_manager->AddService(new AM_NET::Interface); + g_manager->AddService(new AM_SYS::Interface); g_manager->AddService(new APT_A::Interface); g_manager->AddService(new APT_S::Interface); g_manager->AddService(new APT_U::Interface); + g_manager->AddService(new BOSS_P::Interface); g_manager->AddService(new BOSS_U::Interface); g_manager->AddService(new CAM_U::Interface); + g_manager->AddService(new CECD_S::Interface); g_manager->AddService(new CECD_U::Interface); g_manager->AddService(new CFG_I::Interface); g_manager->AddService(new CFG_S::Interface); @@ -102,19 +112,23 @@ void Init() { g_manager->AddService(new CSND_SND::Interface); g_manager->AddService(new DSP_DSP::Interface); g_manager->AddService(new ERR_F::Interface); + g_manager->AddService(new FRD_A::Interface); g_manager->AddService(new FRD_U::Interface); g_manager->AddService(new FS::FSUserInterface); g_manager->AddService(new GSP_GPU::Interface); - g_manager->AddService(new HID_SPVR::Interface); + g_manager->AddService(new GSP_LCD::Interface); g_manager->AddService(new HID_User::Interface); + g_manager->AddService(new HID_SPVR::Interface); g_manager->AddService(new HTTP_C::Interface); g_manager->AddService(new IR_RST::Interface); g_manager->AddService(new IR_U::Interface); g_manager->AddService(new LDR_RO::Interface); g_manager->AddService(new MIC_U::Interface); g_manager->AddService(new NDM_U::Interface); + g_manager->AddService(new NEWS_S::Interface); g_manager->AddService(new NEWS_U::Interface); g_manager->AddService(new NIM_AOC::Interface); + g_manager->AddService(new NS_S::Interface); g_manager->AddService(new NWM_UDS::Interface); g_manager->AddService(new PM_APP::Interface); g_manager->AddService(new PTM_PLAY::Interface);