summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-09 08:52:30 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-11 22:07:33 +0200
commit20e5abb30807d4e0e34c79c049252f0872e47ca7 (patch)
tree54284838ca89629576a046807b6965fe11507880 /src/core/hle/kernel
parentRemove unused import in break_points.cpp (#2763) (diff)
downloadyuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar.gz
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar.bz2
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar.lz
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar.xz
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.tar.zst
yuzu-20e5abb30807d4e0e34c79c049252f0872e47ca7.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/hle_ipc.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index c30184eab..aa0046001 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -4,8 +4,11 @@
#pragma once
+#include <array>
#include <memory>
#include <vector>
+#include "common/common_types.h"
+#include "core/hle/ipc.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/server_session.h"
@@ -65,8 +68,8 @@ public:
~HLERequestContext();
/// Returns a pointer to the IPC command buffer for this request.
- u32* CommandBuffer() const {
- return cmd_buf;
+ u32* CommandBuffer() {
+ return cmd_buf.data();
}
/**
@@ -80,7 +83,7 @@ public:
private:
friend class Service::ServiceFrameworkBase;
- u32* cmd_buf = nullptr;
+ std::array<u32, IPC::COMMAND_BUFFER_LENGTH> cmd_buf;
SharedPtr<ServerSession> session;
};