summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp2
-rw-r--r--src/core/hle/kernel/hle_ipc.h5
-rw-r--r--src/core/hle/service/glue/arp.cpp3
3 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 9bc72da02..36cf750de 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -325,7 +325,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_threa
325 return ResultSuccess; 325 return ResultSuccess;
326} 326}
327 327
328std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const { 328std::vector<u8> HLERequestContext::ReadBufferCopy(std::size_t buffer_index) const {
329 const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && 329 const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
330 BufferDescriptorA()[buffer_index].Size()}; 330 BufferDescriptorA()[buffer_index].Size()};
331 if (is_buffer_a) { 331 if (is_buffer_a) {
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 2242ff922..27f9628c7 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -271,9 +271,10 @@ public:
271 return domain_message_header.has_value(); 271 return domain_message_header.has_value();
272 } 272 }
273 273
274 /// Helper function to read a buffer using the appropriate buffer descriptor 274 /// Helper function to read a copy of a buffer using the appropriate buffer descriptor
275 [[nodiscard]] std::vector<u8> ReadBuffer(std::size_t buffer_index = 0) const; 275 [[nodiscard]] std::vector<u8> ReadBufferCopy(std::size_t buffer_index = 0) const;
276 276
277 /// Helper function to get a span of a buffer using the appropriate buffer descriptor
277 [[nodiscard]] std::span<const u8> ReadBufferSpan(std::size_t buffer_index = 0) const; 278 [[nodiscard]] std::span<const u8> ReadBufferSpan(std::size_t buffer_index = 0) const;
278 279
279 /// Helper function to write a buffer using the appropriate buffer descriptor 280 /// Helper function to write a buffer using the appropriate buffer descriptor
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp
index 49b6d45fe..ce21b69e3 100644
--- a/src/core/hle/service/glue/arp.cpp
+++ b/src/core/hle/service/glue/arp.cpp
@@ -228,7 +228,8 @@ private:
228 return; 228 return;
229 } 229 }
230 230
231 control = ctx.ReadBuffer(); 231 // TODO: Can this be a span?
232 control = ctx.ReadBufferCopy();
232 233
233 IPC::ResponseBuilder rb{ctx, 2}; 234 IPC::ResponseBuilder rb{ctx, 2};
234 rb.Push(ResultSuccess); 235 rb.Push(ResultSuccess);