mirror of
https://github.com/PabloMK7/citra.git
synced 2024-11-29 19:00:17 +00:00
Services: Stubbed more services.
Implemented FSUser::CreateExtSaveData
This commit is contained in:
parent
92550013cf
commit
c2e9990149
24 changed files with 693 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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<u8> vec_data = path.AsBinary();
|
||||
const u32* data = reinterpret_cast<const u32*>(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());
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
24
src/core/hle/service/am_sys.cpp
Normal file
24
src/core/hle/service/am_sys.cpp
Normal file
|
@ -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
|
23
src/core/hle/service/am_sys.h
Normal file
23
src/core/hle/service/am_sys.h
Normal file
|
@ -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
|
24
src/core/hle/service/boss_p.cpp
Normal file
24
src/core/hle/service/boss_p.cpp
Normal file
|
@ -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
|
23
src/core/hle/service/boss_p.h
Normal file
23
src/core/hle/service/boss_p.h
Normal file
|
@ -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
|
24
src/core/hle/service/cecd_s.cpp
Normal file
24
src/core/hle/service/cecd_s.cpp
Normal file
|
@ -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
|
23
src/core/hle/service/cecd_s.h
Normal file
23
src/core/hle/service/cecd_s.h
Normal file
|
@ -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
|
24
src/core/hle/service/frd_a.cpp
Normal file
24
src/core/hle/service/frd_a.cpp
Normal file
|
@ -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
|
23
src/core/hle/service/frd_a.h
Normal file
23
src/core/hle/service/frd_a.h
Normal file
|
@ -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
|
|
@ -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<u8> 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;
|
||||
|
|
|
@ -131,6 +131,14 @@ ResultVal<Handle> 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();
|
||||
|
||||
|
|
|
@ -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"},
|
||||
|
|
26
src/core/hle/service/gsp_lcd.cpp
Normal file
26
src/core/hle/service/gsp_lcd.cpp
Normal file
|
@ -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
|
24
src/core/hle/service/gsp_lcd.h
Normal file
24
src/core/hle/service/gsp_lcd.h
Normal file
|
@ -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
|
41
src/core/hle/service/hid_spvr.cpp
Normal file
41
src/core/hle/service/hid_spvr.cpp
Normal file
|
@ -0,0 +1,41 @@
|
|||
// 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/arm/arm_interface.h"
|
||||
#include "core/hle/hle.h"
|
||||
#include "core/hle/service/hid_user.h"
|
||||
#include "core/hle/service/hid_spvr.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Namespace HID_SPVR
|
||||
|
||||
namespace HID_User {
|
||||
extern void GetIPCHandles(Service::Interface* self);
|
||||
}
|
||||
|
||||
namespace HID_SPVR {
|
||||
|
||||
const Interface::FunctionInfo FunctionTable[] = {
|
||||
{0x000A0000, HID_User::GetIPCHandles, "GetIPCHandles"},
|
||||
{0x000B0000, nullptr, "StartAnalogStickCalibration"},
|
||||
{0x000E0000, nullptr, "GetAnalogStickCalibrateParam"},
|
||||
{0x00110000, nullptr, "EnableAccelerometer"},
|
||||
{0x00120000, nullptr, "DisableAccelerometer"},
|
||||
{0x00130000, nullptr, "EnableGyroscopeLow"},
|
||||
{0x00140000, nullptr, "DisableGyroscopeLow"},
|
||||
{0x00150000, nullptr, "GetGyroscopeLowRawToDpsCoefficient"},
|
||||
{0x00160000, nullptr, "GetGyroscopeLowCalibrateParam"},
|
||||
{0x00170000, nullptr, "GetSoundVolume"},
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Interface class
|
||||
|
||||
Interface::Interface() {
|
||||
Register(FunctionTable, ARRAY_SIZE(FunctionTable));
|
||||
}
|
||||
|
||||
} // namespace
|
29
src/core/hle/service/hid_spvr.h
Normal file
29
src/core/hle/service/hid_spvr.h
Normal file
|
@ -0,0 +1,29 @@
|
|||
// 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 HID_SPVR
|
||||
|
||||
// This service is used for interfacing to physical user controls.
|
||||
// Uses include game pad controls, touchscreen, accelerometers, gyroscopes, and debug pad.
|
||||
|
||||
namespace HID_SPVR {
|
||||
|
||||
/**
|
||||
* HID service interface.
|
||||
*/
|
||||
class Interface : public Service::Interface {
|
||||
public:
|
||||
Interface();
|
||||
|
||||
std::string GetPortName() const override {
|
||||
return "hid:SPVR";
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace
|
197
src/core/hle/service/hid_user.cpp
Normal file
197
src/core/hle/service/hid_user.cpp
Normal file
|
@ -0,0 +1,197 @@
|
|||
// Copyright 2014 Citra Emulator Project
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/log.h"
|
||||
|
||||
#include "core/arm/arm_interface.h"
|
||||
#include "core/hle/hle.h"
|
||||
#include "core/hle/kernel/event.h"
|
||||
#include "core/hle/kernel/shared_memory.h"
|
||||
#include "hid_user.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Namespace HID_User
|
||||
|
||||
namespace HID_User {
|
||||
|
||||
// Handle to shared memory region designated to HID_User service
|
||||
static Handle shared_mem = 0;
|
||||
|
||||
// Event handles
|
||||
static Handle event_pad_or_touch_1 = 0;
|
||||
static Handle event_pad_or_touch_2 = 0;
|
||||
static Handle event_accelerometer = 0;
|
||||
static Handle event_gyroscope = 0;
|
||||
static Handle event_debug_pad = 0;
|
||||
|
||||
// Next Pad state update information
|
||||
static PadState next_state = {{0}};
|
||||
static u32 next_index = 0;
|
||||
static s16 next_circle_x = 0;
|
||||
static s16 next_circle_y = 0;
|
||||
|
||||
/**
|
||||
* Gets a pointer to the PadData structure inside HID shared memory
|
||||
*/
|
||||
static inline PadData* GetPadData() {
|
||||
return reinterpret_cast<PadData*>(Kernel::GetSharedMemoryPointer(shared_mem, 0).ValueOr(nullptr));
|
||||
}
|
||||
|
||||
/**
|
||||
* Circle Pad from keys.
|
||||
*
|
||||
* This is implemented as "pushed all the way to an edge (max) or centered (0)".
|
||||
*
|
||||
* Indicate the circle pad is pushed completely to the edge in 1 of 8 directions.
|
||||
*/
|
||||
static void UpdateNextCirclePadState() {
|
||||
static const s16 max_value = 0x9C;
|
||||
next_circle_x = next_state.circle_left ? -max_value : 0x0;
|
||||
next_circle_x += next_state.circle_right ? max_value : 0x0;
|
||||
next_circle_y = next_state.circle_down ? -max_value : 0x0;
|
||||
next_circle_y += next_state.circle_up ? max_value : 0x0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a Pad state (button or button combo) as pressed
|
||||
*/
|
||||
void PadButtonPress(const PadState& pad_state) {
|
||||
next_state.hex |= pad_state.hex;
|
||||
UpdateNextCirclePadState();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a Pad state (button or button combo) as released
|
||||
*/
|
||||
void PadButtonRelease(const PadState& pad_state) {
|
||||
next_state.hex &= ~pad_state.hex;
|
||||
UpdateNextCirclePadState();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called after all Pad changes to be included in this update have been made,
|
||||
* including both Pad key changes and analog circle Pad changes.
|
||||
*/
|
||||
void PadUpdateComplete() {
|
||||
PadData* pad_data = GetPadData();
|
||||
|
||||
if (pad_data == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Update PadData struct
|
||||
pad_data->current_state.hex = next_state.hex;
|
||||
pad_data->index = next_index;
|
||||
next_index = (next_index + 1) % pad_data->entries.size();
|
||||
|
||||
// Get the previous Pad state
|
||||
u32 last_entry_index = (pad_data->index - 1) % pad_data->entries.size();
|
||||
PadState old_state = pad_data->entries[last_entry_index].current_state;
|
||||
|
||||
// Compute bitmask with 1s for bits different from the old state
|
||||
PadState changed;
|
||||
changed.hex = (next_state.hex ^ old_state.hex);
|
||||
|
||||
// Compute what was added
|
||||
PadState additions;
|
||||
additions.hex = changed.hex & next_state.hex;
|
||||
|
||||
// Compute what was removed
|
||||
PadState removals;
|
||||
removals.hex = changed.hex & old_state.hex;
|
||||
|
||||
// Get the current Pad entry
|
||||
PadDataEntry* current_pad_entry = &pad_data->entries[pad_data->index];
|
||||
|
||||
// Update entry properties
|
||||
current_pad_entry->current_state.hex = next_state.hex;
|
||||
current_pad_entry->delta_additions.hex = additions.hex;
|
||||
current_pad_entry->delta_removals.hex = removals.hex;
|
||||
|
||||
// Set circle Pad
|
||||
current_pad_entry->circle_pad_x = next_circle_x;
|
||||
current_pad_entry->circle_pad_y = next_circle_y;
|
||||
|
||||
// If we just updated index 0, provide a new timestamp
|
||||
if (pad_data->index == 0) {
|
||||
pad_data->index_reset_ticks_previous = pad_data->index_reset_ticks;
|
||||
pad_data->index_reset_ticks = (s64)Core::g_app_core->GetTicks();
|
||||
}
|
||||
|
||||
// Signal both handles when there's an update to Pad or touch
|
||||
Kernel::SignalEvent(event_pad_or_touch_1);
|
||||
Kernel::SignalEvent(event_pad_or_touch_2);
|
||||
}
|
||||
|
||||
|
||||
// TODO(peachum):
|
||||
// Add a method for setting analog input from joystick device for the circle Pad.
|
||||
//
|
||||
// This method should:
|
||||
// * Be called after both PadButton<Press, Release>().
|
||||
// * Be called before PadUpdateComplete()
|
||||
// * Set current PadEntry.circle_pad_<axis> using analog data
|
||||
// * Set PadData.raw_circle_pad_data
|
||||
// * Set PadData.current_state.circle_right = 1 if current PadEntry.circle_pad_x >= 41
|
||||
// * Set PadData.current_state.circle_up = 1 if current PadEntry.circle_pad_y >= 41
|
||||
// * Set PadData.current_state.circle_left = 1 if current PadEntry.circle_pad_x <= -41
|
||||
// * Set PadData.current_state.circle_right = 1 if current PadEntry.circle_pad_y <= -41
|
||||
|
||||
|
||||
/**
|
||||
* HID_User::GetIPCHandles service function
|
||||
* Inputs:
|
||||
* None
|
||||
* Outputs:
|
||||
* 1 : Result of function, 0 on success, otherwise error code
|
||||
* 2 : Unused
|
||||
* 3 : Handle to HID_User shared memory
|
||||
* 4 : Event signaled by HID_User
|
||||
* 5 : Event signaled by HID_User
|
||||
* 6 : Event signaled by HID_User
|
||||
* 7 : Gyroscope event
|
||||
* 8 : Event signaled by HID_User
|
||||
*/
|
||||
void GetIPCHandles(Service::Interface* self) {
|
||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||
|
||||
cmd_buff[1] = 0; // No error
|
||||
cmd_buff[3] = shared_mem;
|
||||
cmd_buff[4] = event_pad_or_touch_1;
|
||||
cmd_buff[5] = event_pad_or_touch_2;
|
||||
cmd_buff[6] = event_accelerometer;
|
||||
cmd_buff[7] = event_gyroscope;
|
||||
cmd_buff[8] = event_debug_pad;
|
||||
}
|
||||
|
||||
const Interface::FunctionInfo FunctionTable[] = {
|
||||
{0x000A0000, GetIPCHandles, "GetIPCHandles"},
|
||||
{0x000B0000, nullptr, "StartAnalogStickCalibration"},
|
||||
{0x000E0000, nullptr, "GetAnalogStickCalibrateParam"},
|
||||
{0x00110000, nullptr, "EnableAccelerometer"},
|
||||
{0x00120000, nullptr, "DisableAccelerometer"},
|
||||
{0x00130000, nullptr, "EnableGyroscopeLow"},
|
||||
{0x00140000, nullptr, "DisableGyroscopeLow"},
|
||||
{0x00150000, nullptr, "GetGyroscopeLowRawToDpsCoefficient"},
|
||||
{0x00160000, nullptr, "GetGyroscopeLowCalibrateParam"},
|
||||
{0x00170000, nullptr, "GetSoundVolume"},
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Interface class
|
||||
|
||||
Interface::Interface() {
|
||||
shared_mem = Kernel::CreateSharedMemory("HID_User:SharedMem"); // Create shared memory object
|
||||
|
||||
// Create event handles
|
||||
event_pad_or_touch_1 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventPadOrTouch1");
|
||||
event_pad_or_touch_2 = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventPadOrTouch2");
|
||||
event_accelerometer = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventAccelerometer");
|
||||
event_gyroscope = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventGyroscope");
|
||||
event_debug_pad = Kernel::CreateEvent(RESETTYPE_ONESHOT, "HID_User:EventDebugPad");
|
||||
|
||||
Register(FunctionTable, ARRAY_SIZE(FunctionTable));
|
||||
}
|
||||
|
||||
} // namespace
|
25
src/core/hle/service/news_s.cpp
Normal file
25
src/core/hle/service/news_s.cpp
Normal file
|
@ -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
|
23
src/core/hle/service/news_s.h
Normal file
23
src/core/hle/service/news_s.h
Normal file
|
@ -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
|
27
src/core/hle/service/ns_s.cpp
Normal file
27
src/core/hle/service/ns_s.cpp
Normal file
|
@ -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
|
24
src/core/hle/service/ns_s.h
Normal file
24
src/core/hle/service/ns_s.h
Normal file
|
@ -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
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue