[VM][Qt][FM16BETA] Fix FTBFS. Class name MAIN:: may not use for MinGW + SDL2.

diff --git a/source/src/qt/machines/fm16beta/MainWindow.cpp b/source/src/qt/machines/fm16beta/MainWindow.cpp
index b74097c..dfad600 100644 (file)
--- a/source/src/qt/machines/fm16beta/MainWindow.cpp
+++ b/source/src/qt/machines/fm16beta/MainWindow.cpp
@@ -35,7 +35,6 @@ void META_MainWindow::retranslateUi(void)
        retranslateFloppyMenu(2, 2, fdname320);
        retranslateFloppyMenu(3, 3, fdname320);
 
-       retranslate
 #ifdef USE_DEBUGGER
        actionDebugger[0]->setVisible(true);
        actionDebugger[1]->setVisible(true);

diff --git a/source/src/vm/fm16beta/CMakeLists.txt b/source/src/vm/fm16beta/CMakeLists.txt
index 72666ab..3db477d 100644 (file)
--- a/source/src/vm/fm16beta/CMakeLists.txt
+++ b/source/src/vm/fm16beta/CMakeLists.txt
@@ -5,7 +5,7 @@ message("* vm/fm16beta")
 set(VM_FM16BETA_LIB_SRCS
      cmos.cpp
      keyboard.cpp
-     main.cpp
+     mainbus.cpp
      sub.cpp
      fm16beta.cpp
 )

diff --git a/source/src/vm/fm16beta/fm16beta.cpp b/source/src/vm/fm16beta/fm16beta.cpp
index cfb5677..d57b333 100644 (file)
--- a/source/src/vm/fm16beta/fm16beta.cpp
+++ b/source/src/vm/fm16beta/fm16beta.cpp
@@ -32,7 +32,7 @@
 
 #include "cmos.h"
 #include "keyboard.h"
-#include "main.h"
+#include "mainbus.h"
 #include "sub.h"
 
 // ----------------------------------------------------------------------------
@@ -67,7 +67,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 
        cmos = new CMOS(this, emu);
        keyboard = new KEYBOARD(this, emu);
-       mainbus = new MAIN(this, emu);
+       mainbus = new MAINBUS(this, emu);
        
 
        

diff --git a/source/src/vm/fm16beta/fm16beta.h b/source/src/vm/fm16beta/fm16beta.h
index 0cc6691..c387f1f 100644 (file)
--- a/source/src/vm/fm16beta/fm16beta.h
+++ b/source/src/vm/fm16beta/fm16beta.h
@@ -86,7 +86,7 @@ class PCM1BIT;
 
 class CMOS;
 class KEYBOARD;
-class MAIN;
+class MAINBUS;
 class SUB;
 
 class VM
@@ -111,7 +111,7 @@ protected:
        PCM1BIT* pcm;
        
        CMOS* cmos;
-       MAIN* mainbus;
+       MAINBUS* mainbus;
        KEYBOARD* keyboard;
        SUB* subbus;
        

diff --git a/source/src/vm/fm16beta/keyboard.cpp b/source/src/vm/fm16beta/keyboard.cpp
index bf57ac2..fe70496 100644 (file)
--- a/source/src/vm/fm16beta/keyboard.cpp
+++ b/source/src/vm/fm16beta/keyboard.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "keyboard.h"
-#include "main.h"
+#include "mainbus.h"
 #include "../../fifo.h"
 
 

diff --git a/source/src/vm/fm16beta/main.cpp b/source/src/vm/fm16beta/mainbus.cpp
similarity index 93%
rename from source/src/vm/fm16beta/main.cpp
rename to source/src/vm/fm16beta/mainbus.cpp
index 098287f..c6391d3 100644 (file)
--- a/source/src/vm/fm16beta/main.cpp
+++ b/source/src/vm/fm16beta/mainbus.cpp
@@ -7,7 +7,7 @@
        [ main system ]
 */
 
-#include "main.h"
+#include "mainbus.h"
 #include "sub.h"
 #include "keyboard.h"
 #include "../disk.h"
@@ -16,8 +16,11 @@
 #include "../mb8877.h"
 #include "../msm58321.h"
 #include "../pcm1bit.h"
+#ifdef HAS_I286
+#include "../i286.h"
+#endif
 
-void MAIN::initialize()
+void MAINBUS::initialize()
 {
        MEMORY::initialize();
        
@@ -57,12 +60,12 @@ void MAIN::initialize()
        int0 = int1 = int2 = int3 = int4 = int5 = int6 = int7 = false;
 }
 
-void MAIN::release()
+void MAINBUS::release()
 {
        MEMORY::release();
 }
 
-void MAIN::reset()
+void MAINBUS::reset()
 {
        MEMORY::reset();
        
@@ -76,7 +79,7 @@ void MAIN::reset()
        d_pcm->write_signal(SIG_PCM1BIT_ON, 0, 0);
 }
 
-void MAIN::write_io8(uint32_t addr, uint32_t data)
+void MAINBUS::write_io8(uint32_t addr, uint32_t data)
 {
        uint8_t change;
        
@@ -184,7 +187,7 @@ void MAIN::write_io8(uint32_t addr, uint32_t data)
        }
 }
 
