OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 15:20:15 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Anon 2016-07-30 10:21:23 -05:00
parent e4237e0378
commit 9535169577
1 changed files with 224 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

449
src/core/hle/service/hid/hid.cpp
View File

@ -21,297 +21,296 @@
#include "video_core/video_core.h" #include "video_core/video_core.h"
namespace Service { namespace Service {
namespace HID { namespace HID {
// Handle to shared memory region designated to HID_User service // Handle to shared memory region designated to HID_User service
static Kernel::SharedPtr<Kernel::SharedMemory> shared_mem; static Kernel::SharedPtr<Kernel::SharedMemory> shared_mem;
// Event handles // Event handles
static Kernel::SharedPtr<Kernel::Event> event_pad_or_touch_1; static Kernel::SharedPtr<Kernel::Event> event_pad_or_touch_1;
static Kernel::SharedPtr<Kernel::Event> event_pad_or_touch_2; static Kernel::SharedPtr<Kernel::Event> event_pad_or_touch_2;
static Kernel::SharedPtr<Kernel::Event> event_accelerometer; static Kernel::SharedPtr<Kernel::Event> event_accelerometer;
static Kernel::SharedPtr<Kernel::Event> event_gyroscope; static Kernel::SharedPtr<Kernel::Event> event_gyroscope;
static Kernel::SharedPtr<Kernel::Event> event_debug_pad; static Kernel::SharedPtr<Kernel::Event> event_debug_pad;
static u32 next_pad_index; static u32 next_pad_index;
static u32 next_touch_index; static u32 next_touch_index;
static u32 next_accelerometer_index; static u32 next_accelerometer_index;
static u32 next_gyroscope_index; static u32 next_gyroscope_index;
static int enable_accelerometer_count = 0; // positive means enabled static int enable_accelerometer_count = 0; // positive means enabled
static int enable_gyroscope_count = 0; // positive means enabled static int enable_gyroscope_count = 0; // positive means enabled
static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) { static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30; // 30 degree and 60 degree are angular thresholds for directions constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30; // 30 degree and 60 degree are angular thresholds for directions
constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40; // a circle pad radius greater than 40 will trigger circle pad direction constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40; // a circle pad radius greater than 40 will trigger circle pad direction
PadState state; PadState state;
state.hex = 0; state.hex = 0;
if (circle_pad_x * circle_pad_x + circle_pad_y * circle_pad_y > CIRCLE_PAD_THRESHOLD_SQUARE) { if (circle_pad_x * circle_pad_x + circle_pad_y * circle_pad_y > CIRCLE_PAD_THRESHOLD_SQUARE) {
float t = std::abs(static_cast<float>(circle_pad_y) / circle_pad_x); float t = std::abs(static_cast<float>(circle_pad_y) / circle_pad_x);
if (circle_pad_x != 0 && t < TAN60) { if (circle_pad_x != 0 && t < TAN60) {
if (circle_pad_x > 0) if (circle_pad_x > 0)
state.circle_right.Assign(1); state.circle_right.Assign(1);
else else
state.circle_left.Assign(1); state.circle_left.Assign(1);
}
if (circle_pad_x == 0 || t > TAN30) {
if (circle_pad_y > 0)
state.circle_up.Assign(1);
else
state.circle_down.Assign(1);
}
}
return state;
} }
void Update() { if (circle_pad_x == 0 || t > TAN30) {
SharedMem* mem = reinterpret_cast<SharedMem*>(shared_mem->GetPointer()); if (circle_pad_y > 0)
state.circle_up.Assign(1);
else
state.circle_down.Assign(1);
}
}
if (mem == nullptr) { return state;
LOG_DEBUG(Service_HID, "Cannot update HID prior to mapping shared memory!"); }
return;
}
PadState state = InputCore::pad_state; void Update() {
SharedMem* mem = reinterpret_cast<SharedMem*>(shared_mem->GetPointer());
// Get current circle pad position and update circle pad direction if (mem == nullptr) {
s16 circle_pad_x, circle_pad_y; LOG_DEBUG(Service_HID, "Cannot update HID prior to mapping shared memory!");
std::tie(circle_pad_x, circle_pad_y) = InputCore::circle_pad; return;
state.hex |= GetCirclePadDirectionState(circle_pad_x, circle_pad_y).hex; }
mem->pad.current_state.hex = state.hex; PadState state = InputCore::pad_state;
mem->pad.index = next_pad_index; // Get current circle pad position and update circle pad direction
next_pad_index = (next_pad_index + 1) % mem->pad.entries.size(); s16 circle_pad_x, circle_pad_y;
std::tie(circle_pad_x, circle_pad_y) = InputCore::circle_pad;
state.hex |= GetCirclePadDirectionState(circle_pad_x, circle_pad_y).hex;
// Get the previous Pad state mem->pad.current_state.hex = state.hex;
u32 last_entry_index = (mem->pad.index - 1) % mem->pad.entries.size(); mem->pad.index = next_pad_index;
PadState old_state = mem->pad.entries[last_entry_index].current_state; next_pad_index = (next_pad_index + 1) % mem->pad.entries.size();
// Compute bitmask with 1s for bits different from the old state // Get the previous Pad state
PadState changed = { { (state.hex ^ old_state.hex) } }; u32 last_entry_index = (mem->pad.index - 1) % mem->pad.entries.size();
PadState old_state = mem->pad.entries[last_entry_index].current_state;
// Get the current Pad entry // Compute bitmask with 1s for bits different from the old state
PadDataEntry& pad_entry = mem->pad.entries[mem->pad.index]; PadState changed = { { (state.hex ^ old_state.hex) } };
// Update entry properties // Get the current Pad entry
pad_entry.current_state.hex = state.hex; PadDataEntry& pad_entry = mem->pad.entries[mem->pad.index];
pad_entry.delta_additions.hex = changed.hex & state.hex;
pad_entry.delta_removals.hex = changed.hex & old_state.hex;
pad_entry.circle_pad_x = circle_pad_x;
pad_entry.circle_pad_y = circle_pad_y;
// If we just updated index 0, provide a new timestamp // Update entry properties
if (mem->pad.index == 0) { pad_entry.current_state.hex = state.hex;
mem->pad.index_reset_ticks_previous = mem->pad.index_reset_ticks; pad_entry.delta_additions.hex = changed.hex & state.hex;
mem->pad.index_reset_ticks = (s64)CoreTiming::GetTicks(); pad_entry.delta_removals.hex = changed.hex & old_state.hex;
} pad_entry.circle_pad_x = circle_pad_x;
pad_entry.circle_pad_y = circle_pad_y;
mem->touch.index = next_touch_index; // If we just updated index 0, provide a new timestamp
next_touch_index = (next_touch_index + 1) % mem->touch.entries.size(); if (mem->pad.index == 0) {
mem->pad.index_reset_ticks_previous = mem->pad.index_reset_ticks;
mem->pad.index_reset_ticks = (s64)CoreTiming::GetTicks();
}
// Get the current touch entry mem->touch.index = next_touch_index;
TouchDataEntry& touch_entry = mem->touch.entries[mem->touch.index]; next_touch_index = (next_touch_index + 1) % mem->touch.entries.size();
bool pressed = false;
std::tie(touch_entry.x, touch_entry.y, pressed) = VideoCore::g_emu_window->GetTouchState(); // Get the current touch entry
touch_entry.valid.Assign(pressed ? 1 : 0); TouchDataEntry& touch_entry = mem->touch.entries[mem->touch.index];
bool pressed = false;
// TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which std::tie(touch_entry.x, touch_entry.y, pressed) = VideoCore::g_emu_window->GetTouchState();
// supposedly is "Touch-screen entry, which contains the raw coordinate data prior to being touch_entry.valid.Assign(pressed ? 1 : 0);
// converted to pixel coordinates." (http://3dbrew.org/wiki/HID_Shared_Memory#Offset_0xA8).
// If we just updated index 0, provide a new timestamp // TODO(bunnei): We're not doing anything with offset 0xA8 + 0x18 of HID SharedMemory, which
if (mem->touch.index == 0) { // supposedly is "Touch-screen entry, which contains the raw coordinate data prior to being
mem->touch.index_reset_ticks_previous = mem->touch.index_reset_ticks; // converted to pixel coordinates." (http://3dbrew.org/wiki/HID_Shared_Memory#Offset_0xA8).
mem->touch.index_reset_ticks = (s64)CoreTiming::GetTicks();
}
// Signal both handles when there's an update to Pad or touch // If we just updated index 0, provide a new timestamp
event_pad_or_touch_1->Signal(); if (mem->touch.index == 0) {
event_pad_or_touch_2->Signal(); mem->touch.index_reset_ticks_previous = mem->touch.index_reset_ticks;
mem->touch.index_reset_ticks = (s64)CoreTiming::GetTicks();
}
// Update accelerometer // Signal both handles when there's an update to Pad or touch
if (enable_accelerometer_count > 0) { event_pad_or_touch_1->Signal();
mem->accelerometer.index = next_accelerometer_index; event_pad_or_touch_2->Signal();
next_accelerometer_index = (next_accelerometer_index + 1) % mem->accelerometer.entries.size();
AccelerometerDataEntry& accelerometer_entry = mem->accelerometer.entries[mem->accelerometer.index]; // Update accelerometer
std::tie(accelerometer_entry.x, accelerometer_entry.y, accelerometer_entry.z) if (enable_accelerometer_count > 0) {
= VideoCore::g_emu_window->GetAccelerometerState(); mem->accelerometer.index = next_accelerometer_index;
next_accelerometer_index = (next_accelerometer_index + 1) % mem->accelerometer.entries.size();
// Make up "raw" entry AccelerometerDataEntry& accelerometer_entry = mem->accelerometer.entries[mem->accelerometer.index];
// TODO(wwylele): std::tie(accelerometer_entry.x, accelerometer_entry.y, accelerometer_entry.z)
// From hardware testing, the raw_entry values are approximately, = VideoCore::g_emu_window->GetAccelerometerState();
// but not exactly, as twice as corresponding entries (or with a minus sign).
// It may caused by system calibration to the accelerometer.
// Figure out how it works, or, if no game reads raw_entry,
// the following three lines can be removed and leave raw_entry unimplemented.
mem->accelerometer.raw_entry.x = -2 * accelerometer_entry.x;
mem->accelerometer.raw_entry.z = 2 * accelerometer_entry.y;
mem->accelerometer.raw_entry.y = -2 * accelerometer_entry.z;
// If we just updated index 0, provide a new timestamp // Make up "raw" entry
if (mem->accelerometer.index == 0) { // TODO(wwylele):
mem->accelerometer.index_reset_ticks_previous = mem->accelerometer.index_reset_ticks; // From hardware testing, the raw_entry values are approximately,
mem->accelerometer.index_reset_ticks = (s64)CoreTiming::GetTicks(); // but not exactly, as twice as corresponding entries (or with a minus sign).
} // It may caused by system calibration to the accelerometer.
// Figure out how it works, or, if no game reads raw_entry,
// the following three lines can be removed and leave raw_entry unimplemented.
mem->accelerometer.raw_entry.x = -2 * accelerometer_entry.x;
mem->accelerometer.raw_entry.z = 2 * accelerometer_entry.y;
mem->accelerometer.raw_entry.y = -2 * accelerometer_entry.z;
event_accelerometer->Signal(); // If we just updated index 0, provide a new timestamp
} if (mem->accelerometer.index == 0) {
mem->accelerometer.index_reset_ticks_previous = mem->accelerometer.index_reset_ticks;
// Update gyroscope mem->accelerometer.index_reset_ticks = (s64)CoreTiming::GetTicks();
if (enable_gyroscope_count > 0) {
mem->gyroscope.index = next_gyroscope_index;
next_gyroscope_index = (next_gyroscope_index + 1) % mem->gyroscope.entries.size();
GyroscopeDataEntry& gyroscope_entry = mem->gyroscope.entries[mem->gyroscope.index];
std::tie(gyroscope_entry.x, gyroscope_entry.y, gyroscope_entry.z)
= VideoCore::g_emu_window->GetGyroscopeState();
// Make up "raw" entry
mem->gyroscope.raw_entry.x = gyroscope_entry.x;
mem->gyroscope.raw_entry.z = -gyroscope_entry.y;
mem->gyroscope.raw_entry.y = gyroscope_entry.z;
// If we just updated index 0, provide a new timestamp
if (mem->gyroscope.index == 0) {
mem->gyroscope.index_reset_ticks_previous = mem->gyroscope.index_reset_ticks;
mem->gyroscope.index_reset_ticks = (s64)CoreTiming::GetTicks();
}
event_gyroscope->Signal();
}
} }
void GetIPCHandles(Service::Interface* self) { event_accelerometer->Signal();
u32* cmd_buff = Kernel::GetCommandBuffer(); }
cmd_buff[1] = 0; // No error // Update gyroscope
cmd_buff[2] = 0x14000000; // IPC Command Structure translate-header if (enable_gyroscope_count > 0) {
// TODO(yuriks): Return error from SendSyncRequest is this fails (part of IPC marshalling) mem->gyroscope.index = next_gyroscope_index;
cmd_buff[3] = Kernel::g_handle_table.Create(Service::HID::shared_mem).MoveFrom(); next_gyroscope_index = (next_gyroscope_index + 1) % mem->gyroscope.entries.size();
cmd_buff[4] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_1).MoveFrom();
cmd_buff[5] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_2).MoveFrom(); GyroscopeDataEntry& gyroscope_entry = mem->gyroscope.entries[mem->gyroscope.index];
cmd_buff[6] = Kernel::g_handle_table.Create(Service::HID::event_accelerometer).MoveFrom(); std::tie(gyroscope_entry.x, gyroscope_entry.y, gyroscope_entry.z)
cmd_buff[7] = Kernel::g_handle_table.Create(Service::HID::event_gyroscope).MoveFrom(); = VideoCore::g_emu_window->GetGyroscopeState();
cmd_buff[8] = Kernel::g_handle_table.Create(Service::HID::event_debug_pad).MoveFrom();
// Make up "raw" entry
mem->gyroscope.raw_entry.x = gyroscope_entry.x;
mem->gyroscope.raw_entry.z = -gyroscope_entry.y;
mem->gyroscope.raw_entry.y = gyroscope_entry.z;
// If we just updated index 0, provide a new timestamp
if (mem->gyroscope.index == 0) {
mem->gyroscope.index_reset_ticks_previous = mem->gyroscope.index_reset_ticks;
mem->gyroscope.index_reset_ticks = (s64)CoreTiming::GetTicks();
} }
void EnableAccelerometer(Service::Interface* self) { event_gyroscope->Signal();
u32* cmd_buff = Kernel::GetCommandBuffer(); }
}
++enable_accelerometer_count; void GetIPCHandles(Service::Interface* self) {
event_accelerometer->Signal(); u32* cmd_buff = Kernel::GetCommandBuffer();
cmd_buff[1] = RESULT_SUCCESS.raw; cmd_buff[1] = 0; // No error
cmd_buff[2] = 0x14000000; // IPC Command Structure translate-header
// TODO(yuriks): Return error from SendSyncRequest is this fails (part of IPC marshalling)
cmd_buff[3] = Kernel::g_handle_table.Create(Service::HID::shared_mem).MoveFrom();
cmd_buff[4] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_1).MoveFrom();
cmd_buff[5] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_2).MoveFrom();
cmd_buff[6] = Kernel::g_handle_table.Create(Service::HID::event_accelerometer).MoveFrom();
cmd_buff[7] = Kernel::g_handle_table.Create(Service::HID::event_gyroscope).MoveFrom();
cmd_buff[8] = Kernel::g_handle_table.Create(Service::HID::event_debug_pad).MoveFrom();
}
LOG_DEBUG(Service_HID, "called"); void EnableAccelerometer(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void DisableAccelerometer(Service::Interface* self) { ++enable_accelerometer_count;
u32* cmd_buff = Kernel::GetCommandBuffer(); event_accelerometer->Signal();
--enable_accelerometer_count; cmd_buff[1] = RESULT_SUCCESS.raw;
event_accelerometer->Signal();
cmd_buff[1] = RESULT_SUCCESS.raw; LOG_DEBUG(Service_HID, "called");
}
LOG_DEBUG(Service_HID, "called"); void DisableAccelerometer(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void EnableGyroscopeLow(Service::Interface* self) { --enable_accelerometer_count;
u32* cmd_buff = Kernel::GetCommandBuffer(); event_accelerometer->Signal();
++enable_gyroscope_count; cmd_buff[1] = RESULT_SUCCESS.raw;
event_gyroscope->Signal();
cmd_buff[1] = RESULT_SUCCESS.raw; LOG_DEBUG(Service_HID, "called");
}
LOG_DEBUG(Service_HID, "called"); void EnableGyroscopeLow(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void DisableGyroscopeLow(Service::Interface* self) { ++enable_gyroscope_count;
u32* cmd_buff = Kernel::GetCommandBuffer(); event_gyroscope->Signal();
--enable_gyroscope_count; cmd_buff[1] = RESULT_SUCCESS.raw;
event_gyroscope->Signal();
cmd_buff[1] = RESULT_SUCCESS.raw; LOG_DEBUG(Service_HID, "called");
}
LOG_DEBUG(Service_HID, "called"); void DisableGyroscopeLow(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void GetGyroscopeLowRawToDpsCoefficient(Service::Interface* self) { --enable_gyroscope_count;
u32* cmd_buff = Kernel::GetCommandBuffer(); event_gyroscope->Signal();
cmd_buff[1] = RESULT_SUCCESS.raw; cmd_buff[1] = RESULT_SUCCESS.raw;
f32 coef = VideoCore::g_emu_window->GetGyroscopeRawToDpsCoefficient(); LOG_DEBUG(Service_HID, "called");
memcpy(&cmd_buff[2], &coef, 4); }
}
void GetGyroscopeLowCalibrateParam(Service::Interface* self) { void GetGyroscopeLowRawToDpsCoefficient(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer(); u32* cmd_buff = Kernel::GetCommandBuffer();
cmd_buff[1] = RESULT_SUCCESS.raw; cmd_buff[1] = RESULT_SUCCESS.raw;
const s16 param_unit = 6700; // an approximate value taken from hw f32 coef = VideoCore::g_emu_window->GetGyroscopeRawToDpsCoefficient();
GyroscopeCalibrateParam param = { memcpy(&cmd_buff[2], &coef, 4);
{ 0, param_unit, -param_unit }, }
{ 0, param_unit, -param_unit },
{ 0, param_unit, -param_unit },
};
memcpy(&cmd_buff[2], &param, sizeof(param));
LOG_WARNING(Service_HID, "(STUBBED) called"); void GetGyroscopeLowCalibrateParam(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void GetSoundVolume(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw;
u32* cmd_buff = Kernel::GetCommandBuffer();
const u8 volume = 0x3F; // TODO(purpasmart): Find out if this is the max value for the volume const s16 param_unit = 6700; // an approximate value taken from hw
GyroscopeCalibrateParam param = {
{ 0, param_unit, -param_unit },
{ 0, param_unit, -param_unit },
{ 0, param_unit, -param_unit },
};
memcpy(&cmd_buff[2], &param, sizeof(param));
cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_HID, "(STUBBED) called");
cmd_buff[2] = volume; }
LOG_WARNING(Service_HID, "(STUBBED) called"); void GetSoundVolume(Service::Interface* self) {
} u32* cmd_buff = Kernel::GetCommandBuffer();
void Init() { const u8 volume = 0x3F; // TODO(purpasmart): Find out if this is the max value for the volume
using namespace Kernel;
AddService(new HID_U_Interface); cmd_buff[1] = RESULT_SUCCESS.raw;
AddService(new HID_SPVR_Interface); cmd_buff[2] = volume;
using Kernel::MemoryPermission; LOG_WARNING(Service_HID, "(STUBBED) called");
shared_mem = SharedMemory::Create(nullptr, 0x1000, }
MemoryPermission::ReadWrite, MemoryPermission::Read,
0, Kernel::MemoryRegion::BASE, "HID:SharedMemory");
next_pad_index = 0; void Init() {
next_touch_index = 0; using namespace Kernel;
// Create event handles AddService(new HID_U_Interface);
event_pad_or_touch_1 = Event::Create(ResetType::OneShot, "HID:EventPadOrTouch1"); AddService(new HID_SPVR_Interface);
event_pad_or_touch_2 = Event::Create(ResetType::OneShot, "HID:EventPadOrTouch2");
event_accelerometer = Event::Create(ResetType::OneShot, "HID:EventAccelerometer");
event_gyroscope = Event::Create(ResetType::OneShot, "HID:EventGyroscope");
event_debug_pad = Event::Create(ResetType::OneShot, "HID:EventDebugPad");
}
void Shutdown() { using Kernel::MemoryPermission;
shared_mem = nullptr; shared_mem = SharedMemory::Create(nullptr, 0x1000,
event_pad_or_touch_1 = nullptr; MemoryPermission::ReadWrite, MemoryPermission::Read,
event_pad_or_touch_2 = nullptr; 0, Kernel::MemoryRegion::BASE, "HID:SharedMemory");
event_accelerometer = nullptr;
event_gyroscope = nullptr;
event_debug_pad = nullptr;
}
} // namespace HID next_pad_index = 0;
next_touch_index = 0;
// Create event handles
event_pad_or_touch_1 = Event::Create(ResetType::OneShot, "HID:EventPadOrTouch1");
event_pad_or_touch_2 = Event::Create(ResetType::OneShot, "HID:EventPadOrTouch2");
event_accelerometer = Event::Create(ResetType::OneShot, "HID:EventAccelerometer");
event_gyroscope = Event::Create(ResetType::OneShot, "HID:EventGyroscope");
event_debug_pad = Event::Create(ResetType::OneShot, "HID:EventDebugPad");
}
void Shutdown() {
shared_mem = nullptr;
event_pad_or_touch_1 = nullptr;
event_pad_or_touch_2 = nullptr;
event_accelerometer = nullptr;
event_gyroscope = nullptr;
event_debug_pad = nullptr;
}
} // namespace HID
} // namespace Service } // namespace Service