diff options
author | Michael Scire <SciresM@gmail.com> | 2019-07-06 21:13:34 +0200 |
---|---|---|
committer | Michael Scire <SciresM@gmail.com> | 2019-07-06 21:13:34 +0200 |
commit | 7fb7d3c218b41777da5959f1ea56ed504f7203f5 (patch) | |
tree | 9a8c1468d45adf8e7e415bb15775c3adf14989dd /src/core/hle/service/am/am.cpp | |
parent | Merge pull request #2601 from FernandoS27/texture_cache (diff) | |
download | yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar.gz yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar.bz2 yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar.lz yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar.xz yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.tar.zst yuzu-7fb7d3c218b41777da5959f1ea56ed504f7203f5.zip |
Diffstat (limited to 'src/core/hle/service/am/am.cpp')
-rw-r--r-- | src/core/hle/service/am/am.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 33cebb48b..aef494476 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -270,7 +270,7 @@ ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger {70, nullptr, "ReportMultimediaError"}, {71, nullptr, "GetCurrentIlluminanceEx"}, {80, nullptr, "SetWirelessPriorityMode"}, - {90, nullptr, "GetAccumulatedSuspendedTickValue"}, + {90, &ISelfController::GetAccumulatedSuspendedTickValue, "GetAccumulatedSuspendedTickValue"}, {91, &ISelfController::GetAccumulatedSuspendedTickChangedEvent, "GetAccumulatedSuspendedTickChangedEvent"}, {100, nullptr, "SetAlbumImageTakenNotificationEnabled"}, {1000, nullptr, "GetDebugStorageChannel"}, @@ -283,10 +283,13 @@ ISelfController::ISelfController(std::shared_ptr<NVFlinger::NVFlinger> nvflinger launchable_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual, "ISelfController:LaunchableEvent"); - // TODO(ogniK): Figure out where, when and why this event gets signalled + // This event is created by AM on the first time GetAccumulatedSuspendedTickChangedEvent() is called. + // Yuzu can just create it unconditionally, since it doesn't need to support multiple ISelfControllers. + // The event is signaled on creation, and on transition from suspended -> not suspended if the event has + // previously been created by a call to GetAccumulatedSuspendedTickChangedEvent. accumulated_suspended_tick_changed_event = Kernel::WritableEvent::CreateEventPair( kernel, Kernel::ResetType::Manual, "ISelfController:AccumulatedSuspendedTickChangedEvent"); - accumulated_suspended_tick_changed_event.writable->Signal(); // Is signalled on creation + accumulated_suspended_tick_changed_event.writable->Signal(); } ISelfController::~ISelfController() = default; @@ -449,11 +452,19 @@ void ISelfController::GetIdleTimeDetectionExtension(Kernel::HLERequestContext& c rb.Push<u32>(idle_time_detection_extension); } +void ISelfController::GetAccumulatedSuspendedTickValue(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Service_AM, "called."); + + // This command returns the total number of system ticks since ISelfController creation + // where the game was suspended. Since Yuzu doesn't implement game suspension, this command + // can just always return 0 ticks. + IPC::ResponseBuilder rb{ctx, 4}; + rb.Push(RESULT_SUCCESS); + rb.Push<u64>(0); +} + void ISelfController::GetAccumulatedSuspendedTickChangedEvent(Kernel::HLERequestContext& ctx) { - // The implementation of this function is fine as is, the reason we're labelling it as stubbed - // is because we're currently unsure when and where accumulated_suspended_tick_changed_event is - // actually signalled for the time being. - LOG_WARNING(Service_AM, "(STUBBED) called"); + LOG_DEBUG(Service_AM, "called."); IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(RESULT_SUCCESS); |