OSDN Git Service

[VM}[FM7][PC8801][X1] At least enable to build FM7,PC8801 and X1 (excepts X!Twin).
[csp-qt/common_source_project-fm7.git] / source / src / vm / fm7 / fm7.cpp
index 62dc54b..adc2ca0 100644 (file)
 #if defined(HAS_DMA)
 #include "hd6844.h"
 #endif
+#if defined(_FM77L4)
+#include "../hd46505.h"
+#endif
+
 #if defined(_FM8)
 #include "./bubblecasette.h"
 #endif
 
+#if defined(_FM8)
+#include "./fm8_mainio.h"
+#else
 #include "./fm7_mainio.h"
+#endif
 #include "./fm7_mainmem.h"
 #include "./fm7_display.h"
 #include "./fm7_keyboard.h"
 #include "./jcommcard.h"
 #endif
 
-VM::VM(EMU* parent_emu): emu(parent_emu)
+#if defined(USE_BUBBLE)
+using FM7::BUBBLECASETTE;
+#endif
+using FM7::DISPLAY;
+#if defined(CAPABLE_JCOMMCARD)
+using FM7::FM7_JCOMMCARD;
+#endif
+
+#if defined(_FM8)
+using FM7::FM8_MAINIO;
+#else
+using FM7::FM7_MAINIO;
+#endif
+using FM7::FM7_MAINMEM;
+using FM7::JOYSTICK;
+using FM7::KEYBOARD;
+using FM7::KANJIROM;
+
+VM::VM(EMU* parent_emu): VM_TEMPLATE(parent_emu)
 {
        
        first_device = last_device = NULL;
@@ -72,8 +98,8 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        
        dummy = new DEVICE(this, emu);  // must be 1st device
        event = new EVENT(this, emu);   // must be 2nd device
-       
-       dummycpu = new DEVICE(this, emu);
+
+       //dummycpu = new DEVICE(this, emu);
        maincpu = new MC6809(this, emu);
        subcpu = new MC6809(this, emu);
        g_substat_display = new AND(this, emu);
@@ -83,15 +109,21 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
 #ifdef WITH_Z80
        if((config.dipswitch & FM7_DIPSW_Z80CARD_ON) != 0) {
                z80cpu = new Z80(this, emu);
+               g_mainstat = new AND(this, emu);
+               g_intr = new OR(this, emu);
+               
+               g_intr_irq = new AND(this, emu);
+               g_intr_firq = new AND(this, emu);
+               g_nmi = new AND(this, emu);
        } else {
                z80cpu = NULL;
-       }
-       g_mainstat = new AND(this, emu);
-       g_intr = new OR(this, emu);
+               g_mainstat = NULL;
+               g_intr = NULL;
 
-       g_intr_irq = new AND(this, emu);
-       g_intr_firq = new AND(this, emu);
-       g_nmi = new AND(this, emu);
+               g_intr_irq = NULL;
+               g_intr_firq = NULL;
+               g_nmi = NULL;
+       }
 #endif
 #if defined(CAPABLE_JCOMMCARD)
        if((config.dipswitch & FM7_DIPSW_JSUBCARD_ON) != 0) {
@@ -104,7 +136,8 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
                g_jsubhalt = NULL;
        }
 #endif
-# if defined(_FM77AV40) || defined(_FM77AV40SX) || defined(_FM77AV40EX) || defined(_FM77AV20) || defined(_FM77AV20EX)
+# if defined(_FM77AV40) || defined(_FM77AV40SX) || defined(_FM77AV40EX) || defined(_FM77AV20) \
+       || defined(_FM77AV20EX) || defined(_FM8)
        uart[0] = new I8251(this, emu);
 # else
 #  if defined(CAPABLE_JCOMMCARD)
@@ -116,11 +149,14 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        if((config.dipswitch & FM7_DIPSW_MIDI_ON) != 0) uart[2] = new I8251(this, emu);
 
                
+
+#if defined(_FM77AV_VARIANTS)
+       alu = new MB61VH010(this, emu);
+       keyboard_beep = new BEEP(this, emu);
+#endif 
+
        // basic devices
        // I/Os
-#if defined(HAS_DMA)
-       dmac = new HD6844(this, emu);
-#endif   
 #if defined(_FM8)
 #  if defined(USE_AY_3_8910_AS_PSG)
        psg = new AY_3_891X(this, emu);
@@ -139,6 +175,10 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
 #  endif
 # endif        
 #endif
+
+#if defined(HAS_DMA)
+       dmac = new HD6844(this, emu);
+#endif   
 #if defined(_FM8)
        for(int i = 0; i < 2; i++) bubble_casette[i] = new BUBBLECASETTE(this, emu);
 #endif
@@ -151,44 +191,42 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
 
        connect_320kfdc = connect_1Mfdc = false;
        fdc = NULL;
