diff options
author | bunnei <bunneidev@gmail.com> | 2018-02-08 03:53:31 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-02-08 04:55:12 +0100 |
commit | 196f8dff084b7229982af214617d55ca084dfed2 (patch) | |
tree | 0d2f60713d7a0035409640e88ff1c7d6b7762cbe /src/core/hle/service/nvdrv/devices/nvmap.cpp | |
parent | nvhost_as_gpu: Add nvmap as a class member. (diff) | |
download | yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar.gz yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar.bz2 yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar.lz yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar.xz yuzu-196f8dff084b7229982af214617d55ca084dfed2.tar.zst yuzu-196f8dff084b7229982af214617d55ca084dfed2.zip |
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvmap.cpp')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvmap.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index cb3692689..02b33374a 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp @@ -13,10 +13,8 @@ namespace Nvidia { namespace Devices { VAddr nvmap::GetObjectAddress(u32 handle) const { - auto itr = handles.find(handle); - ASSERT(itr != handles.end()); - - auto object = itr->second; + auto object = GetObject(handle); + ASSERT(object); ASSERT(object->status == Object::Status::Allocated); return object->addr; } @@ -52,7 +50,7 @@ u32 nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) { u32 handle = next_handle++; handles[handle] = std::move(object); - LOG_WARNING(Service_NVDRV, "(STUBBED) size 0x%08X", params.size); + LOG_DEBUG(Service_NVDRV, "size=0x%08X", params.size); params.handle = handle; @@ -64,17 +62,16 @@ u32 nvmap::IocAlloc(const std::vector<u8>& input, std::vector<u8>& output) { IocAllocParams params; std::memcpy(¶ms, input.data(), sizeof(params)); - auto itr = handles.find(params.handle); - ASSERT(itr != handles.end()); + auto object = GetObject(params.handle); + ASSERT(object); - auto object = itr->second; object->flags = params.flags; object->align = params.align; object->kind = params.kind; object->addr = params.addr; object->status = Object::Status::Allocated; - LOG_WARNING(Service_NVDRV, "(STUBBED) Allocated address 0x%llx", params.addr); + LOG_DEBUG(Service_NVDRV, "called, addr=0x%llx", params.addr); std::memcpy(output.data(), ¶ms, sizeof(params)); return 0; @@ -86,10 +83,10 @@ u32 nvmap::IocGetId(const std::vector<u8>& input, std::vector<u8>& output) { LOG_WARNING(Service_NVDRV, "called"); - auto itr = handles.find(params.handle); - ASSERT(itr != handles.end()); + auto object = GetObject(params.handle); + ASSERT(object); - params.id = itr->second->id; + params.id = object->id; std::memcpy(output.data(), ¶ms, sizeof(params)); return 0; @@ -123,10 +120,8 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) { LOG_WARNING(Service_NVDRV, "(STUBBED) called type=%u", params.type); - auto itr = handles.find(params.handle); - ASSERT(itr != handles.end()); - - auto object = itr->second; + auto object = GetObject(params.handle); + ASSERT(object); ASSERT(object->status == Object::Status::Allocated); switch (static_cast<ParamTypes>(params.type)) { |