Merge pull request #1902 from nicolasnoble/psyqo-cd-cleanup

Some cleanup in the psyqo CD code.

Author: nicolasnoble

src/mips/psyqo-paths/src/cdrom-loader.cpp

@@ -46,8 +46,8 @@ void psyqo::paths::CDRomLoader::setupQueue(eastl::string_view path, GPU& gpu, ps
             task->resolve();
         })
         .then(parser.scheduleReadRequest(&m_request))
-        .butCatch([this](auto task) { m_request.entry.size = 0; })
-        .finally([this](auto task) {
+        .butCatch([this](auto queue) { m_request.entry.size = 0; })
+        .finally([this](auto queue) {
             m_pending = false;
             m_data.resize(m_request.entry.size);
             auto callback = eastl::move(m_callback);

src/mips/psyqo/cdrom.hh

@@ -122,7 +122,7 @@ class CDRom {
      * @param[in] request The request to schedule.
      * @return A task that can be queued into a `TaskQueue`
      */
-    TaskQueue::Task scheduleReadRequest(ReadRequest *request);
+    TaskQueue::Task scheduleReadRequest(const ReadRequest *request);
 
     /**
      * @brief Wrapper around the readSectors method for coroutines.

src/mips/psyqo/iso9660-parser.hh

@@ -163,7 +163,7 @@ class ISO9660Parser {
      *
      * @param[in] request The request to fill.
      */
-    TaskQueue::Task scheduleReadRequest(ReadRequest* request);
+    TaskQueue::Task scheduleReadRequest(const ReadRequest* request);
 
     /**
      * @brief Returns the state of the parser.

src/mips/psyqo/src/cdrom.cpp

@@ -36,7 +36,7 @@ psyqo::TaskQueue::Task psyqo::CDRom::scheduleReadSectors(uint32_t sector, uint32
     });
 }
 
-psyqo::TaskQueue::Task psyqo::CDRom::scheduleReadRequest(ReadRequest *request) {
+psyqo::TaskQueue::Task psyqo::CDRom::scheduleReadRequest(const ReadRequest *request) {
     return TaskQueue::Task([this, request](auto task) {
         readSectors(request->LBA, request->count, request->buffer, [task](bool success) { task->complete(success); });
     });

src/mips/psyqo/src/iso9660-parser.cpp

@@ -113,7 +113,7 @@ psyqo::TaskQueue::Task psyqo::ISO9660Parser::scheduleGetDirentry(eastl::string_v
         [this](auto task) { getDirentry(m_path, m_dirEntry, [task](bool success) { task->complete(success); }); });
 }
 
-psyqo::TaskQueue::Task psyqo::ISO9660Parser::scheduleReadRequest(ReadRequest* request) {
+psyqo::TaskQueue::Task psyqo::ISO9660Parser::scheduleReadRequest(const ReadRequest* request) {
     return TaskQueue::Task([this, request](auto task) {
         unsigned count = (request->entry.size + 2047) / 2048;
         m_cdrom->readSectors(request->entry.LBA, count, request->buffer,