+#if defined(HAS_2HD)
+       fdc_2HD = NULL;
+#endif
+
 #if defined(_FM8) || defined(_FM7) || defined(_FMNEW7)
-       if(((config.dipswitch & FM7_DIPSW_CONNECT_320KFDC) != 0) ||
-          ((config.dipswitch & FM7_DIPSW_CONNECT_1MFDC) != 0)) {
-#endif         
+       if((config.dipswitch & FM7_DIPSW_CONNECT_320KFDC) != 0) {
                fdc = new MB8877(this, emu);
                fdc->set_context_noise_seek(new NOISE(this, emu));
                fdc->set_context_noise_head_down(new NOISE(this, emu));
                fdc->set_context_noise_head_up(new NOISE(this, emu));
-#if defined(_FM8) || defined(_FM7) || defined(_FMNEW7)
-               if((config.dipswitch & FM7_DIPSW_CONNECT_320KFDC) != 0) {
-                       connect_320kfdc = true;
-               }
-               if((config.dipswitch & FM7_DIPSW_CONNECT_1MFDC) != 0) {
-                       connect_1Mfdc = true;
-               }
-#elif defined(_FM77_VARIANTS)
                connect_320kfdc = true;
-               if((config.dipswitch & FM7_DIPSW_CONNECT_1MFDC) != 0) {
-                       connect_1Mfdc = true;
-               }
-#else  // AV or later.
+       }
+#else
+       {
+               fdc = new MB8877(this, emu);
+               fdc->set_context_noise_seek(new NOISE(this, emu));
+               fdc->set_context_noise_head_down(new NOISE(this, emu));
+               fdc->set_context_noise_head_up(new NOISE(this, emu));
                connect_320kfdc = true;
-               // 1MFDD??
+       }
 #endif         
-#if defined(_FM8) || defined(_FM7) || defined(_FMNEW7)
+#if defined(HAS_2HD)
+       if((config.dipswitch & FM7_DIPSW_CONNECT_1MFDC) != 0) {
+               fdc_2HD = new MB8877(this, emu);
+               fdc_2HD->set_context_noise_seek(new NOISE(this, emu));
+               fdc_2HD->set_context_noise_head_down(new NOISE(this, emu));
+               fdc_2HD->set_context_noise_head_up(new NOISE(this, emu));
+               connect_1Mfdc = true;
        }
-#endif 
+#endif
+       
        joystick  = new JOYSTICK(this, emu);
        printer = new PRNFILE(this, emu);
-#if defined(_FM77AV_VARIANTS)
-       alu = new MB61VH010(this, emu);
-       keyboard_beep = new BEEP(this, emu);
-#endif 
-       keyboard = new KEYBOARD(this, emu);
-       display = new DISPLAY(this, emu);       
-
-       mainio  = new FM7_MAINIO(this, emu);
-       mainmem = new FM7_MAINMEM(this, emu);
+#if defined(_FM77L4)
+       l4crtc = new HD46505(this, emu);;
+#endif
 
 #if defined(_FM8) || defined(_FM7) || defined(_FMNEW7)
        if((config.dipswitch & FM7_DIPSW_CONNECT_KANJIROM) != 0) {
@@ -203,6 +241,18 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        kanjiclass2 = new KANJIROM(this, emu, true);
 #endif
 
+
+       keyboard = new KEYBOARD(this, emu);
+       //display = new DISPLAY(this, emu);
+#if defined(_FM8)
+       mainio  = new FM8_MAINIO(this, emu);
+#else
+       mainio  = new FM7_MAINIO(this, emu);
+#endif
+       mainmem = new FM7_MAINMEM(this, emu);
+       display = new DISPLAY(this, emu);
+
+
 # if defined(_FM77AV20) || defined(_FM77AV40) || defined(_FM77AV20EX) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
        g_rs232c_dtr = new AND(this, emu);
        g_rs232c_dtr->set_mask(SIG_AND_BIT_0);
@@ -211,12 +261,13 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        // DCD
 #endif
 #ifdef WITH_Z80
-       g_mainstat->set_mask(SIG_AND_BIT_0);
-       g_mainstat->set_mask(SIG_AND_BIT_1);
-       maincpu->set_context_bus_ba(g_mainstat, SIG_AND_BIT_0, 0xffffffff);
-       maincpu->set_context_bus_bs(g_mainstat, SIG_AND_BIT_1, 0xffffffff);
-       g_mainstat->set_context_out(mainio, FM7_MAINIO_RUN_Z80, 0xffffffff);
-
+       if(g_mainstat != NULL) {
+               g_mainstat->set_mask(SIG_AND_BIT_0);
+               g_mainstat->set_mask(SIG_AND_BIT_1);
+               maincpu->set_context_bus_ba(g_mainstat, SIG_AND_BIT_0, 0xffffffff);
+               maincpu->set_context_bus_bs(g_mainstat, SIG_AND_BIT_1, 0xffffffff);
+               g_mainstat->set_context_out(mainio, FM7_MAINIO_RUN_Z80, 0xffffffff);
+       }
        if(z80cpu != NULL) {
                z80cpu->set_context_busack(mainio, FM7_MAINIO_RUN_6809, 0xffffffff);
                mainio->set_context_z80cpu(z80cpu);
@@ -228,7 +279,6 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        
        maincpu->set_device_name(_T("MAINCPU(MC6809B)"));
        subcpu->set_device_name(_T("SUBCPU(MC6809B)"));
-       dummycpu->set_device_name(_T("DUMMY CPU"));
 #if defined(CAPABLE_JCOMMCARD)
        if(jsubcpu != NULL) {
                jsubcpu->set_device_name(_T("J.COMM BOARD CPU(MC6809)"));
@@ -239,11 +289,14 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        if(g_jsubhalt != NULL) {
                g_jsubhalt->set_device_name(_T("J.COMM BOARD HALT(MC6809)"));
        }
+# endif
 # ifdef WITH_Z80
        if(z80cpu != NULL) z80cpu->set_device_name(_T("Z80 CPU BOARD"));
 # endif
        if(fdc != NULL) fdc->set_device_name(_T("MB8877 FDC(320KB)"));
-       
+#if defined(HAS_2HD)
+       if(fdc_2HD != NULL) fdc_2HD->set_device_name(_T("MB8877 FDC(1MB/2HD)"));
+#endif 
        if(uart[0] != NULL) {
                uart[0]->set_device_name(_T("RS-232C BOARD(I8251 SIO)"));
        }
@@ -251,7 +304,8 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
        if((config.dipswitch & FM7_DIPSW_JSUBCARD_ON) != 0) {
                if(uart[0] != NULL) uart[0]->set_device_name(_T("J.COMM BOARD RS-232C(I8251 SIO)"));
        }
-# elif defined(_FM77AV20) || defined(_FM77AV40) || defined(_FM77AV20EX) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
+# elif defined(_FM77AV20) || defined(_FM77AV40) || defined(_FM77AV20EX) || \
+       defined(_FM77AV40EX) || defined(_FM77AV40SX) || defined(_FM8)
        if(uart[0] != NULL) uart[0]->set_device_name(_T("RS-232C(I8251 SIO)"));
 # endif
                
@@ -273,7 +327,6 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
 #  if !defined(_FM77AV_VARIANTS)
        psg->set_device_name(_T("AY-3-8910 PSG"));
 #  endif
-# endif
        pcm1bit->set_device_name(_T("BEEP"));
        printer->set_device_name(_T("PRINTER I/F"));
 # if defined(_FM77AV_VARIANTS)
@@ -291,18 +344,20 @@ VM::VM(EMU* parent_emu): emu(parent_emu)
 # if defined(_FM77AV20) || defined(_FM77AV40) || defined(_FM77AV20EX) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
        g_rs232c_dtr->set_device_name(_T("RS232C DTR(AND)"));
 #endif
+#if defined(_FM77L4)
+       l4crtc->set_device_name(_T("CRTC OF 400LINES BOARD"));
+#endif
 #ifdef WITH_Z80
-       g_intr->set_device_name(_T("Z80 INTR(OR)"));
-       g_mainstat->set_device_name(_T("Z80 HALT/RUN(AND)"));
-       g_intr_irq->set_device_name(_T("Z80 IRQ(AND)"));
-       g_intr_firq->set_device_name(_T("Z80 FIRQ(AND)"));
-       g_nmi->set_device_name(_T("Z80 NMI(AND)"));
+       if(g_intr != NULL) g_intr->set_device_name(_T("Z80 INTR(OR)"));
+       if(g_mainstat != NULL) g_mainstat->set_device_name(_T("Z80 HALT/RUN(AND)"));
+       if(g_intr_irq != NULL) g_intr_irq->set_device_name(_T("Z80 IRQ(AND)"));
+       if(g_intr_firq != NULL) g_intr_firq->set_device_name(_T("Z80 FIRQ(AND)"));
+       if(g_nmi != NULL) g_nmi->set_device_name(_T("Z80 NMI(AND)"));
 #endif
        g_substat_display->set_device_name(_T("DISPLAY STATUS(AND)"));
        g_substat_mainhalt->set_device_name(_T("SUBSYSTEM HALT STATUS(AND)"));
 #endif 
        this->connect_bus();
-       
 }
 
 VM::~VM()
@@ -351,55 +406,38 @@ void VM::connect_bus(void)
         */
        event->set_frames_per_sec(FRAMES_PER_SEC);
        event->set_lines_per_frame(LINES_PER_FRAME);
-       //event->set_context_cpu(dummycpu, (CPU_CLOCKS * 3) / 8); // MAYBE FIX With eFM77AV40/20.
-       // With slow clock (for dummycpu), some softwares happen troubles,
-       // Use faster clock for dummycpu. 20160319 K.Ohta
-       event->set_context_cpu(dummycpu, SUBCLOCK_NORMAL);
+       mainclock = CPU_CLOCKS; // Hack
+       subclock = SUBCLOCK_NORMAL;
 
-#if defined(_FM8)
-       mainclock = MAINCLOCK_SLOW;
-       subclock = SUBCLOCK_SLOW;
-#else
-       if(config.cpu_type == 0) {
-               // 2MHz
-               subclock = SUBCLOCK_NORMAL;
-               mainclock = MAINCLOCK_NORMAL;
-       } else {
-               // 1.2MHz
-               mainclock = MAINCLOCK_SLOW;
-               subclock = SUBCLOCK_SLOW;
-       }
-       //if((config.dipswitch & FM7_DIPSW_CYCLESTEAL) != 0) subclock = subclock / 3;
-#endif
        event->set_context_cpu(maincpu, mainclock);
-       event->set_context_cpu(subcpu,  subclock);
+       event->set_context_cpu(subcpu,  subclock);      
    
 #ifdef WITH_Z80
        if(z80cpu != NULL) {
                event->set_context_cpu(z80cpu,  4000000);
                z80cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
-       }
-       maincpu->write_signal(SIG_CPU_HALTREQ, 0, 1);
 
-       g_intr_irq->set_mask(SIG_AND_BIT_0);
-       g_intr_irq->set_mask(SIG_AND_BIT_1);
-       
-       g_intr_firq->set_mask(SIG_AND_BIT_0);
-       g_intr_firq->set_mask(SIG_AND_BIT_1);
+               g_intr_irq->set_mask(SIG_AND_BIT_0);
+               g_intr_irq->set_mask(SIG_AND_BIT_1);
+               
+               g_intr_firq->set_mask(SIG_AND_BIT_0);
+               g_intr_firq->set_mask(SIG_AND_BIT_1);
        
-       g_nmi->set_mask(SIG_AND_BIT_0);
-       g_nmi->set_mask(SIG_AND_BIT_1);
+               g_nmi->set_mask(SIG_AND_BIT_0);
+               g_nmi->set_mask(SIG_AND_BIT_1);
 
-       mainio->set_context_irq(g_intr_irq, SIG_AND_BIT_1, 0xffffffff);
-       g_intr_irq->set_context_out(g_intr, SIG_OR_BIT_0, 0xffffffff);
-       
-       mainio->set_context_firq(g_intr_firq, SIG_AND_BIT_1, 0xffffffff);
-       g_intr_firq->set_context_out(g_intr, SIG_OR_BIT_0, 0xffffffff);
+               mainio->set_context_irq(g_intr_irq, SIG_AND_BIT_1, 0xffffffff);
+               g_intr_irq->set_context_out(g_intr, SIG_OR_BIT_0, 0xffffffff);
        
-       if(z80cpu != NULL) g_intr->set_context_out(z80cpu, SIG_CPU_IRQ, 0xffffffff);
+               mainio->set_context_firq(g_intr_firq, SIG_AND_BIT_1, 0xffffffff);
+               g_intr_firq->set_context_out(g_intr, SIG_OR_BIT_0, 0xffffffff);
+               
+               g_intr->set_context_out(z80cpu, SIG_CPU_IRQ, 0xffffffff);
 
-       mainio->set_context_nmi(g_nmi, SIG_AND_BIT_1, 0xffffffff);
-       if(z80cpu != NULL) g_nmi->set_context_out(z80cpu, SIG_CPU_NMI, 0xffffffff);
+               mainio->set_context_nmi(g_nmi, SIG_AND_BIT_1, 0xffffffff);
+               g_nmi->set_context_out(z80cpu, SIG_CPU_NMI, 0xffffffff);
+       }
+       maincpu->write_signal(SIG_CPU_HALTREQ, 0, 1);
 #endif
 #if defined(CAPABLE_JCOMMCARD)
        if((jsubcpu != NULL) && (jcommcard != NULL)) {
@@ -433,6 +471,13 @@ void VM::connect_bus(void)
                event->set_context_sound(fdc->get_context_noise_head_down());
                event->set_context_sound(fdc->get_context_noise_head_up());
        }
+#if defined(HAS_2HD)
+       if(fdc_2HD != NULL) {
+               event->set_context_sound(fdc_2HD->get_context_noise_seek());
+               event->set_context_sound(fdc_2HD->get_context_noise_head_down());
+               event->set_context_sound(fdc_2HD->get_context_noise_head_up());
+       }
+#endif
        if(drec != NULL) {
                event->set_context_sound(drec->get_context_noise_play());
                event->set_context_sound(drec->get_context_noise_stop());
@@ -443,8 +488,8 @@ void VM::connect_bus(void)
 # endif
 #endif   
 #if !defined(_FM77AV_VARIANTS) && !defined(_FM77L4)
-       event->register_vline_event(display);
-       event->register_frame_event(display);
+       //event->register_vline_event(display);
+       //event->register_frame_event(display);
 #endif 
        mainio->set_context_maincpu(maincpu);
        mainio->set_context_subcpu(subcpu);
@@ -523,7 +568,10 @@ void VM::connect_bus(void)
        display->set_context_mainio(mainio);
        display->set_context_subcpu(subcpu);
        display->set_context_keyboard(keyboard);
-
+#if defined(_FM77L4)
+       display->set_context_l4crtc(l4crtc);
+#endif
+       
        mainio->set_context_clock_status(mainmem, FM7_MAINIO_CLOCKMODE, 0xffffffff);
        mainio->set_context_clock_status(display, SIG_DISPLAY_CLOCK, 0xffffffff);
 
@@ -552,16 +600,27 @@ void VM::connect_bus(void)
 #endif 
        // Palette, VSYNC, HSYNC, Multi-page, display mode. 
        mainio->set_context_display(display);
 #if defined(_FM8) || (_FM7) || (_FMNEW7)
-       if(connect_320kfdc || connect_1Mfdc) {
-#endif         
-               //FDC
-               fdc->set_context_irq(mainio, FM7_MAINIO_FDC_IRQ, 0x1);
-               fdc->set_context_drq(mainio, FM7_MAINIO_FDC_DRQ, 0x1);
-               mainio->set_context_fdc(fdc);
+       if(connect_320kfdc) {
+#endif
+               if(fdc != NULL) {
+                       //FDC
+                       fdc->set_context_irq(mainio, FM7_MAINIO_FDC_IRQ, 0x1);
+                       fdc->set_context_drq(mainio, FM7_MAINIO_FDC_DRQ, 0x1);
+                       mainio->set_context_fdc(fdc);
+               }
 #if defined(_FM8) || (_FM7) || (_FMNEW7)
        }
 #endif 
+#if defined(HAS_2HD)
+       if(connect_1Mfdc && (fdc_2HD != NULL)) {
+               //FDC
+               fdc_2HD->set_context_irq(mainio, FM7_MAINIO_FDC_IRQ_2HD, 0x1);
+               fdc_2HD->set_context_drq(mainio, FM7_MAINIO_FDC_DRQ_2HD, 0x1);
+               mainio->set_context_fdc_2HD(fdc_2HD);
+       }
+#endif 
        // SOUND
        mainio->set_context_beep(pcm1bit);
 #if defined(_FM8)      
@@ -581,7 +640,7 @@ void VM::connect_bus(void)
        opn[2]->set_context_irq(mainio, FM7_MAINIO_THG_IRQ, 0xffffffff);
        mainio->set_context_opn(opn[2], 2);
 #endif   
-       subcpu->set_context_bus_clr(display, SIG_FM7_SUB_USE_CLR, 0x0000000f);
+       //subcpu->set_context_bus_clr(display, SIG_FM7_SUB_USE_CLR, 0x0000000f);
    
        event->register_frame_event(joystick);
 #if defined(HAS_DMA)
@@ -593,8 +652,10 @@ void VM::connect_bus(void)
 #endif
        
        // MEMORIES must set before initialize().
+       //dummycpu->set_context_mem(dummy);
        maincpu->set_context_mem(mainmem);
        subcpu->set_context_mem(display);
+       //dummycpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
 #ifdef WITH_Z80
        if(z80cpu != NULL) z80cpu->set_context_mem(mainmem);
 #endif
@@ -615,45 +676,51 @@ void VM::connect_bus(void)
        }
 # endif
 #endif
+
+#if defined(__GIT_REPO_VERSION)
+       strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+#endif
+
+#if defined(__GIT_REPO_VERSION)
+       strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+#endif
        for(DEVICE* device = first_device; device; device = device->next_device) {
                device->initialize();
        }
 
 #if defined(WITH_Z80)
-       g_intr_irq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_IRQ_ON) != 0) ? 1 : 0, 1);
-       g_intr_firq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_FIRQ_ON) != 0) ? 1 : 0, 1);
-       g_nmi->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_NMI_ON) != 0) ? 1 : 0, 1);
+       if(g_intr_irq != NULL) g_intr_irq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_IRQ_ON) != 0) ? 1 : 0, 1);
+       if(g_intr_firq != NULL) g_intr_firq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_FIRQ_ON) != 0) ? 1 : 0, 1);
+       if(g_nmi != NULL) g_nmi->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_NMI_ON) != 0) ? 1 : 0, 1);
 #endif
        // Disks
 #if defined(_FM8) || (_FM7) || (_FMNEW7)
        if(connect_320kfdc) {
-#endif         
-               for(int i = 0; i < 4; i++) {
+#endif
+               if(fdc != NULL) {
+                       for(int i = 0; i < 4; i++) {
 #if defined(_FM77AV20) || defined(_FM77AV20EX) || \
        defined(_FM77AV40SX) || defined(_FM77AV40EX) || defined(_FM77AV40SX)
-                       fdc->set_drive_type(i, DRIVE_TYPE_2DD);
+                               fdc->set_drive_type(i, DRIVE_TYPE_2DD);
 #else
-                       fdc->set_drive_type(i, DRIVE_TYPE_2D);
+                               fdc->set_drive_type(i, DRIVE_TYPE_2D);
 #endif
-                       fdc->set_drive_rpm(i, 360);
-                       fdc->set_drive_mfm(i, true);
+                               fdc->set_drive_mfm(i, true);
+                               fdc->set_drive_rpm(i, 300);
+                       }
                }
 #if defined(_FM8) || (_FM7) || (_FMNEW7)
        }
 #endif 
        
-#if defined(_FM8) || (_FM7) || (_FMNEW7)
-       if(connect_1Mfdc) {
-#endif
+#if defined(HAS_2HD)
+       if(connect_1Mfdc && (fdc_2HD != NULL)) {
 // ToDo: Implement another FDC for 1MB (2HD or 8''), this is used by FM-8 to FM-77? Not FM77AV or later? I still know this.
-//#if defined(_FM77) || defined(_FM77L4)
-//             for(int i = 0; i < 4; i++) {
-//                     fdc->set_drive_type(i, DRIVE_TYPE_2HD);
-//                     fdc->set_drive_rpm(i, 360);
-//                     fdc->set_drive_mfm(i, true);
-//             }
-//#endif
-#if defined(_FM8) || (_FM7) || (_FMNEW7)
+               for(int i = 0; i < 2; i++) {
+                       fdc_2HD->set_drive_type(i, DRIVE_TYPE_2HD);
+                       fdc_2HD->set_drive_mfm(i, true);
+                       fdc_2HD->set_drive_rpm(i, 300);
+               }
        }
 #endif 
 }  
@@ -689,23 +756,26 @@ void VM::reset()
                opn[i]->write_signal(SIG_YM2203_MUTE, 0x00, 0x01); // Okay?
        }
 #endif
