From 0197e28cc95e96e651eab555f512d0bb292e9215 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 30 Apr 2018 03:24:27 -0400 Subject: core_timing: Namespace all functions and constants in core_timing's header All of these variables and functions are related to timings and should be within the namespace. --- src/core/hle/service/audio/audout_u.cpp | 2 +- src/core/hle/service/audio/audren_u.cpp | 2 +- src/core/hle/service/hid/hid.cpp | 6 +++--- src/core/hle/service/nvflinger/nvflinger.cpp | 2 +- src/core/hle/service/time/time.cpp | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/core/hle/service') diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 6297dc450..fa3728672 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -18,7 +18,7 @@ constexpr u32 sample_rate{48000}; /// to more audio channels (probably when Docked I guess) constexpr u32 audio_channels{2}; /// TODO(st4rk): find a proper value for the audio_ticks -constexpr u64 audio_ticks{static_cast(BASE_CLOCK_RATE / 500)}; +constexpr u64 audio_ticks{static_cast(CoreTiming::BASE_CLOCK_RATE / 500)}; class IAudioOut final : public ServiceFramework { public: diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 291885db8..0d6eb1d51 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -12,7 +12,7 @@ namespace Service::Audio { /// TODO(bunnei): Find a proper value for the audio_ticks -constexpr u64 audio_ticks{static_cast(BASE_CLOCK_RATE / 200)}; +constexpr u64 audio_ticks{static_cast(CoreTiming::BASE_CLOCK_RATE / 200)}; class IAudioRenderer final : public ServiceFramework { public: diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 736180b63..dc7ff5c31 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -18,9 +18,9 @@ namespace Service::HID { // Updating period for each HID device. // TODO(shinyquagsire23): These need better values. -constexpr u64 pad_update_ticks = BASE_CLOCK_RATE / 10000; -constexpr u64 accelerometer_update_ticks = BASE_CLOCK_RATE / 10000; -constexpr u64 gyroscope_update_ticks = BASE_CLOCK_RATE / 10000; +constexpr u64 pad_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000; +constexpr u64 accelerometer_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000; +constexpr u64 gyroscope_update_ticks = CoreTiming::BASE_CLOCK_RATE / 10000; class IAppletResource final : public ServiceFramework { public: diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 3481e48d0..5c50ed601 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -19,7 +19,7 @@ namespace Service::NVFlinger { constexpr size_t SCREEN_REFRESH_RATE = 60; -constexpr u64 frame_ticks = static_cast(BASE_CLOCK_RATE / SCREEN_REFRESH_RATE); +constexpr u64 frame_ticks = static_cast(CoreTiming::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE); NVFlinger::NVFlinger() { // Add the different displays to the list of displays. diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index 278465358..e50680356 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -59,7 +59,8 @@ public: private: void GetCurrentTimePoint(Kernel::HLERequestContext& ctx) { NGLOG_DEBUG(Service_Time, "called"); - SteadyClockTimePoint steady_clock_time_point{cyclesToMs(CoreTiming::GetTicks()) / 1000}; + SteadyClockTimePoint steady_clock_time_point{ + CoreTiming::cyclesToMs(CoreTiming::GetTicks()) / 1000}; IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; rb.Push(RESULT_SUCCESS); rb.PushRaw(steady_clock_time_point); -- cgit v1.2.3