summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
diff options
context:
space:
mode:
authorChloe Marcec <dmarcecguzman@gmail.com>2020-11-08 09:11:34 +0100
committerChloe Marcec <dmarcecguzman@gmail.com>2020-11-10 05:57:35 +0100
commit31c12de0fecec5889020191ca6de0b7fbf8c51ba (patch)
tree530f9569b0e145f83b6e876886698403a73b02f7 /src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
parentMerge pull request #4909 from lioncash/interrupt (diff)
downloadyuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar.gz
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar.bz2
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar.lz
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar.xz
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.tar.zst
yuzu-31c12de0fecec5889020191ca6de0b7fbf8c51ba.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
index 98dcac52f..43948d18d 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
@@ -16,23 +16,21 @@ public:
explicit nvhost_nvjpg(Core::System& system);
~nvhost_nvjpg() override;
- u32 ioctl(Ioctl command, const std::vector<u8>& input, const std::vector<u8>& input2,
- std::vector<u8>& output, std::vector<u8>& output2, IoctlCtrl& ctrl,
- IoctlVersion version) override;
+ NvResult Ioctl1(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override;
+ NvResult Ioctl2(Ioctl command, const std::vector<u8>& input,
+ const std::vector<u8>& inline_input, std::vector<u8>& output) override;
+ NvResult Ioctl3(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output,
+ std::vector<u8>& inline_output) override;
private:
- enum class IoctlCommand : u32_le {
- IocSetNVMAPfdCommand = 0x40044801,
- };
-
struct IoctlSetNvmapFD {
- u32_le nvmap_fd;
+ s32_le nvmap_fd{};
};
static_assert(sizeof(IoctlSetNvmapFD) == 4, "IoctlSetNvmapFD is incorrect size");
- u32_le nvmap_fd{};
+ s32_le nvmap_fd{};
- u32 SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output);
+ NvResult SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output);
};
} // namespace Service::Nvidia::Devices