+       //display->reset(); // 20180618 K.O for RELICS
 }
 
 void VM::special_reset()
 {
        // BREAK + RESET
-       mainio->write_signal(FM7_MAINIO_PUSH_BREAK, 1, 1);
        mainio->reset();
        mainmem->reset();
+       //mainio->write_signal(FM7_MAINIO_PUSH_BREAK, 1, 1);
+       //keyboard->write_signal(SIG_FM7KEY_OVERRIDE_PRESS_BREAK, 0xffffffff, 0xffffffff);
        
 #if defined(FM77AV_VARIANTS)   
        mainio->write_signal(FM7_MAINIO_HOT_RESET, 1, 1);
 #endif 
        display->reset();
        subcpu->reset();
-       mainio->write_signal(FM7_MAINIO_PUSH_BREAK, 1, 1);
        maincpu->reset();
-       event->register_event(mainio, EVENT_UP_BREAK, 10000.0 * 1000.0, false, NULL);
+       mainio->write_signal(FM7_MAINIO_PUSH_BREAK, 1, 1);
+       keyboard->write_signal(SIG_FM7KEY_OVERRIDE_PRESS_BREAK, 0xffffffff, 0xffffffff);
+       event->register_event(mainio, EVENT_UP_BREAK, 1000.0 * 1000.0, false, NULL);
 }
 
 void VM::run()
