OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 23:40:08 +00:00
Code Issues Projects Releases Wiki Activity

APT: (Subv) Fix bug where start event was being incorrectly signaled.

Browse Source
This commit is contained in:
bunnei 2015-04-05 22:11:57 -04:00
parent e08f55b1a7
commit bdd190363d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/apt/apt.cpp
View File

@ -32,7 +32,8 @@ static Kernel::SharedPtr<Kernel::SharedMemory> shared_font_mem = nullptr;
static Kernel::SharedPtr<Kernel::Mutex> lock = nullptr; static Kernel::SharedPtr<Kernel::Mutex> lock = nullptr;
static Kernel::SharedPtr<Kernel::Event> notification_event = nullptr; ///< APT notification event static Kernel::SharedPtr<Kernel::Event> notification_event = nullptr; ///< APT notification event
static Kernel::SharedPtr<Kernel::Event> pause_event = nullptr; ///< APT pause event static Kernel::SharedPtr<Kernel::Event> start_event = nullptr; ///< APT start event
static std::vector<u8> shared_font; static std::vector<u8> shared_font;
static u32 cpu_percent = 0; ///< CPU time available to the running application static u32 cpu_percent = 0; ///< CPU time available to the running application
@ -44,11 +45,11 @@ void Initialize(Service::Interface* self) {
cmd_buff[2] = 0x04000000; // According to 3dbrew, this value should be 0x04000000 cmd_buff[2] = 0x04000000; // According to 3dbrew, this value should be 0x04000000
cmd_buff[3] = Kernel::g_handle_table.Create(notification_event).MoveFrom(); cmd_buff[3] = Kernel::g_handle_table.Create(notification_event).MoveFrom();
cmd_buff[4] = Kernel::g_handle_table.Create(pause_event).MoveFrom(); cmd_buff[4] = Kernel::g_handle_table.Create(start_event).MoveFrom();
// TODO(bunnei): Check if these events are cleared/signaled every time Initialize is called. // TODO(bunnei): Check if these events are cleared every time Initialize is called.
notification_event->Clear(); notification_event->Clear();
pause_event->Signal(); // Fire start event start_event->Clear();
ASSERT_MSG((nullptr != lock), "Cannot initialize without lock"); ASSERT_MSG((nullptr != lock), "Cannot initialize without lock");
lock->Release(); lock->Release();
@ -81,7 +82,7 @@ void NotifyToWait(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer(); u32* cmd_buff = Kernel::GetCommandBuffer();
u32 app_id = cmd_buff[1]; u32 app_id = cmd_buff[1];
// TODO(Subv): Verify this, it seems to get SWKBD and Home Menu further. // TODO(Subv): Verify this, it seems to get SWKBD and Home Menu further.
pause_event->Signal(); start_event->Signal();
cmd_buff[1] = RESULT_SUCCESS.raw; // No error cmd_buff[1] = RESULT_SUCCESS.raw; // No error
LOG_WARNING(Service_APT, "(STUBBED) app_id=%u", app_id); LOG_WARNING(Service_APT, "(STUBBED) app_id=%u", app_id);
@ -312,7 +313,7 @@ void Init() {
// TODO(bunnei): Check if these are created in Initialize or on APT process startup. // TODO(bunnei): Check if these are created in Initialize or on APT process startup.
notification_event = Kernel::Event::Create(RESETTYPE_ONESHOT, "APT_U:Notification"); notification_event = Kernel::Event::Create(RESETTYPE_ONESHOT, "APT_U:Notification");
pause_event = Kernel::Event::Create(RESETTYPE_ONESHOT, "APT_U:Pause"); start_event = Kernel::Event::Create(RESETTYPE_ONESHOT, "APT_U:Start");
} }
void Shutdown() { void Shutdown() {