diff options
author | bunnei <bunneidev@gmail.com> | 2018-01-17 03:06:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 03:06:52 +0100 |
commit | 8c05e935bd14ab526e35a33b854e36b30aacdcc0 (patch) | |
tree | fd6d1db6ea25ee744f4e65733b4450bdd0fab5ac /src/core/hle/service/nvdrv/nvdrv.h | |
parent | Merge pull request #52 from ogniK5377/fsp (diff) | |
parent | applet_oe: Fix GetOperationMode and GetPerformanceMode. (diff) | |
download | yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar.gz yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar.bz2 yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar.lz yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar.xz yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.tar.zst yuzu-8c05e935bd14ab526e35a33b854e36b30aacdcc0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.h | 124 |
1 files changed, 30 insertions, 94 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index a1c050416..1940ced99 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -11,110 +11,46 @@ #include "core/hle/service/service.h" namespace Service { -namespace NVDRV { +namespace Nvidia { -class nvdevice { -public: - virtual ~nvdevice() = default; - - virtual u32 ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) = 0; -}; +namespace Devices { +class nvdevice; +} -class nvmap : public nvdevice { +class Module final { public: - /// Returns the allocated address of an nvmap object given its handle. - VAddr GetObjectAddress(u32 handle) const; - - u32 ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) override; + Module(); + ~Module() = default; + + /// Returns a pointer to one of the available devices, identified by its name. + template <typename T> + std::shared_ptr<T> GetDevice(std::string name) { + auto itr = devices.find(name); + if (itr == devices.end()) + return nullptr; + return std::static_pointer_cast<T>(itr->second); + } + + /// Opens a device node and returns a file descriptor to it. + u32 Open(std::string device_name); + /// Sends an ioctl command to the specified file descriptor. + u32 Ioctl(u32 fd, u32 command, const std::vector<u8>& input, std::vector<u8>& output); private: - // Represents an nvmap object. - struct Object { - enum class Status { Created, Allocated }; - u32 id; - u32 size; - u32 flags; - u32 align; - u8 kind; - VAddr addr; - Status status; - }; - - u32 next_handle = 1; - u32 next_id = 1; - std::unordered_map<u32, std::shared_ptr<Object>> handles; - - enum IoctlCommands { - IocCreateCommand = 0xC0080101, - IocFromIdCommand = 0xC0080103, - IocAllocCommand = 0xC0200104, - IocParamCommand = 0xC00C0109, - IocGetIdCommand = 0xC008010E - }; - - struct IocCreateParams { - // Input - u32_le size; - // Output - u32_le handle; - }; - - struct IocAllocParams { - // Input - u32_le handle; - u32_le heap_mask; - u32_le flags; - u32_le align; - u8 kind; - INSERT_PADDING_BYTES(7); - u64_le addr; - }; - - struct IocGetIdParams { - // Output - u32_le id; - // Input - u32_le handle; - }; + /// Id to use for the next open file descriptor. + u32 next_fd = 1; - struct IocFromIdParams { - // Input - u32_le id; - // Output - u32_le handle; - }; + /// Mapping of file descriptors to the devices they reference. + std::unordered_map<u32, std::shared_ptr<Devices::nvdevice>> open_files; - struct IocParamParams { - // Input - u32_le handle; - u32_le type; - // Output - u32_le value; - }; - - u32 IocCreate(const std::vector<u8>& input, std::vector<u8>& output); - u32 IocAlloc(const std::vector<u8>& input, std::vector<u8>& output); - u32 IocGetId(const std::vector<u8>& input, std::vector<u8>& output); - u32 IocFromId(const std::vector<u8>& input, std::vector<u8>& output); - u32 IocParam(const std::vector<u8>& input, std::vector<u8>& output); -}; - -class nvdisp_disp0 : public nvdevice { -public: - nvdisp_disp0(std::shared_ptr<nvmap> nvmap_dev) : nvdevice(), nvmap_dev(std::move(nvmap_dev)) {} - ~nvdisp_disp0() = default; - - u32 ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) override; - - /// Performs a screen flip, drawing the buffer pointed to by the handle. - void flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u32 height, u32 stride); - -private: - std::shared_ptr<nvmap> nvmap_dev; + /// Mapping of device node names to their implementation. + std::unordered_map<std::string, std::shared_ptr<Devices::nvdevice>> devices; }; /// Registers all NVDRV services with the specified service manager. void InstallInterfaces(SM::ServiceManager& service_manager); -} // namespace NVDRV +extern std::weak_ptr<Module> nvdrv; + +} // namespace Nvidia } // namespace Service |