@@ -784,7 +854,8 @@ void VM::initialize_sound(int rate, int samples)
        keyboard_beep->initialize_sound(rate, 2400.0, 512);
 # endif
 #endif 
-       pcm1bit->initialize_sound(rate, 2000);
+       pcm1bit->initialize_sound(rate, 6000);
+
        //drec->initialize_sound(rate, 0);
 }
 
@@ -840,7 +911,17 @@ void VM::set_sound_device_volume(int ch, int decibel_l, int decibel_r)
                        fdc->get_context_noise_head_down()->set_volume(0, decibel_l, decibel_r);
                        fdc->get_context_noise_head_up()->set_volume(0, decibel_l, decibel_r);
                }
-       } else if(ch-- == 0) {
+       } 
+#if defined(HAS_2HD)
+       else if(ch-- == 0) {
+               if(fdc_2HD != NULL) {
+                       fdc_2HD->get_context_noise_seek()->set_volume(0, decibel_l, decibel_r);
+                       fdc_2HD->get_context_noise_head_down()->set_volume(0, decibel_l, decibel_r);
+                       fdc_2HD->get_context_noise_head_up()->set_volume(0, decibel_l, decibel_r);
+               }
+       } 
+#endif
+       else if(ch-- == 0) {
                if(drec != NULL) {
                        drec->get_context_noise_play()->set_volume(0, decibel_l, decibel_r);
                        drec->get_context_noise_stop()->set_volume(0, decibel_l, decibel_r);
@@ -877,7 +958,7 @@ bool VM::get_kana_locked()
 }
 
 // Get INS status.Important with FM-7 series (^_^;
-uint32_t VM::get_extra_leds()
+uint32_t VM::get_led_status()
 {
        return keyboard->read_signal(SIG_FM7KEY_LED_STATUS);
 }
@@ -889,55 +970,123 @@ uint32_t VM::get_extra_leds()
 
 void VM::open_floppy_disk(int drv, const _TCHAR* file_path, int bank)
 {
+       if(drv < 0) return;
+#if defined(HAS_2HD)
+       if(drv < 2) {
+               if(fdc != NULL) {
+                       fdc->open_disk(drv, file_path, bank);
+               }
+       } else {
+               if(fdc_2HD != NULL) {
+                       fdc_2HD->open_disk(drv - 2, file_path, bank);
+               }
+       }
+#else
        if(fdc != NULL) {
                fdc->open_disk(drv, file_path, bank);
        }
+#endif
+       //display->reset(); // 20180618 K.O for RELICS
 }
 
 void VM::close_floppy_disk(int drv)
 {
+#if defined(HAS_2HD)
+       if(drv < 2) {
+               if(fdc != NULL) fdc->close_disk(drv);
+       } else {
+               if(fdc_2HD != NULL) fdc_2HD->close_disk(drv - 2);
+       }               
+#else
        if(fdc != NULL) {
                fdc->close_disk(drv);
        }
+#endif
 }
 
 bool VM::is_floppy_disk_inserted(int drv)
 {
+#if defined(HAS_2HD)
+       if((fdc != NULL) && (drv < 2)) {
+               return fdc->is_disk_inserted(drv);
+       } else if(fdc_2HD != NULL) {
+               return fdc_2HD->is_disk_inserted(drv - 2);
+       } else {
+               return false;
+       }
+#else
        if(fdc != NULL) {
                return fdc->is_disk_inserted(drv);
        } else {
                return false;
        }
+#endif
 }
 
 void VM::is_floppy_disk_protected(int drv, bool value)
 {
+#if defined(HAS_2HD)
+       if((fdc != NULL) && (drv < 2)) {
+               fdc->is_disk_protected(drv, value);
+       } else if(fdc_2HD != NULL) {
+               fdc_2HD->is_disk_protected(drv - 2, value);
+       }               
+#else
        if(fdc != NULL) {
                fdc->is_disk_protected(drv, value);
        }
+#endif
 }
 
 bool VM::is_floppy_disk_protected(int drv)
 {
+#if defined(HAS_2HD)
+       if((fdc != NULL) && (drv < 2)) {
+               return fdc->is_disk_protected(drv);
+       } else if(fdc_2HD != NULL) {
+               return fdc_2HD->is_disk_protected(drv);
+       } else {
+               return false;
+       }
+#else
        if(fdc != NULL) {
                return fdc->is_disk_protected(drv);
        } else {
                return false;
        }
+#endif
 }
 
 uint32_t VM::is_floppy_disk_accessed()
 {
-       // WILLFIX : Multiple FDC for 1M FD.
-#if defined(_FM8) || (_FM7) || (_FMNEW7)
-       if(connect_320kfdc || connect_1Mfdc) {
-#endif         
-               return fdc->read_signal(0);
-#if defined(_FM8) || (_FM7) || (_FMNEW7)
-       } else {
-               return 0x00000000;
+       uint32_t v = 0;
+#if defined(HAS_2HD)
+       uint32_t v1, v2;
+       v1 = v2 = 0;
+# if defined(_FM8) || (_FM7) || (_FMNEW7)
+       if(connect_320kfdc) {
+# endif
+               if(fdc != NULL) v1 = fdc->read_signal(0);
+# if defined(_FM8) || (_FM7) || (_FMNEW7)
        }
-#endif 
+# endif
+       if(connect_1Mfdc) {
+               if(fdc_2HD != NULL) v2 = fdc_2HD->read_signal(0);
+       }
+       v1 = v1 & 0x03;
+       v2 = (v2 & 0x03) << 2;
+       v = v1 | v2;
+       return v;
+#else
+# if defined(_FM8) || (_FM7) || (_FMNEW7)
+       if(connect_320kfdc) {
+# endif                
+               v = fdc->read_signal(0);
+# if defined(_FM8) || (_FM7) || (_FMNEW7)
+       }
+# endif
+       return v;
+#endif
 }
 
 void VM::play_tape(int drv, const _TCHAR* file_path)
@@ -952,9 +1101,7 @@ void VM::rec_tape(int drv, const _TCHAR* file_path)
 
 void VM::close_tape(int drv)
 {
-       emu->lock_vm();
        if(drec != NULL) drec->close_tape();
-       emu->unlock_vm();
 }
 
 bool VM::is_tape_inserted(int drv)
@@ -1051,9 +1198,9 @@ bool VM::is_frame_skippable()
 void VM::update_dipswitch()
 {
 #if defined(WITH_Z80)
-       g_intr_irq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_IRQ_ON) != 0) ? 1 : 0, 1);
-       g_intr_firq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_FIRQ_ON) != 0) ? 1 : 0, 1);
-       g_nmi->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_NMI_ON) != 0) ? 1 : 0, 1);
+       if(g_intr_irq != NULL) g_intr_irq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_IRQ_ON) != 0) ? 1 : 0, 1);
+       if(g_intr_firq != NULL) g_intr_firq->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_FIRQ_ON) != 0) ? 1 : 0, 1);
+       if(g_nmi != NULL) g_nmi->write_signal(SIG_AND_BIT_0, ((config.dipswitch & FM7_DIPSW_Z80_NMI_ON) != 0) ? 1 : 0, 1);
 #endif
 }
 
