Address review concerns and suggestions

Author: johnbaumann

src/mips/psyqo/cdrom-commandbuffer.hh

@@ -31,6 +31,8 @@ SOFTWARE.
 #include <concepts>
 #include <type_traits>
 
+namespace psyqo::Hardware::CDRom {
+
 template <typename T>
 concept CDRomArgumentType = std::is_integral<T>::value;
 
@@ -53,3 +55,4 @@ struct CDRomCommandBuffer {
         recursiveSet(pos + 1, args...);
     }
 };
+} // namespace psyqo::Hardware::CDRom

src/mips/psyqo/cdrom-device.hh

@@ -418,9 +418,9 @@ class CDRomDevice final : public CDRom {
      *
      * @param callback The callback to call when the command operation is complete.
      */
-    void test(CDRomCommandBuffer commandBuffer, eastl::function<void(bool)> &&callback);
-    TaskQueue::Task scheduleTest(CDRomCommandBuffer commandBuffer);
-    void testBlocking(GPU &, CDRomCommandBuffer commandBuffer);
+    void test(const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer, eastl::function<void(bool)> &&callback);
+    TaskQueue::Task scheduleTest(const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer);
+    void testBlocking(GPU &, const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer);
 
     /**
      * @brief The action base class for the internal state machine.

src/mips/psyqo/examples/cdrom-demo/cdrom-demo.cpp

@@ -27,6 +27,7 @@ SOFTWARE.
 #include "common/syscalls/syscalls.h"
 #include "psyqo/application.hh"
 #include "psyqo/cdrom-device.hh"
+#include "psyqo/cdrom-commandbuffer.hh"
 #include "psyqo/font.hh"
 #include "psyqo/gpu.hh"
 #include "psyqo/scene.hh"
@@ -75,6 +76,11 @@ void CDRomDemo::createScene() {
             syscall_puts("Failure\n");
         }
     });
+
+
+    psyqo::Hardware::CDRom::CDRomCommandBuffer commandBuffer;
+    commandBuffer.set(0x50, 0xf2, 0xde, 0xad);
+    m_cdrom.testBlocking(gpu(), commandBuffer);
 }
 
 void CDRomDemoScene::frame() {

src/mips/psyqo/src/cdrom-device-test.cpp

@@ -43,14 +43,18 @@ class TestAction : public psyqo::CDRomDevice::Action<TestActionState> {
   public:
     TestAction() : Action("TestAction") {}
 
-    void start(psyqo::CDRomDevice *device, CDRomCommandBuffer commandBuffer, eastl::function<void(bool)> &&callback) {
+    void start(psyqo::CDRomDevice *device, const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer,
+               eastl::function<void(bool)> &&callback) {
         psyqo::Kernel::assert(device->isIdle(), "CDRomDevice::test() called while another action is in progress");
         registerMe(device);
         setCallback(eastl::move(callback));
         setState(TestActionState::TEST);
         eastl::atomic_signal_fence(eastl::memory_order_release);
         psyqo::Hardware::CDRom::Command.send(psyqo::Hardware::CDRom::CDL::TEST, commandBuffer);
     }
+    void start(psyqo::CDRomDevice *device, eastl::function<void(bool)> &&callback) {
+        start(device, m_commandBuffer, eastl::move(callback));
+    }
     bool complete(const psyqo::CDRomDevice::Response &) override {
         setSuccess(true);
         return true;
@@ -59,23 +63,29 @@ class TestAction : public psyqo::CDRomDevice::Action<TestActionState> {
         setSuccess(true);
         return true;
     }
+
+    psyqo::Hardware::CDRom::CDRomCommandBuffer m_commandBuffer;
 };
 
 TestAction s_testAction;
 
 }  // namespace
 
-void psyqo::CDRomDevice::test(CDRomCommandBuffer commandBuffer, eastl::function<void(bool)> &&callback) {
+void psyqo::CDRomDevice::test(const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer,
+                              eastl::function<void(bool)> &&callback) {
     Kernel::assert(m_callback == nullptr, "CDRomDevice::test called with pending action");
     s_testAction.start(this, commandBuffer, eastl::move(callback));
 }
 
-psyqo::TaskQueue::Task psyqo::CDRomDevice::scheduleTest(CDRomCommandBuffer commandBuffer) {
+psyqo::TaskQueue::Task psyqo::CDRomDevice::scheduleTest(
+    const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer) {
+    s_testAction.m_commandBuffer = commandBuffer;
+
     return TaskQueue::Task(
-        [this, commandBuffer](auto task) { test(commandBuffer, [task](bool success) { task->complete(success); }); });
+        [this](auto task) { s_testAction.start(this, [task](bool success) { task->complete(success); }); });
 }
 
-void psyqo::CDRomDevice::testBlocking(GPU &gpu, CDRomCommandBuffer commandBuffer) {
+void psyqo::CDRomDevice::testBlocking(GPU &gpu, const psyqo::Hardware::CDRom::CDRomCommandBuffer &commandBuffer) {
     Kernel::assert(m_callback == nullptr, "CDRomDevice::testBlocking called with pending action");
     bool success = false;
     {