diff options
author | bunnei <bunneidev@gmail.com> | 2018-02-08 03:31:06 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-02-08 04:55:09 +0100 |
commit | 703880c9ab4212f728496185ff73023012e141e5 (patch) | |
tree | 82eeedde4845b9d9622154978c6f80723475af50 /src/core/hle | |
parent | Merge pull request #168 from mailwl/new-stubs (diff) | |
download | yuzu-703880c9ab4212f728496185ff73023012e141e5.tar yuzu-703880c9ab4212f728496185ff73023012e141e5.tar.gz yuzu-703880c9ab4212f728496185ff73023012e141e5.tar.bz2 yuzu-703880c9ab4212f728496185ff73023012e141e5.tar.lz yuzu-703880c9ab4212f728496185ff73023012e141e5.tar.xz yuzu-703880c9ab4212f728496185ff73023012e141e5.tar.zst yuzu-703880c9ab4212f728496185ff73023012e141e5.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | 1 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h | 8 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index 11ab25545..3701c182f 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -5,6 +5,7 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h" +#include "core/hle/service/nvdrv/devices/nvmap.h" namespace Service { namespace Nvidia { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 06c256d5d..6b3b67113 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -4,6 +4,8 @@ #pragma once +#include <memory> +#include <utility> #include <vector> #include "common/common_types.h" #include "common/swap.h" @@ -13,9 +15,11 @@ namespace Service { namespace Nvidia { namespace Devices { +class nvmap; + class nvhost_as_gpu final : public nvdevice { public: - nvhost_as_gpu() = default; + nvhost_as_gpu(std::shared_ptr<nvmap> nvmap_dev) : nvdevice(), nvmap_dev(std::move(nvmap_dev)) {} ~nvhost_as_gpu() override = default; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; @@ -92,6 +96,8 @@ private: u32 MapBufferEx(const std::vector<u8>& input, std::vector<u8>& output); u32 BindChannel(const std::vector<u8>& input, std::vector<u8>& output); u32 GetVARegions(const std::vector<u8>& input, std::vector<u8>& output); + + std::shared_ptr<nvmap> nvmap_dev; }; } // namespace Devices diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 1cf8f3175..a98634422 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -31,7 +31,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { Module::Module() { auto nvmap_dev = std::make_shared<Devices::nvmap>(); - devices["/dev/nvhost-as-gpu"] = std::make_shared<Devices::nvhost_as_gpu>(); + devices["/dev/nvhost-as-gpu"] = std::make_shared<Devices::nvhost_as_gpu>(nvmap_dev); devices["/dev/nvhost-ctrl-gpu"] = std::make_shared<Devices::nvhost_ctrl_gpu>(); devices["/dev/nvmap"] = nvmap_dev; devices["/dev/nvdisp_disp0"] = std::make_shared<Devices::nvdisp_disp0>(nvmap_dev); |