[VM][FMTOWNS][SERIAL_ROM] Improve register sequence, and manipulate via read_io8...

diff --git a/source/src/vm/fmtowns/serialrom.cpp b/source/src/vm/fmtowns/serialrom.cpp
index 63f127c..ff6e47a 100644 (file)
--- a/source/src/vm/fmtowns/serialrom.cpp
+++ b/source/src/vm/fmtowns/serialrom.cpp
@@ -121,19 +121,21 @@ void SERIAL_ROM::reset()
 //     rom_addr = 0;
 }
 
-void SERIAL_ROM::write_signal(int ch, uint32_t data, uint32_t mask)
+void SERIAL_ROM::write_signal(int id, uint32_t data, uint32_t mask)
 {
-       switch(ch) {
+       switch(id) {
        case SIG_SERIALROM_CLK:
                {
                        bool oldclk = clk;
                        bool newclk = clk;
                        if(cs) {
                                newclk = ((data & mask) != 0);
+                       } else {
+                               return;
                        }
                        if((oldclk != newclk) && !(reset_reg)) {
                                clk = newclk;
-                               if(!(oldclk)) {
+                               if(clk) {
                                        // Rise up
                                        rom_addr = (rom_addr + 1) & 0xff;
                                }
@@ -148,19 +150,26 @@ void SERIAL_ROM::write_signal(int ch, uint32_t data, uint32_t mask)
                if((cs) && (clk)) {
                        switch(reset_state) {
                        case 0:
-                               if(reset_reg) reset_state++;
+                               if(!(reset_reg)) reset_state++;
                                break;
                        case 1:
+                               if(reset_reg) reset_state++;
+                               break;
+                       case 2:
                                if(!(reset_reg)) {
                                        // Do Reset
                                        rom_addr = 0;
                                        reset_state = 0;
+                                       reset_reg = false;
                                }
                                break;
                        default:
+                               reset_state = 0; // ToDo
                                break;
                        }
-                                       
+               }  else {
+                       // Reset reset state?
+                       reset_state = 0;
                }
                break;
        }
@@ -192,6 +201,30 @@ uint32_t SERIAL_ROM::read_signal(int ch)
        return 0;
 }
 
+uint32_t SERIAL_ROM::read_io8(uint32_t addr)
+{
+       uint8_t val = 0x00;
+       if(cs) {
+               val = (rom[rom_addr >> 3] >> (rom_addr & 7)) & 0x01;
+       } else {
+               val = 0x01;
+       }
+       val = val | 0x3e;
+       if(clk) val = val | 0x40;
+       if(reset_reg) val = val | 0x80;
+       return val;
+}
+
+void SERIAL_ROM::write_io8(uint32_t addr, uint32_t data)
+{
+       this->write_signal(SIG_SERIALROM_CS, data, 0x20);
+       if((data & 0x80) == 0) { // RESET not asserted
+               this->write_signal(SIG_SERIALROM_CLK, data, 0x40);
+               reset_reg = false;
+       }
+       this->write_signal(SIG_SERIALROM_RESET, data, 0x80);
+}
+
 bool SERIAL_ROM::write_debug_reg(const _TCHAR *reg, uint32_t data)
 {
        _TCHAR numseg[8] = {'\0'};

diff --git a/source/src/vm/fmtowns/serialrom.h b/source/src/vm/fmtowns/serialrom.h
index 0699bf2..fd4695e 100644 (file)
--- a/source/src/vm/fmtowns/serialrom.h
+++ b/source/src/vm/fmtowns/serialrom.h
@@ -40,9 +40,11 @@ public:
 
        void initialize();
        void reset();
+       void __FASTCALL write_io8(uint32_t addr, uint32_t data);
+       uint32_t __FASTCALL read_io8(uint32_t addr);
 
-       void write_signal(int ch, uint32_t data, uint32_t mask);
-       uint32_t read_signal(int ch);
+       void __FASTCALL write_signal(int id, uint32_t data, uint32_t mask);
+       uint32_t __FASTCALL read_signal(int ch);
 
        bool write_debug_reg(const _TCHAR *reg, uint32_t data);
        bool get_debug_regs_info(_TCHAR *buffer, size_t buffer_len);