Merge pull request #718 from johnbaumann/main

Add SIO1 Server + cdrom adjustments to support Unirom/NotPSXSerial

Author: nicolasnoble

src/core/cdrom.cc

@@ -69,6 +69,8 @@ class CDRomImpl : public PCSX::CDRom {
         CdlReadToc = 30,
     };
 
+    static const size_t cdCmdEnumCount = magic_enum::enum_count<Commands>();
+
     static const inline uint8_t Test04[] = {0};
     static const inline uint8_t Test05[] = {0};
     static const inline uint8_t Test20[] = {0x98, 0x06, 0x10, 0xC3};
@@ -915,6 +917,15 @@ class CDRomImpl : public PCSX::CDRom {
 
             case CdlID + 0x100:
                 SetResultSize(8);
+
+                 if (!m_iso.isActive()) {
+                    m_result[0] = 0x08;
+                    m_result[1] = 0x40;
+                    memset((char *)&m_result[2], 0, 6);
+                    m_stat = DiskError;
+                    break;
+                }
+
                 m_result[0] = m_statP;
                 m_result[1] = 0;
                 m_result[2] = 0;
@@ -1232,9 +1243,11 @@ class CDRomImpl : public PCSX::CDRom {
             m_ctrl &= ~0x20;
         }
 
-        if (m_OCUP) m_ctrl |= 0x40;
-        //  else
-        //      m_ctrl &= ~0x40;
+        if (m_OCUP) {
+            m_ctrl |= 0x40;
+        } else {
+            m_ctrl &= ~0x40;
+        }
 
         m_ctrl |= 0x18;
 
@@ -1276,7 +1289,12 @@ class CDRomImpl : public PCSX::CDRom {
         m_cmd = rt;
         m_OCUP = 0;
 
-        CDROM_IO_LOG("CD1 write: %x (%s)", rt, magic_enum::enum_names<Commands>()[rt]);
+        if (rt > cdCmdEnumCount) {
+            CDROM_IO_LOG("CD1 write: %x (CdlUnknown)", rt);
+        } else {
+            CDROM_IO_LOG("CD1 write: %x (%s)", rt, magic_enum::enum_names<Commands>()[rt]);
+        }
+   
         if (m_paramC) {
             CDROM_IO_LOG(" Param[%d] = {", m_paramC);
             for (i = 0; i < m_paramC; i++) CDROM_IO_LOG(" %x,", m_param[i]);
@@ -1342,6 +1360,7 @@ class CDRomImpl : public PCSX::CDRom {
         unsigned char ret;
 
         if (m_read == 0) {
+            m_OCUP = 0;
             ret = 0;
         } else {
             ret = m_transfer[m_transferIndex];
@@ -1658,8 +1677,13 @@ class CDRomImpl : public PCSX::CDRom {
                                     m_param[0]);
                 break;
             default:
-                PCSX::g_system->log(PCSX::LogClass::CDROM, "[CDROM]%s Command: %s\n", delayedString,
-                                    magic_enum::enum_names<Commands>()[command & 0xff]);
+                if ((command & 0xff) > cdCmdEnumCount) {
+                    PCSX::g_system->log(PCSX::LogClass::CDROM, "[CDROM]%s Command: CdlUnknown(0x%02X)\n", delayedString,
+                                        command & 0xff);
+                } else {
+                    PCSX::g_system->log(PCSX::LogClass::CDROM, "[CDROM]%s Command: %s\n", delayedString,
+                                        magic_enum::enum_names<Commands>()[command & 0xff]);
+                }
                 break;
         }
     }

src/core/logger.h

@@ -32,7 +32,8 @@ enum class LogClass : unsigned {
     MIPS,           // only the things coming from MIPS code
     UI,             // messages from the UI specifically
     SIO0,           // pad and memory card information
-    SIO1,           // uart information
+    SIO1,           // uart/sio1 information
+    SIO1SERVER,     // uart/sio1 server information
     GTE,            // gte information
     CDROM,          // low level cdrom information
     CDROM_IO,       // high level cdrom information (iso file access)

src/core/psxemulator.cc

@@ -31,6 +31,8 @@
 #include "core/pcsxlua.h"
 #include "core/ppf.h"
 #include "core/r3000a.h"
+#include "core/sio1.h"
+#include "core/sio1-server.h"
 #include "core/web-server.h"
 #include "gpu/soft/interface.h"
 #include "lua/luawrapper.h"
@@ -51,6 +53,8 @@ PCSX::Emulator::Emulator()
       m_gpu(new PCSX::SoftGPU::impl()),
       m_gdbServer(new PCSX::GdbServer()),
       m_webServer(new PCSX::WebServer()),
+      m_sio1(new PCSX::SIO1()),
+      m_sio1Server(new PCSX::SIO1Server()),
       m_debug(new PCSX::Debug()),
       m_hw(new PCSX::HW()),
       m_spu(new PCSX::SPU::impl()),
@@ -99,6 +103,7 @@ void PCSX::Emulator::EmuReset() {
     m_gpu->clearVRAM();
     m_pads->shutdown();
     m_pads->init();
+    m_sio1->sio1Reset();
 }
 
 void PCSX::Emulator::EmuShutdown() {

src/core/psxemulator.h

@@ -93,6 +93,8 @@ class SIO;
 class SPUInterface;
 class System;
 class WebServer;
+class SIO1;
+class SIO1Server;
 
 class Emulator;
 extern Emulator* g_emulator;
@@ -145,11 +147,13 @@ class Emulator {
         typedef Setting<uint32_t, TYPESTRING("KernelCallC0_00_1f"), 0xffffffff> KernelCallC0_00_1f;
         typedef Setting<bool, TYPESTRING("PCdrv"), false> PCdrv;
         typedef SettingPath<TYPESTRING("PCdrvBase")> PCdrvBase;
+        typedef Setting<bool, TYPESTRING("SIO1Server"), false> SIO1Server;
+        typedef Setting<int, TYPESTRING("SIO1ServerPort"), 6699> SIO1ServerPort;
         typedef Settings<Debug, Trace, KernelLog, FirstChanceException, SkipISR, LoggingCDROM, GdbServer, GdbManifest,
                          GdbLogSetting, GdbServerPort, GdbServerTrace, WebServer, WebServerPort, KernelCallA0_00_1f,
                          KernelCallA0_20_3f, KernelCallA0_40_5f, KernelCallA0_60_7f, KernelCallA0_80_9f,
                          KernelCallA0_a0_bf, KernelCallB0_00_1f, KernelCallB0_20_3f, KernelCallB0_40_5f,
-                         KernelCallC0_00_1f, PCdrv, PCdrvBase>
+                         KernelCallC0_00_1f, PCdrv, PCdrvBase, SIO1Server, SIO1ServerPort>
             type;
     };
     typedef SettingNested<TYPESTRING("Debug"), DebugSettings::type> SettingDebugSettings;
@@ -242,6 +246,8 @@ class Emulator {
     std::unique_ptr<Pads> m_pads;
     std::unique_ptr<R3000Acpu> m_psxCpu;
     std::unique_ptr<SIO> m_sio;
+    std::unique_ptr<SIO1> m_sio1;
+    std::unique_ptr<SIO1Server> m_sio1Server;
     std::unique_ptr<SPUInterface> m_spu;
     std::unique_ptr<WebServer> m_webServer;
 

src/core/psxhw.cc

@@ -54,11 +54,27 @@ uint8_t PCSX::HW::psxHwRead8(uint32_t add) {
         case 0x1f801040:
             hard = PCSX::g_emulator->m_sio->sioRead8();
             break;
-#ifdef ENABLE_SIO1API
-        case 0x1f801050:
-            hard = SIO1_readData8();
+        case 0x1f801050:  // rx/tx data register
+            hard = PCSX::g_emulator->m_sio1->readData8();
+            SIO1_LOG("SIO1.DATA read8 %x; ret = %x\n", add & 0xf, hard);
+            break;
+        case 0x1f801054:  // stat register
+            hard = PCSX::g_emulator->m_sio1->readStat8();
+            // Log command below is overly spammy
+            //SIO1_LOG("SIO1.STAT read8 %x; ret = %x\n", add & 0xf, hard);
+            break;
+        case 0x1f801058:  // mode register
+            hard = PCSX::g_emulator->m_sio1->readMode8();
+            SIO1_LOG("SIO1.MODE read8 %x; ret = %x\n", add & 0xf, hard);
+            break;
+        case 0x1f80105a: // control register
+            hard = PCSX::g_emulator->m_sio1->readCtrl8();
+            SIO1_LOG("SIO1.CTRL read8 %x; ret = %x\n", add & 0xf, hard);
+            break;
+        case 0x1f80105e: // baudrate register
+            hard = PCSX::g_emulator->m_sio1->readBaud8();
+            SIO1_LOG("SIO1.BAUD read8 %x; ret = %x\n", add & 0xf, hard);
             break;
-#endif
         case 0x1f801800:
             hard = PCSX::g_emulator->m_cdrom->read0();
             break;
@@ -127,35 +143,36 @@ uint16_t PCSX::HW::psxHwRead16(uint32_t add) {
             hard = PCSX::g_emulator->m_sio->readBaud16();
             SIO0_LOG("sio read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-#ifdef ENABLE_SIO1API
-        case 0x1f801050:
-            hard = SIO1_readData16();
-            SIO1_LOG("sio1 read16 %x; ret = %x\n", add & 0xf, hard);
+        case 0x1f801050:  // rx/tx data register
+            hard = PCSX::g_emulator->m_sio1->readData16();
+            SIO1_LOG("SIO1.DATA read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-        case 0x1f801054:
-            hard = SIO1_readStat16();
-            SIO1_LOG("sio1 read16 %x; ret = %x\n", add & 0xf, hard);
+        case 0x1f801054:  // stat register
+            hard = PCSX::g_emulator->m_sio1->readStat16();
+            // Log command below is overly spammy
+            //SIO1_LOG("SIO1.STAT read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-        case 0x1f801058:
-            hard = SIO1_readMode16();
-            SIO1_LOG("sio1 read16 %x; ret = %x\n", add & 0xf, hard);
+        case 0x1f801058:  // mode register
+            hard = PCSX::g_emulator->m_sio1->readMode16();
+            SIO1_LOG("SIO1.MODE read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-        case 0x1f80105a:
-            hard = SIO1_readCtrl16();
-            SIO1_LOG("sio1 read16 %x; ret = %x\n", add & 0xf, hard);
+        case 0x1f80105a:  // control register
+            hard = PCSX::g_emulator->m_sio1->readCtrl16();
+            SIO1_LOG("SIO1.CTRL read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-        case 0x1f80105e:
-            hard = SIO1_readBaud16();
-            SIO1_LOG("sio1 read16 %x; ret = %x\n", add & 0xf, hard);
+        case 0x1f80105e:  // baudrate register
+            hard = PCSX::g_emulator->m_sio1->readBaud16();
+            SIO1_LOG("SIO1.BAUD read16 %x; ret = %x\n", add & 0xf, hard);
             return hard;
-#else
         /* Fixes Armored Core misdetecting the Link cable being detected.
          * We want to turn that thing off and force it to do local multiplayer instead.
          * Thanks Sony for the fix, they fixed it in their PS Classic fork.
          */
+        /* Stat's value set in SIO1/m_sio1, Armored Core local multiplayer is working.
         case 0x1f801054:
             return 0x80;
-#endif
+        */
+
         case 0x1f801100:
             hard = PCSX::g_emulator->m_psxCounters->psxRcntRcount(0);
             PSXHW_LOG("T0 count read16: %x\n", hard);
@@ -228,12 +245,15 @@ uint32_t PCSX::HW::psxHwRead32(uint32_t add) {
             hard |= PCSX::g_emulator->m_sio->sioRead8() << 24;
             SIO0_LOG("sio read32 ;ret = %x\n", hard);
             return hard;
-#ifdef ENABLE_SIO1API
-        case 0x1f801050:
-            hard = SIO1_readData32();
-            SIO1_LOG("sio1 read32 ;ret = %x\n", hard);
+        case 0x1f801050:  // rx/tx data register
+            hard = PCSX::g_emulator->m_sio1->readData32();
+            SIO1_LOG("SIO1.DATA read32 ;ret = %x\n", hard);
+            return hard;
+        case 0x1f801054:  // stat register
+            hard = PCSX::g_emulator->m_sio1->readStat32();
+            // Log command below is overly spammy
+            //SIO1_LOG("SIO1.STAT read32 ;ret = %x\n", hard);
             return hard;
-#endif
         case 0x1f801060:
             PSXHW_LOG("RAM size read %x\n", psxHu32(0x1060));
             return psxHu32(0x1060);
@@ -341,11 +361,26 @@ void PCSX::HW::psxHwWrite8(uint32_t add, uint8_t value) {
         case 0x1f801040:
             PCSX::g_emulator->m_sio->write8(value);
             break;
-#ifdef ENABLE_SIO1API
-        case 0x1f801050:
-            SIO1_writeData8(value);
+        case 0x1f801050:    // rx/tx data register
+            PCSX::g_emulator->m_sio1->writeData8(value);
+            SIO1_LOG("SIO1.DATA write8 %x; ret = %x\n", add & 0xf, value);
+            break;
+        case 0x1f801054:    // stat register
+            PCSX::g_emulator->m_sio1->writeStat8(value);
+            SIO1_LOG("SIO1.STAT write8 %x; ret = %x\n", add & 0xf, value);
+            break;
+        case 0x1f801058:  // mode register
+            PCSX::g_emulator->m_sio1->writeMode8(value);
+            SIO1_LOG("SIO1.MODE write8 %x; ret = %x\n", add & 0xf, value);
+            break;
+        case 0x1f80105a:  // control register
+            PCSX::g_emulator->m_sio1->writeCtrl8(value);
+            SIO1_LOG("SIO1.CTRL write8 %x; ret = %x\n", add & 0xf, value);
+            break;
+        case 0x1f80105e:  // baudrate register
+            PCSX::g_emulator->m_sio1->writeBaud8(value);
+            SIO1_LOG("SIO1.Baud write8 %x; ret = %x\n", add & 0xf, value);
             break;
-#endif
         case 0x1f801800:
             PCSX::g_emulator->m_cdrom->write0(value);
             break;
@@ -403,28 +438,26 @@ void PCSX::HW::psxHwWrite16(uint32_t add, uint16_t value) {
             PCSX::g_emulator->m_sio->writeBaud16(value);
             SIO0_LOG("sio write16 %x, %x\n", add & 0xf, value);
             return;
-#ifdef ENABLE_SIO1API
-        case 0x1f801050:
-            SIO1_writeData16(value);
-            SIO1_LOG("sio1 write16 %x, %x\n", add & 0xf, value);
+        case 0x1f801050: // rx/tx data register
+            PCSX::g_emulator->m_sio1->writeData16(value);
+            SIO1_LOG("SIO1.DATA write16 %x, %x\n", add & 0xf, value);
             return;
-        case 0x1f801054:
-            SIO1_writeStat16(value);
-            SIO1_LOG("sio1 write16 %x, %x\n", add & 0xf, value);
+        case 0x1f801054: // stat register
+            PCSX::g_emulator->m_sio1->writeStat16(value);
+            SIO1_LOG("SIO1.STAT write16 %x, %x\n", add & 0xf, value);
             return;
-        case 0x1f801058:
-            SIO1_writeMode16(value);
-            SIO1_LOG("sio1 write16 %x, %x\n", add & 0xf, value);
+        case 0x1f801058: // mode register
+            PCSX::g_emulator->m_sio1->writeMode16(value);
+            SIO1_LOG("SIO1.MODE write16 %x, %x\n", add & 0xf, value);
             return;
-        case 0x1f80105a:
-            SIO1_writeCtrl16(value);
-            SIO1_LOG("sio1 write16 %x, %x\n", add & 0xf, value);
+        case 0x1f80105a: // control register
+            PCSX::g_emulator->m_sio1->writeCtrl16(value);
+            SIO1_LOG("SIO1.CTRL write16 %x, %x\n", add & 0xf, value);
             return;
-        case 0x1f80105e:
-            SIO1_writeBaud16(value);
-            SIO1_LOG("sio1 write16 %x, %x\n", add & 0xf, value);
+        case 0x1f80105e: // baudrate register
+            PCSX::g_emulator->m_sio1->writeBaud16(value);
+            SIO1_LOG("SIO1.BAUD write16 %x, %x\n", add & 0xf, value);
             return;
-#endif
         case 0x1f801070:
             PSXHW_LOG("IREG 16bit write %x\n", value);
             if (PCSX::g_emulator->settings.get<PCSX::Emulator::SettingSpuIrq>())
@@ -533,12 +566,14 @@ void PCSX::HW::psxHwWrite32(uint32_t add, uint32_t value) {
             PCSX::g_emulator->m_sio->write8((unsigned char)((value & 0xff) >> 24));
             SIO0_LOG("sio write32 %x\n", value);
             return;
-#ifdef ENABLE_SIO1API
         case 0x1f801050:
-            SIO1_writeData32(value);
-            SIO1_LOG("sio1 write32 %x\n", value);
+            PCSX::g_emulator->m_sio1->writeData32(value);
+            SIO1_LOG("SIO1.DATA write32 %x\n", value);
+            return;
+        case 0x1f801054:
+            PCSX::g_emulator->m_sio1->writeStat32(value);
+            SIO1_LOG("SIO1.STAT write32 %x\n", value);
             return;
-#endif
         case 0x1f801060:
             PSXHW_LOG("RAM size write %x\n", value);
             psxHu32ref(add) = SWAP_LEu32(value);

src/core/psxhw.h

@@ -24,6 +24,7 @@
 #include "core/psxmem.h"
 #include "core/r3000a.h"
 #include "core/sio.h"
+#include "core/sio1.h"
 
 #define HW_DMA0_MADR (psxHu32ref(0x1080))  // MDEC in DMA
 #define HW_DMA0_BCR (psxHu32ref(0x1084))

src/core/r3000a.cc

@@ -328,6 +328,7 @@ void PCSX::R3000Acpu::psxBranchTest() {
         };
 
         checkAndUpdate(PSXINT_SIO, []() { g_emulator->m_sio->interrupt(); });
+        checkAndUpdate(PSXINT_SIO1, []() { g_emulator->m_sio1->interrupt(); });
         checkAndUpdate(PSXINT_CDR, []() { g_emulator->m_cdrom->interrupt(); });
         checkAndUpdate(PSXINT_CDREAD, []() { g_emulator->m_cdrom->readInterrupt(); });
         checkAndUpdate(PSXINT_GPUDMA, []() { GPU::gpuInterrupt(); });

src/core/r3000a.h

@@ -164,6 +164,7 @@ typedef union {
 
 enum {
     PSXINT_SIO = 0,
+    PSXINT_SIO1,
     PSXINT_CDR,
     PSXINT_CDREAD,
     PSXINT_GPUDMA,
@@ -308,7 +309,7 @@ class R3000Acpu {
     }
 
     psxRegisters m_psxRegs;
-    float m_interruptScales[14] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f};
+    float m_interruptScales[15] = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f};
     bool m_shellStarted = false;
 
     virtual void Reset() {