[VM][N5200][PASOPIA][PC2001][TK80][X07] Fix FTBFSs.

diff --git a/source/src/vm/n5200/n5200.cpp b/source/src/vm/n5200/n5200.cpp
index 29053d9..ee980e9 100644 (file)
--- a/source/src/vm/n5200/n5200.cpp
+++ b/source/src/vm/n5200/n5200.cpp
@@ -62,8 +62,8 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        cpu->set_device_name(_T("CPU(i386)"));
        sio_r->set_device_name(_T("i8251 SIO(RS-232C)"));
        sio_k->set_device_name(_T("i8251 SIO(KEYBOARD)"));
-       pio_r->set_device_name(_T("i8255 PIO(SYSTEM PORT)"));
-       pio_k->set_device_name(_T("i8255 PIO(PRINTER)"));
+       pio_s->set_device_name(_T("i8255 PIO(SYSTEM PORT)"));
+       pio_p->set_device_name(_T("i8255 PIO(PRINTER)"));
        gdc_c->set_device_name(_T("uPD7220 GDC(CHARACTER)"));
        gdc_g->set_device_name(_T("uPD7220 GDC(GRAPHICS)"));
 #endif 

diff --git a/source/src/vm/pasopia/joypac2.h b/source/src/vm/pasopia/joypac2.h
index c6a099e..ae99062 100644 (file)
--- a/source/src/vm/pasopia/joypac2.h
+++ b/source/src/vm/pasopia/joypac2.h
@@ -20,11 +20,7 @@ class JOYPAC2 : public PAC2DEV
 private:
        const uint32_t* joy;
 public:
-       JOYPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("JOY PAC2"));
-#endif
-       }
+       JOYPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~JOYPAC2() {}
        
        // common functions

diff --git a/source/src/vm/pasopia/kanjipac2.h b/source/src/vm/pasopia/kanjipac2.h
index fb24c29..17a2005 100644 (file)
--- a/source/src/vm/pasopia/kanjipac2.h
+++ b/source/src/vm/pasopia/kanjipac2.h
@@ -21,11 +21,7 @@ private:
        uint8_t rom[0x20000];
        uint32_t ptr;
 public:
-       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("KANJI PAC2"));
-#endif
-       }
+       KANJIPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~KANJIPAC2() {}
        
        // common functions

diff --git a/source/src/vm/pasopia/pac2.cpp b/source/src/vm/pasopia/pac2.cpp
index f0f0dc7..c0d1bbf 100644 (file)
--- a/source/src/vm/pasopia/pac2.cpp
+++ b/source/src/vm/pasopia/pac2.cpp
@@ -19,9 +19,6 @@ void PAC2::initialize()
        kanji = new KANJIPAC2(vm, emu);
        joy = new JOYPAC2(vm, emu);
        dummy = new PAC2DEV(vm, emu);
-#if defined(_USE_QT)
-       dummy->set_device_name(_T("DUMMY PAC2"));
-#endif 
        rampac2->initialize(1);
        kanji->initialize(1);
        joy->initialize(1);

diff --git a/source/src/vm/pasopia/pac2dev.h b/source/src/vm/pasopia/pac2dev.h
index 2214b79..4709e55 100644 (file)
--- a/source/src/vm/pasopia/pac2dev.h
+++ b/source/src/vm/pasopia/pac2dev.h
@@ -20,11 +20,7 @@ protected:
        VM* vm;
        EMU* emu;
 public:
-       PAC2DEV(VM* parent_vm, EMU* parent_emu) : vm(parent_vm), emu(parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("PAC2 DEVICE"));
-#endif
-       }
+       PAC2DEV(VM* parent_vm, EMU* parent_emu) : vm(parent_vm), emu(parent_emu) {}
        ~PAC2DEV(void) {}
        
        virtual void initialize(int id) {}

diff --git a/source/src/vm/pasopia/rampac2.h b/source/src/vm/pasopia/rampac2.h
index 5c49438..e02e7f2 100644 (file)
--- a/source/src/vm/pasopia/rampac2.h
+++ b/source/src/vm/pasopia/rampac2.h
@@ -24,11 +24,7 @@ private:
        bool opened, modified;
        
 public:
-       RAMPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {
-#if defined(_USE_QT)
-               set_device_name(_T("RAM PAC2"));
-#endif
-       }
+       RAMPAC2(VM* parent_vm, EMU* parent_emu) : PAC2DEV(parent_vm, parent_emu) {}
        ~RAMPAC2() {}
        
        // common functions

diff --git a/source/src/vm/pc2001/pc2001.cpp b/source/src/vm/pc2001/pc2001.cpp
index a96dd5d..b39e29d 100644 (file)
--- a/source/src/vm/pc2001/pc2001.cpp
+++ b/source/src/vm/pc2001/pc2001.cpp
@@ -55,7 +55,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        lcd[1]->set_device_name(_T("uPD16434 LCD CONTROLLER #2"));
        lcd[2]->set_device_name(_T("uPD16434 LCD CONTROLLER #3"));
        lcd[3]->set_device_name(_T("uPD16434 LCD CONTROLLER #4"));
-       cpu->set_device_name(_T("CPU(uPD7810)");
+       cpu->set_device_name(_T("CPU(uPD7810)"));
 #endif 
        
        io = new IO(this, emu);

diff --git a/source/src/vm/rx78/rx78.cpp b/source/src/vm/rx78/rx78.cpp
index 19899fc..726eb37 100644 (file)
--- a/source/src/vm/rx78/rx78.cpp
+++ b/source/src/vm/rx78/rx78.cpp
@@ -56,7 +56,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        vdp = new VDP(this, emu);
 #if defined(_USE_QT)
        cmt->set_device_name(_T("CMT I/F"));
-       keyboard->set_device_name(_T("KEYBOARD I/F"));
+       key->set_device_name(_T("KEYBOARD I/F"));
        memory->set_device_name(_T("MEMORY"));
        prt->set_device_name(_T("PRINTER I/F"));
        vdp->set_device_name(_T("VIDEO"));

diff --git a/source/src/vm/tk80bs/tk80bs.cpp b/source/src/vm/tk80bs/tk80bs.cpp
index 5bbac02..9d88961 100644 (file)
--- a/source/src/vm/tk80bs/tk80bs.cpp
+++ b/source/src/vm/tk80bs/tk80bs.cpp
@@ -59,7 +59,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        pio_t->set_device_name(_T("i8255 PIO(TK-80/SOUND/KEYBOARD/DISPLAY)"));
        pcm0->set_device_name(_T("PCM SOUND #1"));
        pcm1->set_device_name(_T("PCM SOUND #2"));
-       cpu->set_device_name(_T("CPU(i8080)");
+       cpu->set_device_name(_T("CPU(i8080)"));
 #endif 
        
        cmt = new CMT(this, emu);

diff --git a/source/src/vm/x07/x07.cpp b/source/src/vm/x07/x07.cpp
index 5b7b3f2..50f967f 100644 (file)
--- a/source/src/vm/x07/x07.cpp
+++ b/source/src/vm/x07/x07.cpp
@@ -40,7 +40,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        memory = new MEMORY(this, emu);
        cpu = new Z80(this, emu);
 #if defined(_USE_QT)
-       cpu->set_device_name(_T("CPU(Z80)");
+       cpu->set_device_name(_T("CPU(Z80)"));
 #endif 
        
        io = new IO(this, emu);