[VM][COMMON_VM] Fix warining of 'set_context_intr' hides overloaded virtual function...

diff --git a/source/src/vm/common_vm/CMakeLists.txt b/source/src/vm/common_vm/CMakeLists.txt
index d0c78c8..8d54160 100644 (file)
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* vm/common_vm")
 
-SET(THIS_LIB_VERSION 2.29.2)
+SET(THIS_LIB_VERSION 2.29.3)
 
 #include(cotire)
 set(s_vm_common_vm_srcs

diff --git a/source/src/vm/hc20/hc20.cpp b/source/src/vm/hc20/hc20.cpp
index 5cb0fdd..d446723 100644 (file)
--- a/source/src/vm/hc20/hc20.cpp
+++ b/source/src/vm/hc20/hc20.cpp
@@ -114,7 +114,7 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        cpu->set_context_port3(memory, SIG_MEMORY_PORT_3, 0xff, 0);
        cpu->set_context_port4(memory, SIG_MEMORY_PORT_4, 0xff, 0);
        cpu->set_context_sio(memory, SIG_MEMORY_SIO_MAIN);
-       rtc->set_context_intr(memory, SIG_MEMORY_RTC_IRQ, 1);
+       rtc->set_context_intr_line(memory, SIG_MEMORY_RTC_IRQ, 1);
        
        memory->set_context_beep(beep);
        memory->set_context_cpu(cpu);

diff --git a/source/src/vm/hd146818p.h b/source/src/vm/hd146818p.h
index 4d81279..4efff91 100644 (file)
--- a/source/src/vm/hd146818p.h
+++ b/source/src/vm/hd146818p.h
@@ -52,7 +52,7 @@ public:
        bool process_state(FILEIO* state_fio, bool loading);
        
        // unique functions
-       void set_context_intr(DEVICE* device, int id, uint32_t mask)
+       void set_context_intr_line(DEVICE* device, int id, uint32_t mask)
        {
                register_output_signal(&outputs_intr, device, id, mask);
        }

diff --git a/source/src/vm/i286.h b/source/src/vm/i286.h
index 3017147..912e8a0 100644 (file)
--- a/source/src/vm/i286.h
+++ b/source/src/vm/i286.h
@@ -108,7 +108,7 @@ public:
        {
                d_io = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }

diff --git a/source/src/vm/i286_np21.h b/source/src/vm/i286_np21.h
index c974bef..a512870 100644 (file)
--- a/source/src/vm/i286_np21.h
+++ b/source/src/vm/i286_np21.h
@@ -124,7 +124,7 @@ public:
 //     {
 //             device_io = device;
 //     }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                device_pic = device;
        }

diff --git a/source/src/vm/i386_np21.cpp b/source/src/vm/i386_np21.cpp
index 6385ecb..eac62fa 100644 (file)
--- a/source/src/vm/i386_np21.cpp
+++ b/source/src/vm/i386_np21.cpp
@@ -841,7 +841,7 @@ void I386::set_context_dma(DEVICE* device)
        device_dma = device;
 }
 //#endif
-void I386::set_context_intr(DEVICE* device)
+void I386::set_context_intr(DEVICE* device, uint32_t bit)
 {
        device_pic = device;
 }

diff --git a/source/src/vm/i386_np21.h b/source/src/vm/i386_np21.h
index 9c077fb..e208a4c 100644 (file)
--- a/source/src/vm/i386_np21.h
+++ b/source/src/vm/i386_np21.h
@@ -158,7 +158,7 @@ public:
 //     {
 //             device_io = device;
 //     }
-       void set_context_intr(DEVICE* device);
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xffffffff);
 //#ifdef I386_PSEUDO_BIOS
        void set_context_bios(DEVICE* device);
 //     {

diff --git a/source/src/vm/i8080_base.h b/source/src/vm/i8080_base.h
index d526a30..c82c7fb 100644 (file)
--- a/source/src/vm/i8080_base.h
+++ b/source/src/vm/i8080_base.h
@@ -176,7 +176,7 @@ public:
        {
                d_io = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }

diff --git a/source/src/vm/i86.h b/source/src/vm/i86.h
index 831ae22..5081de9 100644 (file)
--- a/source/src/vm/i86.h
+++ b/source/src/vm/i86.h
@@ -111,7 +111,7 @@ public:
        {
                d_io = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }

diff --git a/source/src/vm/j3100/j3100.cpp b/source/src/vm/j3100/j3100.cpp
index 487f757..42a7312 100644 (file)
--- a/source/src/vm/j3100/j3100.cpp
+++ b/source/src/vm/j3100/j3100.cpp
@@ -183,7 +183,7 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
 #else
        io->set_iomap_alias_w(0x70, rtc, 1);    // bit7 = nmi mask
        io->set_iomap_alias_rw(0x71, rtc, 0);
-       rtc->set_context_intr(pic, SIG_I8259_IR0 | SIG_I8259_CHIP1, 1); // to PIC#1 IR0 (IR8)
+       rtc->set_context_intr_line(pic, SIG_I8259_IR0 | SIG_I8259_CHIP1, 1);    // to PIC#1 IR0 (IR8)
 #endif
        
        // nmi mask register

diff --git a/source/src/vm/jx/i86.h b/source/src/vm/jx/i86.h
index d1c4bf3..d05cc21 100644 (file)
--- a/source/src/vm/jx/i86.h
+++ b/source/src/vm/jx/i86.h
@@ -112,7 +112,7 @@ public:
        {
                d_io = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }

diff --git a/source/src/vm/m6502.h b/source/src/vm/m6502.h
index 1c5bcf5..0e6dfe1 100644 (file)
--- a/source/src/vm/m6502.h
+++ b/source/src/vm/m6502.h
@@ -100,7 +100,7 @@ public:
        {
                d_mem = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }

diff --git a/source/src/vm/mcs48.h b/source/src/vm/mcs48.h
index 3512c95..91cbb2a 100644 (file)
--- a/source/src/vm/mcs48.h
+++ b/source/src/vm/mcs48.h
@@ -507,7 +507,7 @@ public:
        {
                d_io = device;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_intr = device;
        }

diff --git a/source/src/vm/qc10/qc10.cpp b/source/src/vm/qc10/qc10.cpp
index 62edb0c..fc1ca9d 100644 (file)
--- a/source/src/vm/qc10/qc10.cpp
+++ b/source/src/vm/qc10/qc10.cpp
@@ -99,7 +99,7 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        event->set_context_sound(fdc->get_context_noise_head_down());
        event->set_context_sound(fdc->get_context_noise_head_up());
        
-       rtc->set_context_intr(pic, SIG_I8259_IR2 | SIG_I8259_CHIP1, 1);
+       rtc->set_context_intr_line(pic, SIG_I8259_IR2 | SIG_I8259_CHIP1, 1);
        dma0->set_context_memory(memory);
        dma0->set_context_ch0(fdc);
        dma0->set_context_ch1(gdc);

diff --git a/source/src/vm/z80.h b/source/src/vm/z80.h
index 6d8dfbe..722949d 100644 (file)
--- a/source/src/vm/z80.h
+++ b/source/src/vm/z80.h
@@ -349,7 +349,7 @@ public:
        {
                return d_pic;
        }
-       void set_context_intr(DEVICE* device)
+       void set_context_intr(DEVICE* device, uint32_t bit = 0xfffffffff)
        {
                d_pic = device;
        }