VERY experimental Nintendo Switch 2 emulator
C++
nvdrv: Use std::span for inputs
ameerj8a59719bd2a1
diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.hindex 204b0e7572..c562e04d21 100644--- a/src/core/hle/service/nvdrv/devices/nvdevice.h+++ b/src/core/hle/service/nvdrv/devices/nvdevice.h@@ -3,7 +3,9 @@#pragma once+#include <span>#include <vector>+#include "common/common_types.h"#include "core/hle/service/nvdrv/nvdata.h"@@ -31,7 +33,7 @@ public:* @param output A buffer where the output data will be written to.* @returns The result code of the ioctl.*/- virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ virtual NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) = 0;/**@@ -42,8 +44,8 @@ public:* @param output A buffer where the output data will be written to.* @returns The result code of the ioctl.*/- virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) = 0;+ virtual NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) = 0;/*** Handles an ioctl3 request.@@ -53,7 +55,7 @@ public:* @param inline_output A buffer where the inlined output data will be written to.* @returns The result code of the ioctl.*/- virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ virtual NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) = 0;/**diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cppindex 4122fc98de..5a5b2e3055 100644--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp@@ -17,19 +17,19 @@ nvdisp_disp0::nvdisp_disp0(Core::System& system_, NvCore::Container& core): nvdevice{system_}, container{core}, nvmap{core.GetNvMapFile()} {}nvdisp_disp0::~nvdisp_disp0() = default;-NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvdisp_disp0::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvdisp_disp0::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.hindex 04217ab129..81bd7960ad 100644--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h@@ -25,12 +25,12 @@ public:explicit nvdisp_disp0(Core::System& system_, NvCore::Container& core);~nvdisp_disp0() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cppindex b635e6ed13..681bd08673 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp@@ -27,7 +27,7 @@ nvhost_as_gpu::nvhost_as_gpu(Core::System& system_, Module& module_, NvCore::Connvhost_as_gpu::~nvhost_as_gpu() = default;-NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 'A':@@ -60,13 +60,13 @@ NvResult nvhost_as_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>return NvResult::NotImplemented;}-NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {switch (command.group) {case 'A':@@ -87,7 +87,7 @@ NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>void nvhost_as_gpu::OnOpen(DeviceFD fd) {}void nvhost_as_gpu::OnClose(DeviceFD fd) {}-NvResult nvhost_as_gpu::AllocAsEx(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::AllocAsEx(std::span<const u8> input, std::vector<u8>& output) {IoctlAllocAsEx params{};std::memcpy(¶ms, input.data(), input.size());@@ -141,7 +141,7 @@ NvResult nvhost_as_gpu::AllocAsEx(const std::vector<u8>& input, std::vector<u8>&return NvResult::Success;}-NvResult nvhost_as_gpu::AllocateSpace(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::AllocateSpace(std::span<const u8> input, std::vector<u8>& output) {IoctlAllocSpace params{};std::memcpy(¶ms, input.data(), input.size());@@ -220,7 +220,7 @@ void nvhost_as_gpu::FreeMappingLocked(u64 offset) {mapping_map.erase(offset);}-NvResult nvhost_as_gpu::FreeSpace(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::FreeSpace(std::span<const u8> input, std::vector<u8>& output) {IoctlFreeSpace params{};std::memcpy(¶ms, input.data(), input.size());@@ -266,7 +266,7 @@ NvResult nvhost_as_gpu::FreeSpace(const std::vector<u8>& input, std::vector<u8>&return NvResult::Success;}-NvResult nvhost_as_gpu::Remap(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::Remap(std::span<const u8> input, std::vector<u8>& output) {const auto num_entries = input.size() / sizeof(IoctlRemapEntry);LOG_DEBUG(Service_NVDRV, "called, num_entries=0x{:X}", num_entries);@@ -320,7 +320,7 @@ NvResult nvhost_as_gpu::Remap(const std::vector<u8>& input, std::vector<u8>& outreturn NvResult::Success;}-NvResult nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::MapBufferEx(std::span<const u8> input, std::vector<u8>& output) {IoctlMapBufferEx params{};std::memcpy(¶ms, input.data(), input.size());@@ -424,7 +424,7 @@ NvResult nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8return NvResult::Success;}-NvResult nvhost_as_gpu::UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::UnmapBuffer(std::span<const u8> input, std::vector<u8>& output) {IoctlUnmapBuffer params{};std::memcpy(¶ms, input.data(), input.size());@@ -463,7 +463,7 @@ NvResult nvhost_as_gpu::UnmapBuffer(const std::vector<u8>& input, std::vector<u8return NvResult::Success;}-NvResult nvhost_as_gpu::BindChannel(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::BindChannel(std::span<const u8> input, std::vector<u8>& output) {IoctlBindChannel params{};std::memcpy(¶ms, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "called, fd={:X}", params.fd);@@ -492,7 +492,7 @@ void nvhost_as_gpu::GetVARegionsImpl(IoctlGetVaRegions& params) {};}-NvResult nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_as_gpu::GetVARegions(std::span<const u8> input, std::vector<u8>& output) {IoctlGetVaRegions params{};std::memcpy(¶ms, input.data(), input.size());@@ -511,7 +511,7 @@ NvResult nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<ureturn NvResult::Success;}-NvResult nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<u8>& output,+NvResult nvhost_as_gpu::GetVARegions(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output) {IoctlGetVaRegions params{};std::memcpy(¶ms, input.data(), input.size());diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.hindex 86fe71c750..1aba8d5799 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h@@ -47,12 +47,12 @@ public:explicit nvhost_as_gpu(Core::System& system_, Module& module, NvCore::Container& core);~nvhost_as_gpu() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -138,17 +138,17 @@ private:static_assert(sizeof(IoctlGetVaRegions) == 16 + sizeof(VaRegion) * 2,"IoctlGetVaRegions is incorrect size");- NvResult AllocAsEx(const std::vector<u8>& input, std::vector<u8>& output);- NvResult AllocateSpace(const std::vector<u8>& input, std::vector<u8>& output);- NvResult Remap(const std::vector<u8>& input, std::vector<u8>& output);- NvResult MapBufferEx(const std::vector<u8>& input, std::vector<u8>& output);- NvResult UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& output);- NvResult FreeSpace(const std::vector<u8>& input, std::vector<u8>& output);- NvResult BindChannel(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult AllocAsEx(std::span<const u8> input, std::vector<u8>& output);+ NvResult AllocateSpace(std::span<const u8> input, std::vector<u8>& output);+ NvResult Remap(std::span<const u8> input, std::vector<u8>& output);+ NvResult MapBufferEx(std::span<const u8> input, std::vector<u8>& output);+ NvResult UnmapBuffer(std::span<const u8> input, std::vector<u8>& output);+ NvResult FreeSpace(std::span<const u8> input, std::vector<u8>& output);+ NvResult BindChannel(std::span<const u8> input, std::vector<u8>& output);void GetVARegionsImpl(IoctlGetVaRegions& params);- NvResult GetVARegions(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetVARegions(const std::vector<u8>& input, std::vector<u8>& output,+ NvResult GetVARegions(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetVARegions(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output);void FreeMappingLocked(u64 offset);diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cppindex eee11fab88..0cdde82a71 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp@@ -34,7 +34,7 @@ nvhost_ctrl::~nvhost_ctrl() {}}-NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 0x0:@@ -63,13 +63,13 @@ NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>&return NvResult::NotImplemented;}-NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_ctrl::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_outpu) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;@@ -79,7 +79,7 @@ void nvhost_ctrl::OnOpen(DeviceFD fd) {}void nvhost_ctrl::OnClose(DeviceFD fd) {}-NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl::NvOsGetConfigU32(std::span<const u8> input, std::vector<u8>& output) {IocGetConfigParams params{};std::memcpy(¶ms, input.data(), sizeof(params));LOG_TRACE(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(),@@ -87,7 +87,7 @@ NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vectorreturn NvResult::ConfigVarNotFound; // Returns error on production mode}-NvResult nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output,+NvResult nvhost_ctrl::IocCtrlEventWait(std::span<const u8> input, std::vector<u8>& output,bool is_allocation) {IocCtrlEventWaitParams params{};std::memcpy(¶ms, input.data(), sizeof(params));@@ -231,7 +231,7 @@ NvResult nvhost_ctrl::FreeEvent(u32 slot) {return NvResult::Success;}-NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl::IocCtrlEventRegister(std::span<const u8> input, std::vector<u8>& output) {IocCtrlEventRegisterParams params{};std::memcpy(¶ms, input.data(), sizeof(params));const u32 event_id = params.user_event_id;@@ -252,8 +252,7 @@ NvResult nvhost_ctrl::IocCtrlEventRegister(const std::vector<u8>& input, std::vereturn NvResult::Success;}-NvResult nvhost_ctrl::IocCtrlEventUnregister(const std::vector<u8>& input,- std::vector<u8>& output) {+NvResult nvhost_ctrl::IocCtrlEventUnregister(std::span<const u8> input, std::vector<u8>& output) {IocCtrlEventUnregisterParams params{};std::memcpy(¶ms, input.data(), sizeof(params));const u32 event_id = params.user_event_id & 0x00FF;@@ -263,7 +262,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregister(const std::vector<u8>& input,return FreeEvent(event_id);}-NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(const std::vector<u8>& input,+NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(std::span<const u8> input,std::vector<u8>& output) {IocCtrlEventUnregisterBatchParams params{};std::memcpy(¶ms, input.data(), sizeof(params));@@ -282,7 +281,7 @@ NvResult nvhost_ctrl::IocCtrlEventUnregisterBatch(const std::vector<u8>& input,return NvResult::Success;}-NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl::IocCtrlClearEventWait(std::span<const u8> input, std::vector<u8>& output) {IocCtrlEventClearParams params{};std::memcpy(¶ms, input.data(), sizeof(params));diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.hindex 0b56d70708..dd2e7888af 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h@@ -25,12 +25,12 @@ public:NvCore::Container& core);~nvhost_ctrl() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -186,13 +186,13 @@ private:static_assert(sizeof(IocCtrlEventUnregisterBatchParams) == 8,"IocCtrlEventKill is incorrect size");- NvResult NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output,+ NvResult NvOsGetConfigU32(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocCtrlEventWait(std::span<const u8> input, std::vector<u8>& output,bool is_allocation);- NvResult IocCtrlEventRegister(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocCtrlEventUnregister(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocCtrlEventUnregisterBatch(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocCtrlClearEventWait(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult IocCtrlEventRegister(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocCtrlEventUnregister(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocCtrlEventUnregisterBatch(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocCtrlClearEventWait(std::span<const u8> input, std::vector<u8>& output);NvResult FreeEvent(u32 slot);diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cppindex b97813fbc7..be3c083dbf 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp@@ -21,7 +21,7 @@ nvhost_ctrl_gpu::~nvhost_ctrl_gpu() {events_interface.FreeEvent(unknown_event);}-NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 'G':@@ -53,13 +53,13 @@ NvResult nvhost_ctrl_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<ureturn NvResult::NotImplemented;}-NvResult nvhost_ctrl_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {switch (command.group) {case 'G':@@ -82,8 +82,7 @@ NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<uvoid nvhost_ctrl_gpu::OnOpen(DeviceFD fd) {}void nvhost_ctrl_gpu::OnClose(DeviceFD fd) {}-NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input,- std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlCharacteristics params{};std::memcpy(¶ms, input.data(), input.size());@@ -128,7 +127,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input,return NvResult::Success;}-NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output,+NvResult nvhost_ctrl_gpu::GetCharacteristics(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output) {LOG_DEBUG(Service_NVDRV, "called");IoctlCharacteristics params{};@@ -176,7 +175,7 @@ NvResult nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::return NvResult::Success;}-NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span<const u8> input, std::vector<u8>& output) {IoctlGpuGetTpcMasksArgs params{};std::memcpy(¶ms, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size);@@ -187,7 +186,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<return NvResult::Success;}-NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output,+NvResult nvhost_ctrl_gpu::GetTPCMasks(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output) {IoctlGpuGetTpcMasksArgs params{};std::memcpy(¶ms, input.data(), input.size());@@ -200,7 +199,7 @@ NvResult nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<return NvResult::Success;}-NvResult nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::GetActiveSlotMask(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlActiveSlotMask params{};@@ -213,7 +212,7 @@ NvResult nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector<u8>& input, std::vreturn NvResult::Success;}-NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlZcullGetCtxSize params{};@@ -225,7 +224,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vecreturn NvResult::Success;}-NvResult nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::ZCullGetInfo(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlNvgpuGpuZcullGetInfoArgs params{};@@ -248,7 +247,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vectorreturn NvResult::Success;}-NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::ZBCSetTable(std::span<const u8> input, std::vector<u8>& output) {LOG_WARNING(Service_NVDRV, "(STUBBED) called");IoctlZbcSetTable params{};@@ -264,7 +263,7 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector<u8>& input, std::vector<return NvResult::Success;}-NvResult nvhost_ctrl_gpu::ZBCQueryTable(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::ZBCQueryTable(std::span<const u8> input, std::vector<u8>& output) {LOG_WARNING(Service_NVDRV, "(STUBBED) called");IoctlZbcQueryTable params{};@@ -274,7 +273,7 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(const std::vector<u8>& input, std::vectoreturn NvResult::Success;}-NvResult nvhost_ctrl_gpu::FlushL2(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::FlushL2(std::span<const u8> input, std::vector<u8>& output) {LOG_WARNING(Service_NVDRV, "(STUBBED) called");IoctlFlushL2 params{};@@ -284,7 +283,7 @@ NvResult nvhost_ctrl_gpu::FlushL2(const std::vector<u8>& input, std::vector<u8>&return NvResult::Success;}-NvResult nvhost_ctrl_gpu::GetGpuTime(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_ctrl_gpu::GetGpuTime(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlGetGpuTime params{};diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.hindex 1e8f254e2f..b9333d9d39 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h@@ -21,12 +21,12 @@ public:explicit nvhost_ctrl_gpu(Core::System& system_, EventInterface& events_interface_);~nvhost_ctrl_gpu() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -151,21 +151,21 @@ private:};static_assert(sizeof(IoctlGetGpuTime) == 0x10, "IoctlGetGpuTime is incorrect size");- NvResult GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output,+ NvResult GetCharacteristics(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetCharacteristics(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output);- NvResult GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output,+ NvResult GetTPCMasks(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetTPCMasks(std::span<const u8> input, std::vector<u8>& output,std::vector<u8>& inline_output);- NvResult GetActiveSlotMask(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ZBCSetTable(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ZBCQueryTable(const std::vector<u8>& input, std::vector<u8>& output);- NvResult FlushL2(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetGpuTime(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult GetActiveSlotMask(std::span<const u8> input, std::vector<u8>& output);+ NvResult ZCullGetCtxSize(std::span<const u8> input, std::vector<u8>& output);+ NvResult ZCullGetInfo(std::span<const u8> input, std::vector<u8>& output);+ NvResult ZBCSetTable(std::span<const u8> input, std::vector<u8>& output);+ NvResult ZBCQueryTable(std::span<const u8> input, std::vector<u8>& output);+ NvResult FlushL2(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetGpuTime(std::span<const u8> input, std::vector<u8>& output);EventInterface& events_interface;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cppindex e123564c61..d2308fffc9 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp@@ -46,7 +46,7 @@ nvhost_gpu::~nvhost_gpu() {syncpoint_manager.FreeSyncpoint(channel_syncpoint);}-NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 0x0:@@ -98,8 +98,8 @@ NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& ireturn NvResult::NotImplemented;};-NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {switch (command.group) {case 'H':switch (command.cmd) {@@ -112,7 +112,7 @@ NvResult nvhost_gpu::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& ireturn NvResult::NotImplemented;}-NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;@@ -121,7 +121,7 @@ NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& ivoid nvhost_gpu::OnOpen(DeviceFD fd) {}void nvhost_gpu::OnClose(DeviceFD fd) {}-NvResult nvhost_gpu::SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::SetNVMAPfd(std::span<const u8> input, std::vector<u8>& output) {IoctlSetNvmapFD params{};std::memcpy(¶ms, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd);@@ -130,7 +130,7 @@ NvResult nvhost_gpu::SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& oreturn NvResult::Success;}-NvResult nvhost_gpu::SetClientData(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::SetClientData(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlClientData params{};@@ -139,7 +139,7 @@ NvResult nvhost_gpu::SetClientData(const std::vector<u8>& input, std::vector<u8>return NvResult::Success;}-NvResult nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::GetClientData(std::span<const u8> input, std::vector<u8>& output) {LOG_DEBUG(Service_NVDRV, "called");IoctlClientData params{};@@ -149,7 +149,7 @@ NvResult nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>return NvResult::Success;}-NvResult nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::ZCullBind(std::span<const u8> input, std::vector<u8>& output) {std::memcpy(&zcull_params, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "called, gpu_va={:X}, mode={:X}", zcull_params.gpu_va,zcull_params.mode);@@ -158,7 +158,7 @@ NvResult nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& oureturn NvResult::Success;}-NvResult nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::SetErrorNotifier(std::span<const u8> input, std::vector<u8>& output) {IoctlSetErrorNotifier params{};std::memcpy(¶ms, input.data(), input.size());LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset={:X}, size={:X}, mem={:X}", params.offset,@@ -168,14 +168,14 @@ NvResult nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<return NvResult::Success;}-NvResult nvhost_gpu::SetChannelPriority(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::SetChannelPriority(std::span<const u8> input, std::vector<u8>& output) {std::memcpy(&channel_priority, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority={:X}", channel_priority);return NvResult::Success;}-NvResult nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::AllocGPFIFOEx2(std::span<const u8> input, std::vector<u8>& output) {IoctlAllocGpfifoEx2 params{};std::memcpy(¶ms, input.data(), input.size());LOG_WARNING(Service_NVDRV,@@ -197,7 +197,7 @@ NvResult nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8return NvResult::Success;}-NvResult nvhost_gpu::AllocateObjectContext(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::AllocateObjectContext(std::span<const u8> input, std::vector<u8>& output) {IoctlAllocObjCtx params{};std::memcpy(¶ms, input.data(), input.size());LOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num={:X}, flags={:X}", params.class_num,@@ -293,7 +293,7 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector<u8>return NvResult::Success;}-NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector<u8>& input, std::vector<u8>& output,+NvResult nvhost_gpu::SubmitGPFIFOBase(std::span<const u8> input, std::vector<u8>& output,bool kickoff) {if (input.size() < sizeof(IoctlSubmitGpfifo)) {UNIMPLEMENTED();@@ -314,8 +314,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector<u8>& input, std::vector<return SubmitGPFIFOImpl(params, output, std::move(entries));}-NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector<u8>& input,- const std::vector<u8>& input_inline,+NvResult nvhost_gpu::SubmitGPFIFOBase(std::span<const u8> input, std::span<const u8> input_inline,std::vector<u8>& output) {if (input.size() < sizeof(IoctlSubmitGpfifo)) {UNIMPLEMENTED();@@ -328,7 +327,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase(const std::vector<u8>& input,return SubmitGPFIFOImpl(params, output, std::move(entries));}-NvResult nvhost_gpu::GetWaitbase(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::GetWaitbase(std::span<const u8> input, std::vector<u8>& output) {IoctlGetWaitbase params{};std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase));LOG_INFO(Service_NVDRV, "called, unknown=0x{:X}", params.unknown);@@ -338,7 +337,7 @@ NvResult nvhost_gpu::GetWaitbase(const std::vector<u8>& input, std::vector<u8>&return NvResult::Success;}-NvResult nvhost_gpu::ChannelSetTimeout(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::ChannelSetTimeout(std::span<const u8> input, std::vector<u8>& output) {IoctlChannelSetTimeout params{};std::memcpy(¶ms, input.data(), sizeof(IoctlChannelSetTimeout));LOG_INFO(Service_NVDRV, "called, timeout=0x{:X}", params.timeout);@@ -346,7 +345,7 @@ NvResult nvhost_gpu::ChannelSetTimeout(const std::vector<u8>& input, std::vectorreturn NvResult::Success;}-NvResult nvhost_gpu::ChannelSetTimeslice(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_gpu::ChannelSetTimeslice(std::span<const u8> input, std::vector<u8>& output) {IoctlSetTimeslice params{};std::memcpy(¶ms, input.data(), sizeof(IoctlSetTimeslice));LOG_INFO(Service_NVDRV, "called, timeslice=0x{:X}", params.timeslice);diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.hindex 1e4ecd55b3..3ca58202d3 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h@@ -40,12 +40,12 @@ public:NvCore::Container& core);~nvhost_gpu() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -186,23 +186,23 @@ private:u32_le channel_priority{};u32_le channel_timeslice{};- NvResult SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output);- NvResult SetClientData(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetClientData(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ZCullBind(const std::vector<u8>& input, std::vector<u8>& output);- NvResult SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output);- NvResult SetChannelPriority(const std::vector<u8>& input, std::vector<u8>& output);- NvResult AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& output);- NvResult AllocateObjectContext(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult SetNVMAPfd(std::span<const u8> input, std::vector<u8>& output);+ NvResult SetClientData(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetClientData(std::span<const u8> input, std::vector<u8>& output);+ NvResult ZCullBind(std::span<const u8> input, std::vector<u8>& output);+ NvResult SetErrorNotifier(std::span<const u8> input, std::vector<u8>& output);+ NvResult SetChannelPriority(std::span<const u8> input, std::vector<u8>& output);+ NvResult AllocGPFIFOEx2(std::span<const u8> input, std::vector<u8>& output);+ NvResult AllocateObjectContext(std::span<const u8> input, std::vector<u8>& output);NvResult SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector<u8>& output,Tegra::CommandList&& entries);- NvResult SubmitGPFIFOBase(const std::vector<u8>& input, std::vector<u8>& output,+ NvResult SubmitGPFIFOBase(std::span<const u8> input, std::vector<u8>& output,bool kickoff = false);- NvResult SubmitGPFIFOBase(const std::vector<u8>& input, const std::vector<u8>& input_inline,+ NvResult SubmitGPFIFOBase(std::span<const u8> input, std::span<const u8> input_inline,std::vector<u8>& output);- NvResult GetWaitbase(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ChannelSetTimeout(const std::vector<u8>& input, std::vector<u8>& output);- NvResult ChannelSetTimeslice(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult GetWaitbase(std::span<const u8> input, std::vector<u8>& output);+ NvResult ChannelSetTimeout(std::span<const u8> input, std::vector<u8>& output);+ NvResult ChannelSetTimeslice(std::span<const u8> input, std::vector<u8>& output);EventInterface& events_interface;NvCore::Container& core;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cppindex 1703f9cc37..0c7aee1b83 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp@@ -15,7 +15,7 @@ nvhost_nvdec::nvhost_nvdec(Core::System& system_, NvCore::Container& core_): nvhost_nvdec_common{system_, core_, NvCore::ChannelType::NvDec} {}nvhost_nvdec::~nvhost_nvdec() = default;-NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 0x0:@@ -55,13 +55,13 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>&return NvResult::NotImplemented;}-NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_nvdec::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.hindex c1b4e53e83..0d615bbcbf 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h@@ -13,12 +13,12 @@ public:explicit nvhost_nvdec(Core::System& system_, NvCore::Container& core);~nvhost_nvdec() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cppindex 99eede702f..7bcef105b1 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp@@ -23,7 +23,7 @@ namespace {// Copies count amount of type T from the input vector into the dst vector.// Returns the number of bytes written into dst.template <typename T>-std::size_t SliceVectors(const std::vector<u8>& input, std::vector<T>& dst, std::size_t count,+std::size_t SliceVectors(std::span<const u8> input, std::vector<T>& dst, std::size_t count,std::size_t offset) {if (dst.empty()) {return 0;@@ -63,7 +63,7 @@ nvhost_nvdec_common::~nvhost_nvdec_common() {core.Host1xDeviceFile().syncpts_accumulated.push_back(channel_syncpoint);}-NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector<u8>& input) {+NvResult nvhost_nvdec_common::SetNVMAPfd(std::span<const u8> input) {IoctlSetNvmapFD params{};std::memcpy(¶ms, input.data(), sizeof(IoctlSetNvmapFD));LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd);@@ -72,7 +72,7 @@ NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector<u8>& input) {return NvResult::Success;}-NvResult nvhost_nvdec_common::Submit(DeviceFD fd, const std::vector<u8>& input,+NvResult nvhost_nvdec_common::Submit(DeviceFD fd, std::span<const u8> input,std::vector<u8>& output) {IoctlSubmit params{};std::memcpy(¶ms, input.data(), sizeof(IoctlSubmit));@@ -121,7 +121,7 @@ NvResult nvhost_nvdec_common::Submit(DeviceFD fd, const std::vector<u8>& input,return NvResult::Success;}-NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_nvdec_common::GetSyncpoint(std::span<const u8> input, std::vector<u8>& output) {IoctlGetSyncpoint params{};std::memcpy(¶ms, input.data(), sizeof(IoctlGetSyncpoint));LOG_DEBUG(Service_NVDRV, "called GetSyncpoint, id={}", params.param);@@ -133,7 +133,7 @@ NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector<u8>& input, std::vereturn NvResult::Success;}-NvResult nvhost_nvdec_common::GetWaitbase(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_nvdec_common::GetWaitbase(std::span<const u8> input, std::vector<u8>& output) {IoctlGetWaitbase params{};LOG_CRITICAL(Service_NVDRV, "called WAITBASE");std::memcpy(¶ms, input.data(), sizeof(IoctlGetWaitbase));@@ -142,7 +142,7 @@ NvResult nvhost_nvdec_common::GetWaitbase(const std::vector<u8>& input, std::vecreturn NvResult::Success;}-NvResult nvhost_nvdec_common::MapBuffer(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_nvdec_common::MapBuffer(std::span<const u8> input, std::vector<u8>& output) {IoctlMapBuffer params{};std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer));std::vector<MapBufferEntry> cmd_buffer_handles(params.num_entries);@@ -159,7 +159,7 @@ NvResult nvhost_nvdec_common::MapBuffer(const std::vector<u8>& input, std::vectoreturn NvResult::Success;}-NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_nvdec_common::UnmapBuffer(std::span<const u8> input, std::vector<u8>& output) {IoctlMapBuffer params{};std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer));std::vector<MapBufferEntry> cmd_buffer_handles(params.num_entries);@@ -173,8 +173,7 @@ NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector<u8>& input, std::vecreturn NvResult::Success;}-NvResult nvhost_nvdec_common::SetSubmitTimeout(const std::vector<u8>& input,- std::vector<u8>& output) {+NvResult nvhost_nvdec_common::SetSubmitTimeout(std::span<const u8> input, std::vector<u8>& output) {std::memcpy(&submit_timeout, input.data(), input.size());LOG_WARNING(Service_NVDRV, "(STUBBED) called");return NvResult::Success;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.hindex fe76100c86..5af26a26fa 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h@@ -107,13 +107,13 @@ protected:static_assert(sizeof(IoctlMapBuffer) == 0x0C, "IoctlMapBuffer is incorrect size");/// Ioctl command implementations- NvResult SetNVMAPfd(const std::vector<u8>& input);- NvResult Submit(DeviceFD fd, const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetSyncpoint(const std::vector<u8>& input, std::vector<u8>& output);- NvResult GetWaitbase(const std::vector<u8>& input, std::vector<u8>& output);- NvResult MapBuffer(const std::vector<u8>& input, std::vector<u8>& output);- NvResult UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& output);- NvResult SetSubmitTimeout(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult SetNVMAPfd(std::span<const u8> input);+ NvResult Submit(DeviceFD fd, std::span<const u8> input, std::vector<u8>& output);+ NvResult GetSyncpoint(std::span<const u8> input, std::vector<u8>& output);+ NvResult GetWaitbase(std::span<const u8> input, std::vector<u8>& output);+ NvResult MapBuffer(std::span<const u8> input, std::vector<u8>& output);+ NvResult UnmapBuffer(std::span<const u8> input, std::vector<u8>& output);+ NvResult SetSubmitTimeout(std::span<const u8> input, std::vector<u8>& output);Kernel::KEvent* QueryEvent(u32 event_id) override;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cppindex bdbc2f9e1f..39f30e7c86 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp@@ -12,7 +12,7 @@ namespace Service::Nvidia::Devices {nvhost_nvjpg::nvhost_nvjpg(Core::System& system_) : nvdevice{system_} {}nvhost_nvjpg::~nvhost_nvjpg() = default;-NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 'H':@@ -31,13 +31,13 @@ NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>&return NvResult::NotImplemented;}-NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_nvjpg::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;@@ -46,7 +46,7 @@ NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>&void nvhost_nvjpg::OnOpen(DeviceFD fd) {}void nvhost_nvjpg::OnClose(DeviceFD fd) {}-NvResult nvhost_nvjpg::SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvhost_nvjpg::SetNVMAPfd(std::span<const u8> input, std::vector<u8>& output) {IoctlSetNvmapFD params{};std::memcpy(¶ms, input.data(), input.size());LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd);diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.hindex 440e7d371c..41b57e872d 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h@@ -15,12 +15,12 @@ public:explicit nvhost_nvjpg(Core::System& system_);~nvhost_nvjpg() override;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -33,7 +33,7 @@ private:s32_le nvmap_fd{};- NvResult SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult SetNVMAPfd(std::span<const u8> input, std::vector<u8>& output);};} // namespace Service::Nvidia::Devicesdiff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/core/hle/service/nvdrv/devices/nvhost_vic.cppindex 73f97136e3..b0ea402a72 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp@@ -15,7 +15,7 @@ nvhost_vic::nvhost_vic(Core::System& system_, NvCore::Container& core_)nvhost_vic::~nvhost_vic() = default;-NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 0x0:@@ -55,13 +55,13 @@ NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& ireturn NvResult::NotImplemented;}-NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvhost_vic::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.h b/src/core/hle/service/nvdrv/devices/nvhost_vic.hindex f164caafb3..b5e350a83d 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_vic.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.h@@ -12,12 +12,12 @@ public:explicit nvhost_vic(Core::System& system_, NvCore::Container& core);~nvhost_vic();- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cppindex fa29db7580..29c1e0f011 100644--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp@@ -25,7 +25,7 @@ nvmap::nvmap(Core::System& system_, NvCore::Container& container_)nvmap::~nvmap() = default;-NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {switch (command.group) {case 0x1:@@ -54,13 +54,13 @@ NvResult nvmap::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,return NvResult::NotImplemented;}-NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult nvmap::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;}-NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {UNIMPLEMENTED_MSG("Unimplemented ioctl={:08X}", command.raw);return NvResult::NotImplemented;@@ -69,7 +69,7 @@ NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,void nvmap::OnOpen(DeviceFD fd) {}void nvmap::OnClose(DeviceFD fd) {}-NvResult nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocCreate(std::span<const u8> input, std::vector<u8>& output) {IocCreateParams params;std::memcpy(¶ms, input.data(), sizeof(params));LOG_DEBUG(Service_NVDRV, "called, size=0x{:08X}", params.size);@@ -89,7 +89,7 @@ NvResult nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output)return NvResult::Success;}-NvResult nvmap::IocAlloc(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocAlloc(std::span<const u8> input, std::vector<u8>& output) {IocAllocParams params;std::memcpy(¶ms, input.data(), sizeof(params));LOG_DEBUG(Service_NVDRV, "called, addr={:X}", params.address);@@ -137,7 +137,7 @@ NvResult nvmap::IocAlloc(const std::vector<u8>& input, std::vector<u8>& output)return result;}-NvResult nvmap::IocGetId(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocGetId(std::span<const u8> input, std::vector<u8>& output) {IocGetIdParams params;std::memcpy(¶ms, input.data(), sizeof(params));@@ -161,7 +161,7 @@ NvResult nvmap::IocGetId(const std::vector<u8>& input, std::vector<u8>& output)return NvResult::Success;}-NvResult nvmap::IocFromId(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocFromId(std::span<const u8> input, std::vector<u8>& output) {IocFromIdParams params;std::memcpy(¶ms, input.data(), sizeof(params));@@ -192,7 +192,7 @@ NvResult nvmap::IocFromId(const std::vector<u8>& input, std::vector<u8>& output)return NvResult::Success;}-NvResult nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocParam(std::span<const u8> input, std::vector<u8>& output) {enum class ParamTypes { Size = 1, Alignment = 2, Base = 3, Heap = 4, Kind = 5, Compr = 6 };IocParamParams params;@@ -241,7 +241,7 @@ NvResult nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output)return NvResult::Success;}-NvResult nvmap::IocFree(const std::vector<u8>& input, std::vector<u8>& output) {+NvResult nvmap::IocFree(std::span<const u8> input, std::vector<u8>& output) {IocFreeParams params;std::memcpy(¶ms, input.data(), sizeof(params));diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.hindex e9bfd03580..82bd3b118f 100644--- a/src/core/hle/service/nvdrv/devices/nvmap.h+++ b/src/core/hle/service/nvdrv/devices/nvmap.h@@ -26,12 +26,12 @@ public:nvmap(const nvmap&) = delete;nvmap& operator=(const nvmap&) = delete;- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) override;- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) override;- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output) override;+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) override;+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output) override;void OnOpen(DeviceFD fd) override;void OnClose(DeviceFD fd) override;@@ -106,12 +106,12 @@ private:};static_assert(sizeof(IocGetIdParams) == 8, "IocGetIdParams has wrong size");- NvResult IocCreate(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocAlloc(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocGetId(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocFromId(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocParam(const std::vector<u8>& input, std::vector<u8>& output);- NvResult IocFree(const std::vector<u8>& input, std::vector<u8>& output);+ NvResult IocCreate(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocAlloc(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocGetId(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocFromId(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocParam(std::span<const u8> input, std::vector<u8>& output);+ NvResult IocFree(std::span<const u8> input, std::vector<u8>& output);NvCore::Container& container;NvCore::NvMap& file;diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cppindex 6fc8565c0d..52d27e7553 100644--- a/src/core/hle/service/nvdrv/nvdrv.cpp+++ b/src/core/hle/service/nvdrv/nvdrv.cpp@@ -124,7 +124,7 @@ DeviceFD Module::Open(const std::string& device_name) {return fd;}-NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output) {if (fd < 0) {LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd);@@ -141,8 +141,8 @@ NvResult Module::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& inputreturn itr->second->Ioctl1(fd, command, input, output);}-NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output) {+NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output) {if (fd < 0) {LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd);return NvResult::InvalidState;@@ -158,7 +158,7 @@ NvResult Module::Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& inputreturn itr->second->Ioctl2(fd, command, input, inline_input, output);}-NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,+NvResult Module::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input,std::vector<u8>& output, std::vector<u8>& inline_output) {if (fd < 0) {LOG_ERROR(Service_NVDRV, "Invalid DeviceFD={}!", fd);diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.hindex f3c81bd882..b09b6e5858 100644--- a/src/core/hle/service/nvdrv/nvdrv.h+++ b/src/core/hle/service/nvdrv/nvdrv.h@@ -7,6 +7,7 @@#include <functional>#include <list>#include <memory>+#include <span>#include <string>#include <unordered_map>#include <vector>@@ -79,14 +80,13 @@ public:DeviceFD Open(const std::string& device_name);/// Sends an ioctl command to the specified file descriptor.- NvResult Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output);+ NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output);- NvResult Ioctl2(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- const std::vector<u8>& inline_input, std::vector<u8>& output);+ NvResult Ioctl2(DeviceFD fd, Ioctl command, std::span<const u8> input,+ std::span<const u8> inline_input, std::vector<u8>& output);- NvResult Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>& input,- std::vector<u8>& output, std::vector<u8>& inline_output);+ NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::vector<u8>& output,+ std::vector<u8>& inline_output);/// Closes a device file descriptor and returns operation success.NvResult Close(DeviceFD fd);diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cppindex edbdfee43c..39a4443a03 100644--- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp+++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp@@ -27,7 +27,7 @@ void NVDRV::Open(Kernel::HLERequestContext& ctx) {return;}- const auto& buffer = ctx.ReadBuffer();+ const auto& buffer = ctx.ReadBufferSpan();const std::string device_name(buffer.begin(), buffer.end());if (device_name == "/dev/nvhost-prof-gpu") {@@ -64,7 +64,7 @@ void NVDRV::Ioctl1(Kernel::HLERequestContext& ctx) {// Check devicestd::vector<u8> output_buffer(ctx.GetWriteBufferSize(0));- const auto input_buffer = ctx.ReadBuffer(0);+ const auto input_buffer = ctx.ReadBufferSpan(0);const auto nv_result = nvdrv->Ioctl1(fd, command, input_buffer, output_buffer);if (command.is_out != 0) {@@ -88,8 +88,8 @@ void NVDRV::Ioctl2(Kernel::HLERequestContext& ctx) {return;}- const auto input_buffer = ctx.ReadBuffer(0);- const auto input_inlined_buffer = ctx.ReadBuffer(1);+ const auto input_buffer = ctx.ReadBufferSpan(0);+ const auto input_inlined_buffer = ctx.ReadBufferSpan(1);std::vector<u8> output_buffer(ctx.GetWriteBufferSize(0));const auto nv_result =@@ -115,7 +115,7 @@ void NVDRV::Ioctl3(Kernel::HLERequestContext& ctx) {return;}- const auto input_buffer = ctx.ReadBuffer(0);+ const auto input_buffer = ctx.ReadBufferSpan(0);std::vector<u8> output_buffer(ctx.GetWriteBufferSize(0));std::vector<u8> output_buffer_inline(ctx.GetWriteBufferSize(1));