-uint32_t MAIN::read_io8(uint32_t addr)
+uint32_t MAINBUS::read_io8(uint32_t addr)
 {
        switch(addr) {
 #ifdef HAS_I286
@@ -254,7 +257,7 @@ uint32_t MAIN::read_io8(uint32_t addr)
        return 0xff;
 }
 
-void MAIN::write_signal(int id, uint32_t data, uint32_t mask)
+void MAINBUS::write_signal(int id, uint32_t data, uint32_t mask)
 {
        if(id == SIG_MAIN_IRQ0_TX) {
                irq0_tx = ((data & mask) != 0);
@@ -347,7 +350,7 @@ IRQ7                        -> INT7
        IRQ7: \83v\83\8a\83\93\83^
 */
 
-void MAIN::update_int0()
+void MAINBUS::update_int0()
 {
 //     bool prev = int0;
        int0 = (irq8 && (irq_enb & 0x10));
@@ -356,7 +359,7 @@ void MAIN::update_int0()
 //     }
 }
 
-void MAIN::update_int1()
+void MAINBUS::update_int1()
 {
 //     bool prev = int1;
        int1 = (irq1 && (irq_enb & 0x80)) || firq1;
@@ -365,7 +368,7 @@ void MAIN::update_int1()
 //     }
 }
 
-void MAIN::update_int2()
+void MAINBUS::update_int2()
 {
 //     bool prev = int2;
        int2 = (irq5 && (ext_irq_enb & 0x08)) || irq6;
@@ -374,7 +377,7 @@ void MAIN::update_int2()
 //     }
 }
 
-void MAIN::update_int3()
+void MAINBUS::update_int3()
 {
 //     bool prev = int3;
        int3 = firq0 || firq2 || firq3;
@@ -383,7 +386,7 @@ void MAIN::update_int3()
 //     }
 }
 
-void MAIN::update_int4()
+void MAINBUS::update_int4()
 {
 //     bool prev = int4;
        int4 = (irq0_tx && (irq_enb & 0x02)) || (irq0_rx && (irq_enb & 0x04)) || (irq0_syn && (irq_enb & 0x08));
@@ -392,7 +395,7 @@ void MAIN::update_int4()
 //     }
 }
 
-void MAIN::update_int5()
+void MAINBUS::update_int5()
 {
 //     bool prev = int5;
        int5 = irq2 || irq9;
@@ -401,7 +404,7 @@ void MAIN::update_int5()
 //     }
 }
 
-void MAIN::update_int6()
+void MAINBUS::update_int6()
 {
 //     bool prev = int6;
        int6 = (irq6 && (irq_enb & 0x20));
@@ -410,7 +413,7 @@ void MAIN::update_int6()
 //     }
 }
 
-void MAIN::update_int7()
+void MAINBUS::update_int7()
 {
 //     bool prev = int7;
        int7 = irq7 && (irq_enb & 0x01);
@@ -421,14 +424,14 @@ void MAIN::update_int7()
 
 #define STATE_VERSION  1
 
-void MAIN::save_state(FILEIO* state_fio)
+void MAINBUS::save_state(FILEIO* state_fio)
 {
        state_fio->FputUint32(STATE_VERSION);
        state_fio->FputInt32(this_device_id);
        
 }
 
-bool MAIN::load_state(FILEIO* state_fio)
+bool MAINBUS::load_state(FILEIO* state_fio)
 {
        if(state_fio->FgetUint32() != STATE_VERSION) {
                return false;

diff --git a/source/src/vm/fm16beta/main.h b/source/src/vm/fm16beta/mainbus.h
similarity index 94%
rename from source/src/vm/fm16beta/main.h
rename to source/src/vm/fm16beta/mainbus.h
index c5ae648..0d51272 100644 (file)
--- a/source/src/vm/fm16beta/main.h
+++ b/source/src/vm/fm16beta/mainbus.h
@@ -7,8 +7,8 @@
        [ main system ]
 */
 
-#ifndef _MAIN_H_
-#define _MAIN_H_
+#ifndef _MAINBUS_H_
+#define _MAINBUS_H_
 
 #include "../memory.h"
 
@@ -43,7 +43,7 @@ class I286;
 class I8237;
 class MB8877;
 
-class MAIN : public MEMORY
+class MAINBUS : public MEMORY
 {
 private:
 #ifdef HAS_I286
@@ -94,11 +94,11 @@ private:
        void update_int7();
        
 public:
-       MAIN(VM* parent_vm, EMU* parent_emu) : MEMORY(parent_vm, parent_emu)
+       MAINBUS(VM* parent_vm, EMU* parent_emu) : MEMORY(parent_vm, parent_emu)
        {
                set_device_name(_T("Main System"));
        }
-       ~MAIN() {}
+       ~MAINBUS() {}
        
        // common functions
        void initialize();

diff --git a/source/src/vm/fm16beta/sub.cpp b/source/src/vm/fm16beta/sub.cpp
index 92a1ec9..f6278fa 100644 (file)
--- a/source/src/vm/fm16beta/sub.cpp
+++ b/source/src/vm/fm16beta/sub.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "sub.h"
-#include "main.h"
+#include "mainbus.h"
 #include "../pcm1bit.h"
 
 void SUB::initialize()