Просмотр исходного кода

hle_ipc: Rename ReadBuffer to ReadBufferCopy

Indicates explicitly that a copy is occurring
ameerj 3 лет назад
Родитель
Сommit
59c0f85407
3 измененных файлов с 6 добавлено и 4 удалено
  1. 1 1
      src/core/hle/kernel/hle_ipc.cpp
  2. 3 2
      src/core/hle/kernel/hle_ipc.h
  3. 2 1
      src/core/hle/service/glue/arp.cpp

+ 1 - 1
src/core/hle/kernel/hle_ipc.cpp

@@ -325,7 +325,7 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_threa
     return ResultSuccess;
     return ResultSuccess;
 }
 }
 
 
-std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const {
+std::vector<u8> HLERequestContext::ReadBufferCopy(std::size_t buffer_index) const {
     const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
     const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
                            BufferDescriptorA()[buffer_index].Size()};
                            BufferDescriptorA()[buffer_index].Size()};
     if (is_buffer_a) {
     if (is_buffer_a) {

+ 3 - 2
src/core/hle/kernel/hle_ipc.h

@@ -271,9 +271,10 @@ public:
         return domain_message_header.has_value();
         return domain_message_header.has_value();
     }
     }
 
 
-    /// Helper function to read a buffer using the appropriate buffer descriptor
-    [[nodiscard]] std::vector<u8> ReadBuffer(std::size_t buffer_index = 0) const;
+    /// Helper function to read a copy of a buffer using the appropriate buffer descriptor
+    [[nodiscard]] std::vector<u8> ReadBufferCopy(std::size_t buffer_index = 0) const;
 
 
+    /// Helper function to get a span of a buffer using the appropriate buffer descriptor
     [[nodiscard]] std::span<const u8> ReadBufferSpan(std::size_t buffer_index = 0) const;
     [[nodiscard]] std::span<const u8> ReadBufferSpan(std::size_t buffer_index = 0) const;
 
 
     /// Helper function to write a buffer using the appropriate buffer descriptor
     /// Helper function to write a buffer using the appropriate buffer descriptor

+ 2 - 1
src/core/hle/service/glue/arp.cpp

@@ -228,7 +228,8 @@ private:
             return;
             return;
         }
         }
 
 
-        control = ctx.ReadBuffer();
+        // TODO: Can this be a span?
+        control = ctx.ReadBufferCopy();
 
 
         IPC::ResponseBuilder rb{ctx, 2};
         IPC::ResponseBuilder rb{ctx, 2};
         rb.Push(ResultSuccess);
         rb.Push(ResultSuccess);