service/csnd: Migrate to ServiceFramework

src/core/hle/service/csnd_snd.cpp

@@ -2,14 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cstring>
 #include "common/alignment.h"
-#include "core/hle/ipc.h"
+#include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/handle_table.h"
-#include "core/hle/kernel/mutex.h"
-#include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/csnd_snd.h"
-#include "core/memory.h"
 
 namespace Service {
 namespace CSND {
@@ -23,109 +18,83 @@ struct Type0Command {
 };
 static_assert(sizeof(Type0Command) == 0x20, "Type0Command structure size is wrong");
 
-static Kernel::SharedPtr<Kernel::SharedMemory> shared_memory = nullptr;
+void CSND_SND::Initialize(Kernel::HLERequestContext& ctx) {
-static Kernel::SharedPtr<Kernel::Mutex> mutex = nullptr;
+    IPC::RequestParser rp(ctx, 0x01, 5, 0);
-
+    u32 size = Common::AlignUp(rp.Pop<u32>(), Memory::PAGE_SIZE);
-/**
+    VAddr offset0 = rp.Pop<u32>();
- * CSND_SND::Initialize service function
+    VAddr offset1 = rp.Pop<u32>();
- *  Inputs:
+    VAddr offset2 = rp.Pop<u32>();
- *      0 : Header Code[0x00010140]
+    VAddr offset3 = rp.Pop<u32>();
- *      1 : Shared memory block size, for mem-block creation
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : Handle-list header
- *      3 : Mutex handle
- *      4 : Shared memory block handle
- */
-static void Initialize(Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    u32 size = Common::AlignUp(cmd_buff[1], Memory::PAGE_SIZE);
 
     using Kernel::MemoryPermission;
+    mutex = Kernel::Mutex::Create(false, "CSND:mutex");
     shared_memory = Kernel::SharedMemory::Create(nullptr, size, MemoryPermission::ReadWrite,
                                                  MemoryPermission::ReadWrite, 0,
                                                  Kernel::MemoryRegion::BASE, "CSND:SharedMemory");
 
-    mutex = Kernel::Mutex::Create(false, "CSND:mutex");
+    IPC::RequestBuilder rb = rp.MakeBuilder(1, 3);
+    rb.Push(RESULT_SUCCESS);
+    rb.PushCopyObjects(mutex, shared_memory);
 
-    cmd_buff[1] = RESULT_SUCCESS.raw;
+    LOG_WARNING(Service_CSND, "(STUBBED) called, size=0x{:08X} "
-    cmd_buff[2] = IPC::CopyHandleDesc(2);
+                              "offset0=0x{:08X} offset1=0x{:08X} offset2=0x{:08X} offset3=0x{:08X}",
-    cmd_buff[3] = Kernel::g_handle_table.Create(mutex).Unwrap();
+                              size, offset0, offset1, offset2, offset3);
-    cmd_buff[4] = Kernel::g_handle_table.Create(shared_memory).Unwrap();
+}
+
+void CSND_SND::Shutdown(Kernel::HLERequestContext& ctx) {
+    IPC::RequestParser rp(ctx, 0x02, 0, 0);
+
+    if (shared_memory) shared_memory = nullptr;
+    if (mutex) mutex = nullptr;
+
+    IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+    rb.Push(RESULT_SUCCESS);
 
     LOG_WARNING(Service_CSND, "(STUBBED) called");
 }
 
-/**
+void CSND_SND::ExecuteCommands(Kernel::HLERequestContext& ctx) {
- * CSND_SND::Shutdown service function
+    IPC::RequestParser rp(ctx, 0x03, 1, 0);
- *  Inputs:
+    VAddr addr = rp.Pop<u32>();
- *      0 : Header Code[0x00020000]
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- */
-static void Shutdown(Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
 
-    shared_memory = nullptr;
+    IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
-    mutex = nullptr;
+    if (!shared_memory) {
-
+        rb.Push<u32>(1);
-    cmd_buff[1] = RESULT_SUCCESS.raw;
+        rb.Skip(1, false);
-    LOG_WARNING(Service_CSND, "(STUBBED) called");
-}
-
-/**
- * CSND_SND::ExecuteCommands service function
- *  Inputs:
- *      0 : Header Code[0x00030040]
- *      1 : Command offset in shared memory.
- *  Outputs:
- *      1 : Result of function, 0 on success, otherwise error code
- *      2 : Available channel bit mask
- */
-static void ExecuteCommands(Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-
-    if (shared_memory == nullptr) {
-        cmd_buff[1] = 1;
         LOG_ERROR(Service_CSND, "called, shared memory not allocated");
-        return;
+    } else {
-    }
-
-    VAddr addr = cmd_buff[1];
         u8* ptr = shared_memory->GetPointer(addr);
-
         Type0Command command;
+
         std::memcpy(&command, ptr, sizeof(Type0Command));
         command.finished |= 1;
         std::memcpy(ptr, &command, sizeof(Type0Command));
 
-    cmd_buff[1] = RESULT_SUCCESS.raw;
+        rb.Push(RESULT_SUCCESS);
+        rb.Push<u32>(0xFFFFFF00);
+    }
 
     LOG_WARNING(Service_CSND, "(STUBBED) called, addr=0x{:08X}", addr);
 }
 
-/**
+void CSND_SND::AcquireSoundChannels(Kernel::HLERequestContext& ctx) {
- * CSND_SND::AcquireSoundChannels service function
+    IPC::RequestParser rp(ctx, 0x05, 0, 0);
- *  Inputs:
+
- *      0 : Header Code[0x00050000]
+    IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
- *  Outputs:
+    rb.Push(RESULT_SUCCESS);
- *      1 : Result of function, 0 on success, otherwise error code
+    rb.Push<u32>(0xFFFFFF00);
- *      2 : Available channel bit mask
+
- */
-static void AcquireSoundChannels(Interface* self) {
-    u32* cmd_buff = Kernel::GetCommandBuffer();
-    cmd_buff[1] = RESULT_SUCCESS.raw;
-    cmd_buff[2] = 0xFFFFFF00;
     LOG_WARNING(Service_CSND, "(STUBBED) called");
 }
 
-const Interface::FunctionInfo FunctionTable[] = {
+CSND_SND::CSND_SND() : ServiceFramework("csnd:SND", 4) {
-    {0x00010140, Initialize, "Initialize"},
+    static const FunctionInfo functions[] = {
-    {0x00020000, Shutdown, "Shutdown"},
+        // clang-format off
-    {0x00030040, ExecuteCommands, "ExecuteCommands"},
+        {0x00010140, &CSND_SND::Initialize, "Initialize"},
+        {0x00020000, &CSND_SND::Shutdown, "Shutdown"},
+        {0x00030040, &CSND_SND::ExecuteCommands, "ExecuteCommands"},
         {0x00040080, nullptr, "ExecuteType1Commands"},
-    {0x00050000, AcquireSoundChannels, "AcquireSoundChannels"},
+        {0x00050000, &CSND_SND::AcquireSoundChannels, "AcquireSoundChannels"},
         {0x00060000, nullptr, "ReleaseSoundChannels"},
         {0x00070000, nullptr, "AcquireCaptureDevice"},
         {0x00080040, nullptr, "ReleaseCaptureDevice"},
@@ -133,10 +102,14 @@ const Interface::FunctionInfo FunctionTable[] = {
         {0x000A0082, nullptr, "StoreDataCache"},
         {0x000B0082, nullptr, "InvalidateDataCache"},
         {0x000C0000, nullptr, "Reset"},
+        // clang-format on
+    };
+
+    RegisterHandlers(functions);
 };
 
-CSND_SND::CSND_SND() {
+void InstallInterfaces(SM::ServiceManager& service_manager) {
-    Register(FunctionTable);
+    std::make_shared<CSND_SND>()->InstallAsService(service_manager);
 }
 
 } // namespace CSND

src/core/hle/service/csnd_snd.h

@@ -4,19 +4,72 @@
 
 #pragma once
 
+#include "core/hle/kernel/mutex.h"
+#include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
 
 namespace Service {
 namespace CSND {
 
-class CSND_SND final : public Interface {
+class CSND_SND final : public ServiceFramework<CSND_SND> {
 public:
     CSND_SND();
+    ~CSND_SND() = default;
 
-    std::string GetPortName() const override {
+private:
-        return "csnd:SND";
+    /**
-    }
+     * CSND_SND::Initialize service function
+     *  Inputs:
+     *      0 : Header Code[0x00010140]
+     *      1 : Shared memory block size, for mem-block creation
+     *      2 : Offset0 located in the shared-memory, region size=8
+     *      3 : Offset1 located in the shared-memory, region size=12*num_channels
+     *      4 : Offset2 located in the shared-memory, region size=8*num_capturedevices
+     *      5 : Offset3 located in the shared-memory.
+     *  Outputs:
+     *      1 : Result of function, 0 on success, otherwise error code
+     *      2 : Handle-list header
+     *      3 : Mutex handle
+     *      4 : Shared memory block handle
+     */
+    void Initialize(Kernel::HLERequestContext& ctx);
+
+    /**
+     * CSND_SND::Shutdown service function
+     *  Inputs:
+     *      0 : Header Code[0x00020000]
+     *  Outputs:
+     *      1 : Result of function, 0 on success, otherwise error code
+     */
+    void Shutdown(Kernel::HLERequestContext& ctx);
+
+    /**
+     * CSND_SND::ExecuteCommands service function
+     *  Inputs:
+     *      0 : Header Code[0x00030040]
+     *      1 : Command offset in shared memory.
+     *  Outputs:
+     *      1 : Result of function, 0 on success, otherwise error code
+     *      2 : Available channel bit mask
+     */
+    void ExecuteCommands(Kernel::HLERequestContext& ctx);
+
+    /**
+     * CSND_SND::AcquireSoundChannels service function
+     *  Inputs:
+     *      0 : Header Code[0x00050000]
+     *  Outputs:
+     *      1 : Result of function, 0 on success, otherwise error code
+     *      2 : Available channel bit mask
+     */
+    void AcquireSoundChannels(Kernel::HLERequestContext& ctx);
+
+    Kernel::SharedPtr<Kernel::SharedMemory> shared_memory = nullptr;
+    Kernel::SharedPtr<Kernel::Mutex> mutex = nullptr;
 };
 
+/// Initializes the CSND_SND Service
+void InstallInterfaces(SM::ServiceManager& service_manager);
+
 } // namespace CSND
 } // namespace Service

src/core/hle/service/service.cpp

@@ -255,7 +255,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
     PTM::InstallInterfaces(*sm);
     QTM::InstallInterfaces(*sm);
 
-    AddService(new CSND::CSND_SND);
+    CSND::InstallInterfaces(*sm);
     AddService(new DSP_DSP::Interface);
     AddService(new HTTP::HTTP_C);
     PM::InstallInterfaces(*sm);