1 files changed, 17 insertions, 112 deletions

diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index 4c21f5024..c2f481624 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -143,120 +143,25 @@ struct DataPayloadHeader {
 };
 static_assert(sizeof(DataPayloadHeader) == 8, "DataPayloadRequest size is incorrect");
 
-struct DomainRequestMessageHeader {
+struct DomainMessageHeader {
     union {
-        BitField<0, 8, u32_le> command;
-        BitField<16, 16, u32_le> size;
+        // Used when responding to an IPC request, Server -> Client.
+        struct {
+            u32_le num_objects;
+            INSERT_PADDING_WORDS(3);
+        };
+
+        // Used when performing an IPC request, Client -> Server.
+        struct {
+            union {
+                BitField<0, 8, u32_le> command;
+                BitField<16, 16, u32_le> size;
+            };
+            u32_le object_id;
+            INSERT_PADDING_WORDS(2);
+        };
     };
-    u32_le object_id;
-    INSERT_PADDING_WORDS(2);
-};
-static_assert(sizeof(DomainRequestMessageHeader) == 16, "DomainRequestMessageHeader size is incorrect");
-
-struct DomainResponseMessageHeader {
-    u32_le num_objects;
-    INSERT_PADDING_WORDS(3);
-};
-static_assert(sizeof(DomainResponseMessageHeader) == 16, "DomainResponseMessageHeader size is incorrect");
-
-enum DescriptorType : u32 {
-    // Buffer related desciptors types (mask : 0x0F)
-    StaticBuffer = 0x02,
-    PXIBuffer = 0x04,
-    MappedBuffer = 0x08,
-    // Handle related descriptors types (mask : 0x30, but need to check for buffer related
-    // descriptors first )
-    CopyHandle = 0x00,
-    MoveHandle = 0x10,
-    CallingPid = 0x20,
-};
-
-constexpr u32 MoveHandleDesc(u32 num_handles = 1) {
-    return MoveHandle | ((num_handles - 1) << 26);
-}
-
-constexpr u32 CopyHandleDesc(u32 num_handles = 1) {
-    return CopyHandle | ((num_handles - 1) << 26);
-}
-
-constexpr u32 CallingPidDesc() {
-    return CallingPid;
-}
-
-constexpr bool IsHandleDescriptor(u32 descriptor) {
-    return (descriptor & 0xF) == 0x0;
-}
-
-constexpr u32 HandleNumberFromDesc(u32 handle_descriptor) {
-    return (handle_descriptor >> 26) + 1;
-}
-
-union StaticBufferDescInfo {
-    u32 raw;
-    BitField<0, 4, u32> descriptor_type;
-    BitField<10, 4, u32> buffer_id;
-    BitField<14, 18, u32> size;
 };
-
-inline u32 StaticBufferDesc(size_t size, u8 buffer_id) {
-    StaticBufferDescInfo info{};
-    info.descriptor_type.Assign(StaticBuffer);
-    info.buffer_id.Assign(buffer_id);
-    info.size.Assign(static_cast<u32>(size));
-    return info.raw;
-}
-
-/**
- * @brief Creates a header describing a buffer to be sent over PXI.
- * @param size         Size of the buffer. Max 0x00FFFFFF.
- * @param buffer_id    The Id of the buffer. Max 0xF.
- * @param is_read_only true if the buffer is read-only. If false, the buffer is considered to have
- * read-write access.
- * @return The created PXI buffer header.
- *
- * The next value is a phys-address of a table located in the BASE memregion.
- */
-inline u32 PXIBufferDesc(u32 size, unsigned buffer_id, bool is_read_only) {
-    u32 type = PXIBuffer;
-    if (is_read_only)
-        type |= 0x2;
-    return type | (size << 8) | ((buffer_id & 0xF) << 4);
-}
-
-enum MappedBufferPermissions : u32 {
-    R = 1,
-    W = 2,
-    RW = R | W,
-};
-
-union MappedBufferDescInfo {
-    u32 raw;
-    BitField<0, 4, u32> flags;
-    BitField<1, 2, MappedBufferPermissions> perms;
-    BitField<4, 28, u32> size;
-};
-
-inline u32 MappedBufferDesc(size_t size, MappedBufferPermissions perms) {
-    MappedBufferDescInfo info{};
-    info.flags.Assign(MappedBuffer);
-    info.perms.Assign(perms);
-    info.size.Assign(static_cast<u32>(size));
-    return info.raw;
-}
-
-inline DescriptorType GetDescriptorType(u32 descriptor) {
-    // Note: Those checks must be done in this order
-    if (IsHandleDescriptor(descriptor))
-        return (DescriptorType)(descriptor & 0x30);
-
-    // handle the fact that the following descriptors can have rights
-    if (descriptor & MappedBuffer)
-        return MappedBuffer;
-
-    if (descriptor & PXIBuffer)
-        return PXIBuffer;
-
-    return StaticBuffer;
-}
+static_assert(sizeof(DomainMessageHeader) == 16, "DomainMessageHeader size is incorrect");
 
 } // namespace IPC