@@ -1061,7 +1208,7 @@ void VM::set_cpu_clock(DEVICE *cpu, uint32_t clocks) {
        event->set_secondary_cpu_clock(cpu, clocks);
 }
 
-#if defined(USE_BUBBLE1)
+#if defined(USE_BUBBLE)
 void VM::open_bubble_casette(int drv, const _TCHAR *path, int bank)
 {
        if((drv >= 2) || (drv < 0)) return;
@@ -1098,56 +1245,66 @@ void VM::is_bubble_casette_protected(int drv, bool flag)
 }
 #endif
 
-
-#define STATE_VERSION  8
-void VM::save_state(FILEIO* state_fio)
+void VM::set_vm_frame_rate(double fps)
 {
-       state_fio->FputUint32_BE(STATE_VERSION);
-       state_fio->FputBool(connect_320kfdc);
-       state_fio->FputBool(connect_1Mfdc);
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               const char *name = typeid(*device).name() + 6; // skip "class "
-               
-               state_fio->FputInt32(strlen(name));
-               state_fio->Fwrite(name, strlen(name), 1);
-               device->save_state(state_fio);
-       }
+   if(event != NULL) event->set_frames_per_sec(fps);
 }
 
-bool VM::load_state(FILEIO* state_fio)
+#define STATE_VERSION  12
+
+bool VM::process_state(FILEIO* state_fio, bool loading)
 {
-       uint32_t version = state_fio->FgetUint32_BE();
-       if(version != STATE_VERSION) {
-               return false;
-       }
-       connect_320kfdc = state_fio->FgetBool();
-       connect_1Mfdc = state_fio->FgetBool();
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               const char *name = typeid(*device).name() + 6; // skip "class "
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+               return false;
+       }
+       for(DEVICE* device = first_device; device; device = device->next_device) {
+               // Note: typeid(foo).name is fixed by recent ABI.Not dec 6.
+               // const char *name = typeid(*device).name();
+               //       But, using get_device_name() instead of typeid(foo).name() 20181008 K.O
+               const char *name = device->get_device_name();
+               int len = strlen(name);
                
-               if(!(state_fio->FgetInt32() == strlen(name) && state_fio->Fcompare(name, strlen(name)))) {
-                       printf("Load Error: DEVID=%d\n", device->this_device_id);
-                       return false;
-               }
-               if(!device->load_state(state_fio)) {
-                       printf("Load Error: DEVID=%d\n", device->this_device_id);
+               if(!state_fio->StateCheckInt32(len)) {
+                       if(loading) {
+                               printf("Class name len Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+                       }
                        return false;
                }
+               if(!state_fio->StateCheckBuffer(name, len, 1)) {
+                       if(loading) {
+                               printf("Class name Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+                       }
+                       return false;
+               }
+               if(!device->process_state(state_fio, loading)) {
+                       if(loading) {
+                               printf("Data loading Error: DEVID=%d\n", device->this_device_id);
+                       }
+                       return false;
+               }
+       }
+       // Machine specified.
+       state_fio->StateValue(connect_320kfdc);
+       state_fio->StateValue(connect_1Mfdc);
+       if(loading) {
+               update_config();
        }
-       return true;
+       //mainio->restore_opn();
+       return true;
 }
 
+
+
 #ifdef USE_DIG_RESOLUTION
 void VM::get_screen_resolution(int *w, int *h)
 {
        switch(display->get_screen_mode()) {
        case DISPLAY_MODE_8_200L:
-       case DISPLAY_MODE_8_200L_TEXT:
                *w = 640;
                *h = 200;
                break;
        case DISPLAY_MODE_8_400L:
-       case DISPLAY_MODE_8_400L_TEXT:
+       case DISPLAY_MODE_1_400L:
                *w = 640;
                *h = 400;
                break;