From d88b08d9864d1956159b09c0e602d4e8cbab2ac0 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Mon, 1 Nov 2021 20:46:37 +0000 Subject: [PATCH] Address PR feedback --- .../services/nvdrv/devices/deserialisation/deserialisation.h | 3 --- app/src/main/cpp/skyline/soc/host1x/classes/host1x.cpp | 3 +++ app/src/main/cpp/skyline/soc/host1x/command_fifo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/skyline/services/nvdrv/devices/deserialisation/deserialisation.h b/app/src/main/cpp/skyline/services/nvdrv/devices/deserialisation/deserialisation.h index a235f698..8d5cdb34 100644 --- a/app/src/main/cpp/skyline/services/nvdrv/devices/deserialisation/deserialisation.h +++ b/app/src/main/cpp/skyline/services/nvdrv/devices/deserialisation/deserialisation.h @@ -35,7 +35,6 @@ namespace skyline::service::nvdrv::deserialisation { auto out{buffer.subspan(offset, bytes).template cast, std::dynamic_extent, true>()}; offset += bytes; - // Return a simple `span` as that will be the function argument type as opposed to `SlotSizeSpan` return out; } @@ -48,10 +47,8 @@ namespace skyline::service::nvdrv::deserialisation { return std::tuple{std::forward(ts)...}; } - template constexpr auto DecodeArgumentsImpl(span buffer, size_t &offset, std::array &saveSlots) { - if constexpr (IsAutoSizeSpan::value) { // AutoSizeSpan needs to be the last argument static_assert(sizeof...(ArgTypes) == 0); diff --git a/app/src/main/cpp/skyline/soc/host1x/classes/host1x.cpp b/app/src/main/cpp/skyline/soc/host1x/classes/host1x.cpp index 074af98c..1b28d48b 100644 --- a/app/src/main/cpp/skyline/soc/host1x/classes/host1x.cpp +++ b/app/src/main/cpp/skyline/soc/host1x/classes/host1x.cpp @@ -21,9 +21,11 @@ namespace skyline::soc::host1x { syncpoints.at(incrSyncpoint.index).Increment(); break; } + case LoadSyncpointPayload32MethodId: syncpointPayload = argument; break; + case WaitSyncpoint32MethodId: { u32 syncpointId{static_cast(argument)}; state.logger->Debug("Wait syncpoint: {}, thresh: {}", syncpointId, syncpointPayload); @@ -31,6 +33,7 @@ namespace skyline::soc::host1x { syncpoints.at(syncpointId).Wait(syncpointPayload, std::chrono::steady_clock::duration::max()); break; } + default: state.logger->Error("Unknown host1x class method called: 0x{:X}", method); break; diff --git a/app/src/main/cpp/skyline/soc/host1x/command_fifo.h b/app/src/main/cpp/skyline/soc/host1x/command_fifo.h index 2d0523b6..807f8d6b 100644 --- a/app/src/main/cpp/skyline/soc/host1x/command_fifo.h +++ b/app/src/main/cpp/skyline/soc/host1x/command_fifo.h @@ -56,7 +56,7 @@ namespace skyline::soc::host1x { void Start(); /** - * @brief Pushes a single gather into the fifo to be processed asynchronously + * @brief Pushes a single gather into the FIFO to be processed asynchronously */ void Push(span gather); };