summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/spectrum
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/spectrum')
-rw-r--r--src/devices/bus/spectrum/beta.cpp4
-rw-r--r--src/devices/bus/spectrum/beta.h6
-rw-r--r--src/devices/bus/spectrum/beta128.cpp4
-rw-r--r--src/devices/bus/spectrum/beta128.h4
-rw-r--r--src/devices/bus/spectrum/d40.cpp2
-rw-r--r--src/devices/bus/spectrum/d40.h4
-rw-r--r--src/devices/bus/spectrum/exp.cpp2
-rw-r--r--src/devices/bus/spectrum/exp.h4
-rw-r--r--src/devices/bus/spectrum/floppyone.cpp4
-rw-r--r--src/devices/bus/spectrum/floppyone.h4
-rw-r--r--src/devices/bus/spectrum/fuller.h2
-rw-r--r--src/devices/bus/spectrum/intf1.cpp4
-rw-r--r--src/devices/bus/spectrum/intf1.h4
-rw-r--r--src/devices/bus/spectrum/intf2.cpp2
-rw-r--r--src/devices/bus/spectrum/intf2.h2
-rw-r--r--src/devices/bus/spectrum/kempdisc.cpp4
-rw-r--r--src/devices/bus/spectrum/kempdisc.h4
-rw-r--r--src/devices/bus/spectrum/logitek.cpp2
-rw-r--r--src/devices/bus/spectrum/logitek.h4
-rw-r--r--src/devices/bus/spectrum/lprint.cpp8
-rw-r--r--src/devices/bus/spectrum/lprint.h12
-rw-r--r--src/devices/bus/spectrum/melodik.h2
-rw-r--r--src/devices/bus/spectrum/mface.cpp4
-rw-r--r--src/devices/bus/spectrum/mface.h4
-rw-r--r--src/devices/bus/spectrum/mgt.cpp6
-rw-r--r--src/devices/bus/spectrum/mgt.h6
-rw-r--r--src/devices/bus/spectrum/mikroplus.cpp2
-rw-r--r--src/devices/bus/spectrum/mikroplus.h2
-rw-r--r--src/devices/bus/spectrum/mpoker.cpp2
-rw-r--r--src/devices/bus/spectrum/mpoker.h4
-rw-r--r--src/devices/bus/spectrum/opus.cpp4
-rw-r--r--src/devices/bus/spectrum/opus.h4
-rw-r--r--src/devices/bus/spectrum/plus2test.cpp2
-rw-r--r--src/devices/bus/spectrum/plus2test.h2
-rw-r--r--src/devices/bus/spectrum/sdi.cpp2
-rw-r--r--src/devices/bus/spectrum/sdi.h4
-rw-r--r--src/devices/bus/spectrum/sixword.cpp4
-rw-r--r--src/devices/bus/spectrum/sixword.h4
-rw-r--r--src/devices/bus/spectrum/speccydos.cpp4
-rw-r--r--src/devices/bus/spectrum/speccydos.h4
-rw-r--r--src/devices/bus/spectrum/specmate.cpp4
-rw-r--r--src/devices/bus/spectrum/specmate.h4
-rw-r--r--src/devices/bus/spectrum/uslot.cpp4
-rw-r--r--src/devices/bus/spectrum/uslot.h2
-rw-r--r--src/devices/bus/spectrum/usource.cpp2
-rw-r--r--src/devices/bus/spectrum/usource.h4
-rw-r--r--src/devices/bus/spectrum/uspeech.cpp2
-rw-r--r--src/devices/bus/spectrum/uspeech.h4
-rw-r--r--src/devices/bus/spectrum/vtx5000.cpp8
-rw-r--r--src/devices/bus/spectrum/wafa.cpp4
-rw-r--r--src/devices/bus/spectrum/wafa.h4
51 files changed, 97 insertions, 97 deletions
diff --git a/src/devices/bus/spectrum/beta.cpp b/src/devices/bus/spectrum/beta.cpp
index 539b1e38161..c159b625df7 100644
--- a/src/devices/bus/spectrum/beta.cpp
+++ b/src/devices/bus/spectrum/beta.cpp
@@ -477,9 +477,9 @@ void spectrum_betav2_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_betav2_device::romcs()
+bool spectrum_betav2_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_betav2_device::fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/beta.h b/src/devices/bus/spectrum/beta.h
index 3118ab81874..3dac22f95d3 100644
--- a/src/devices/bus/spectrum/beta.h
+++ b/src/devices/bus/spectrum/beta.h
@@ -47,7 +47,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }
@@ -59,7 +59,7 @@ protected:
required_device_array<floppy_connector, 4> m_floppy;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
u8 m_masterdisable;
u8 m_control;
bool m_motor_active;
@@ -153,7 +153,7 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override { return 1; }
+ virtual bool romcs() override { return 1; }
required_device<i8255_device> m_ppi;
required_device<acia6850_device> m_acia;
diff --git a/src/devices/bus/spectrum/beta128.cpp b/src/devices/bus/spectrum/beta128.cpp
index de6726e260f..b97159c46fc 100644
--- a/src/devices/bus/spectrum/beta128.cpp
+++ b/src/devices/bus/spectrum/beta128.cpp
@@ -177,9 +177,9 @@ void spectrum_beta128_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_beta128_device::romcs()
+bool spectrum_beta128_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
diff --git a/src/devices/bus/spectrum/beta128.h b/src/devices/bus/spectrum/beta128.h
index ab870aefc35..3201e9ecf6e 100644
--- a/src/devices/bus/spectrum/beta128.h
+++ b/src/devices/bus/spectrum/beta128.h
@@ -43,7 +43,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }
@@ -57,7 +57,7 @@ protected:
required_device<spectrum_expansion_slot_device> m_exp;
required_ioport m_switch;
- int m_romcs;
+ bool m_romcs;
u8 m_control;
bool m_motor_active;
bool m_128rom_bit;
diff --git a/src/devices/bus/spectrum/d40.cpp b/src/devices/bus/spectrum/d40.cpp
index 89f0417c681..f7c5f5c28ed 100644
--- a/src/devices/bus/spectrum/d40.cpp
+++ b/src/devices/bus/spectrum/d40.cpp
@@ -211,7 +211,7 @@ void spectrum_d40base_device::device_reset()
// IMPLEMENTATION spectrum_d40base_device
//**************************************************************************
-int spectrum_d40base_device::romcs()
+bool spectrum_d40base_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h
index f03c71cabbb..b3f3b856217 100644
--- a/src/devices/bus/spectrum/d40.h
+++ b/src/devices/bus/spectrum/d40.h
@@ -42,7 +42,7 @@ protected:
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t fdc0_r(offs_t offset) { return 0xff; }
virtual uint8_t fdc1_r(offs_t offset) { return 0xff; }
@@ -54,7 +54,7 @@ protected:
required_device<i8255_device> m_ppi;
required_ioport m_snap;
- int m_romcs;
+ bool m_romcs;
uint8_t m_ram[2 * 1024];
int m_snap_flag;
int m_8255_reset;
diff --git a/src/devices/bus/spectrum/exp.cpp b/src/devices/bus/spectrum/exp.cpp
index cea9ac25503..90015c8c72a 100644
--- a/src/devices/bus/spectrum/exp.cpp
+++ b/src/devices/bus/spectrum/exp.cpp
@@ -64,7 +64,7 @@ void spectrum_expansion_slot_device::device_start()
// romcs
//-------------------------------------------------
-int spectrum_expansion_slot_device::romcs()
+bool spectrum_expansion_slot_device::romcs()
{
if (m_card)
return m_card->romcs();
diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h
index c2fade96fe8..677d23d6f9e 100644
--- a/src/devices/bus/spectrum/exp.h
+++ b/src/devices/bus/spectrum/exp.h
@@ -87,7 +87,7 @@ public:
void mreq_w(offs_t offset, uint8_t data);
uint8_t iorq_r(offs_t offset);
void iorq_w(offs_t offset, uint8_t data);
- int romcs();
+ bool romcs();
void irq_w(int state) { m_irq_handler(state); }
void nmi_w(int state) { m_nmi_handler(state); }
@@ -120,7 +120,7 @@ public:
virtual void mreq_w(offs_t offset, uint8_t data) { }
virtual uint8_t iorq_r(offs_t offset) { return offset & 1 ? m_slot->fb_r() : 0xff; }
virtual void iorq_w(offs_t offset, uint8_t data) { }
- virtual int romcs() { return 0; }
+ virtual bool romcs() { return 0; }
protected:
// construction/destruction
diff --git a/src/devices/bus/spectrum/floppyone.cpp b/src/devices/bus/spectrum/floppyone.cpp
index 9da83fcb015..063864764f1 100644
--- a/src/devices/bus/spectrum/floppyone.cpp
+++ b/src/devices/bus/spectrum/floppyone.cpp
@@ -195,9 +195,9 @@ void spectrum_flpone_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_flpone_device::romcs()
+bool spectrum_flpone_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_flpone_device::post_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h
index 98820bc2973..1020dac7518 100644
--- a/src/devices/bus/spectrum/floppyone.h
+++ b/src/devices/bus/spectrum/floppyone.h
@@ -45,7 +45,7 @@ protected:
virtual void post_opcode_fetch(offs_t offset) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -66,7 +66,7 @@ protected:
required_ioport m_sw1;
required_ioport m_sw2;
- int m_romcs, m_if1cs;
+ bool m_romcs, m_if1cs;
u8 m_ram[0x1000];
int m_busy;
uint8_t m_shifter;
diff --git a/src/devices/bus/spectrum/fuller.h b/src/devices/bus/spectrum/fuller.h
index 9c39738380a..70c776a81a2 100644
--- a/src/devices/bus/spectrum/fuller.h
+++ b/src/devices/bus/spectrum/fuller.h
@@ -47,7 +47,7 @@ protected:
virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }
virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; }
virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
- virtual int romcs() override { return m_exp->romcs(); }
+ virtual bool romcs() override { return m_exp->romcs(); }
private:
required_device<spectrum_expansion_slot_device> m_exp;
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index 9e6328eac86..f80a02723ef 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -105,9 +105,9 @@ void spectrum_intf1_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_intf1_device::romcs()
+bool spectrum_intf1_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
// the Interface 1 looks for specific bus conditions to enable / disable the expansion overlay ROM
diff --git a/src/devices/bus/spectrum/intf1.h b/src/devices/bus/spectrum/intf1.h
index eac6fd8ab87..bd40d12f25b 100644
--- a/src/devices/bus/spectrum/intf1.h
+++ b/src/devices/bus/spectrum/intf1.h
@@ -42,7 +42,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }
@@ -56,7 +56,7 @@ private:
required_device<microdrive_image_device> m_mdv2;
required_memory_region m_rom;
- int m_romcs;
+ bool m_romcs;
};
diff --git a/src/devices/bus/spectrum/intf2.cpp b/src/devices/bus/spectrum/intf2.cpp
index c5bf565af97..514a7e42151 100644
--- a/src/devices/bus/spectrum/intf2.cpp
+++ b/src/devices/bus/spectrum/intf2.cpp
@@ -107,7 +107,7 @@ DEVICE_IMAGE_LOAD_MEMBER(spectrum_intf2_device::cart_load)
return std::make_pair(std::error_condition(), std::string());
}
-int spectrum_intf2_device::romcs()
+bool spectrum_intf2_device::romcs()
{
if (m_cart && m_cart->exists())
return 1;
diff --git a/src/devices/bus/spectrum/intf2.h b/src/devices/bus/spectrum/intf2.h
index 268e74e9573..cbb2a18ca45 100644
--- a/src/devices/bus/spectrum/intf2.h
+++ b/src/devices/bus/spectrum/intf2.h
@@ -34,7 +34,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual ioport_constructor device_input_ports() const override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
diff --git a/src/devices/bus/spectrum/kempdisc.cpp b/src/devices/bus/spectrum/kempdisc.cpp
index 2533863664f..059403959fa 100644
--- a/src/devices/bus/spectrum/kempdisc.cpp
+++ b/src/devices/bus/spectrum/kempdisc.cpp
@@ -162,9 +162,9 @@ void spectrum_kempdisc_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_kempdisc_device::romcs()
+bool spectrum_kempdisc_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
diff --git a/src/devices/bus/spectrum/kempdisc.h b/src/devices/bus/spectrum/kempdisc.h
index 5c92c77b818..9737da16887 100644
--- a/src/devices/bus/spectrum/kempdisc.h
+++ b/src/devices/bus/spectrum/kempdisc.h
@@ -41,7 +41,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -55,7 +55,7 @@ protected:
required_device_array<floppy_connector, 4> m_floppy;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
// u8 m_control;
};
diff --git a/src/devices/bus/spectrum/logitek.cpp b/src/devices/bus/spectrum/logitek.cpp
index 3d8a9b457f3..cc93252fc55 100644
--- a/src/devices/bus/spectrum/logitek.cpp
+++ b/src/devices/bus/spectrum/logitek.cpp
@@ -127,7 +127,7 @@ void spectrum_proceed_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_proceed_device::romcs()
+bool spectrum_proceed_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/logitek.h b/src/devices/bus/spectrum/logitek.h
index a395c10230c..01236da2dde 100644
--- a/src/devices/bus/spectrum/logitek.h
+++ b/src/devices/bus/spectrum/logitek.h
@@ -50,7 +50,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
required_memory_region m_rom;
required_device<z80pio_device> m_z80pio;
@@ -61,7 +61,7 @@ protected:
void piob_w(uint8_t data);
uint8_t piob_r();
- int m_romcs;
+ bool m_romcs;
int m_romen;
};
diff --git a/src/devices/bus/spectrum/lprint.cpp b/src/devices/bus/spectrum/lprint.cpp
index 74f93cd5322..92b1e8d533e 100644
--- a/src/devices/bus/spectrum/lprint.cpp
+++ b/src/devices/bus/spectrum/lprint.cpp
@@ -251,7 +251,7 @@ void spectrum_kempcentre_device::device_reset()
// IMPLEMENTATION (lprint)
//**************************************************************************
-int spectrum_lprint_device::romcs()
+bool spectrum_lprint_device::romcs()
{
return m_romcs;
}
@@ -315,9 +315,9 @@ void spectrum_lprint_device::iorq_w(offs_t offset, uint8_t data)
// IMPLEMENTATION (lprint3)
//**************************************************************************
-int spectrum_lprint3_device::romcs()
+bool spectrum_lprint3_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
uint8_t spectrum_lprint3_device::iorq_r(offs_t offset)
@@ -414,7 +414,7 @@ void spectrum_kempcentrs_device::iorq_w(offs_t offset, uint8_t data)
// IMPLEMENTATION (kempcentre)
//**************************************************************************
-int spectrum_kempcentre_device::romcs()
+bool spectrum_kempcentre_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/lprint.h b/src/devices/bus/spectrum/lprint.h
index 448ba9830e8..f8a1f135096 100644
--- a/src/devices/bus/spectrum/lprint.h
+++ b/src/devices/bus/spectrum/lprint.h
@@ -39,14 +39,14 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
void busy_w(int state) { m_busy = state; }
required_memory_region m_rom;
required_device<centronics_device> m_centronics;
- int m_romcs;
+ bool m_romcs;
int m_busy;
};
@@ -71,7 +71,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -87,7 +87,7 @@ protected:
required_device<rs232_port_device> m_rs232;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
int m_busy;
};
@@ -143,7 +143,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
void busy_w(int state) { m_busy = state; }
@@ -151,7 +151,7 @@ protected:
required_device<centronics_device> m_centronics;
int m_active;
- int m_romcs;
+ bool m_romcs;
int m_busy;
};
diff --git a/src/devices/bus/spectrum/melodik.h b/src/devices/bus/spectrum/melodik.h
index ce1bc0110be..b5775e6438f 100644
--- a/src/devices/bus/spectrum/melodik.h
+++ b/src/devices/bus/spectrum/melodik.h
@@ -46,7 +46,7 @@ protected:
virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }
virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; }
virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
- virtual int romcs() override { return m_exp->romcs(); }
+ virtual bool romcs() override { return m_exp->romcs(); }
private:
required_device<spectrum_expansion_slot_device> m_exp;
diff --git a/src/devices/bus/spectrum/mface.cpp b/src/devices/bus/spectrum/mface.cpp
index efecf361ee8..1c79316bcc9 100644
--- a/src/devices/bus/spectrum/mface.cpp
+++ b/src/devices/bus/spectrum/mface.cpp
@@ -509,9 +509,9 @@ void spectrum_mprint_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_mface_base_device::romcs()
+bool spectrum_mface_base_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_mface_base_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/mface.h b/src/devices/bus/spectrum/mface.h
index c76f981c284..c4c73f3d931 100644
--- a/src/devices/bus/spectrum/mface.h
+++ b/src/devices/bus/spectrum/mface.h
@@ -39,7 +39,7 @@ protected:
virtual void pre_opcode_fetch(offs_t offset) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }
@@ -53,7 +53,7 @@ protected:
required_memory_region m_rom;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
int m_nmi_pending;
std::unique_ptr<uint8_t[]> m_ram;
};
diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp
index 035f82de2b0..265db2d7301 100644
--- a/src/devices/bus/spectrum/mgt.cpp
+++ b/src/devices/bus/spectrum/mgt.cpp
@@ -404,7 +404,7 @@ void spectrum_disciple_device::device_reset()
// IMPLEMENTATION spectrum_plusd_device
//**************************************************************************
-int spectrum_plusd_device::romcs()
+bool spectrum_plusd_device::romcs()
{
return m_romcs;
}
@@ -540,9 +540,9 @@ void spectrum_plusd_device::busy_w(int state)
// IMPLEMENTATION spectrum_disciple_device
//**************************************************************************
-int spectrum_disciple_device::romcs()
+bool spectrum_disciple_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_disciple_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h
index 96227ec240c..b40b18c5711 100644
--- a/src/devices/bus/spectrum/mgt.h
+++ b/src/devices/bus/spectrum/mgt.h
@@ -50,7 +50,7 @@ protected:
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
void busy_w(int state);
@@ -59,7 +59,7 @@ protected:
required_device_array<floppy_connector, 2> m_floppy;
required_device<centronics_device> m_centronics;
- int m_romcs;
+ bool m_romcs;
uint8_t m_ram[8 * 1024];
bool m_centronics_busy;
};
@@ -87,7 +87,7 @@ protected:
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
TIMER_CALLBACK_MEMBER(reset_tick);
diff --git a/src/devices/bus/spectrum/mikroplus.cpp b/src/devices/bus/spectrum/mikroplus.cpp
index d9c34e89660..76681e372f9 100644
--- a/src/devices/bus/spectrum/mikroplus.cpp
+++ b/src/devices/bus/spectrum/mikroplus.cpp
@@ -100,7 +100,7 @@ uint8_t spectrum_mikroplus_device::iorq_r(offs_t offset)
return data;
}
-int spectrum_mikroplus_device::romcs()
+bool spectrum_mikroplus_device::romcs()
{
return 1;
}
diff --git a/src/devices/bus/spectrum/mikroplus.h b/src/devices/bus/spectrum/mikroplus.h
index 9f6a683ee9d..2ac3bb08fb1 100644
--- a/src/devices/bus/spectrum/mikroplus.h
+++ b/src/devices/bus/spectrum/mikroplus.h
@@ -36,7 +36,7 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual ioport_constructor device_input_ports() const override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
diff --git a/src/devices/bus/spectrum/mpoker.cpp b/src/devices/bus/spectrum/mpoker.cpp
index 9dc2c69c18d..99be5b63f55 100644
--- a/src/devices/bus/spectrum/mpoker.cpp
+++ b/src/devices/bus/spectrum/mpoker.cpp
@@ -129,7 +129,7 @@ void spectrum_mpoker_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_mpoker_device::romcs()
+bool spectrum_mpoker_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/mpoker.h b/src/devices/bus/spectrum/mpoker.h
index 003effe3998..12e72154d5e 100644
--- a/src/devices/bus/spectrum/mpoker.h
+++ b/src/devices/bus/spectrum/mpoker.h
@@ -36,11 +36,11 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
required_memory_region m_rom;
- int m_romcs;
+ bool m_romcs;
};
// device type definition
diff --git a/src/devices/bus/spectrum/opus.cpp b/src/devices/bus/spectrum/opus.cpp
index 791804b532a..fef2107cb72 100644
--- a/src/devices/bus/spectrum/opus.cpp
+++ b/src/devices/bus/spectrum/opus.cpp
@@ -159,9 +159,9 @@ void spectrum_opus_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_opus_device::romcs()
+bool spectrum_opus_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_opus_device::post_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/opus.h b/src/devices/bus/spectrum/opus.h
index 109f8efe70f..1bdf7ad26fa 100644
--- a/src/devices/bus/spectrum/opus.h
+++ b/src/devices/bus/spectrum/opus.h
@@ -45,7 +45,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -66,7 +66,7 @@ private:
required_device<centronics_device> m_centronics;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
uint8_t m_ram[4 * 1024];
};
diff --git a/src/devices/bus/spectrum/plus2test.cpp b/src/devices/bus/spectrum/plus2test.cpp
index f11bda87fe2..1f6e81246a5 100644
--- a/src/devices/bus/spectrum/plus2test.cpp
+++ b/src/devices/bus/spectrum/plus2test.cpp
@@ -63,7 +63,7 @@ void spectrum_plus2test_device::device_start()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_plus2test_device::romcs()
+bool spectrum_plus2test_device::romcs()
{
return 1;
}
diff --git a/src/devices/bus/spectrum/plus2test.h b/src/devices/bus/spectrum/plus2test.h
index 42f6c5b4aea..34a7e014e41 100644
--- a/src/devices/bus/spectrum/plus2test.h
+++ b/src/devices/bus/spectrum/plus2test.h
@@ -35,7 +35,7 @@ protected:
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t mreq_r(offs_t offset) override;
private:
diff --git a/src/devices/bus/spectrum/sdi.cpp b/src/devices/bus/spectrum/sdi.cpp
index 3722f80bdec..fc5e1de2406 100644
--- a/src/devices/bus/spectrum/sdi.cpp
+++ b/src/devices/bus/spectrum/sdi.cpp
@@ -98,7 +98,7 @@ void spectrum_sdi_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_sdi_device::romcs()
+bool spectrum_sdi_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/sdi.h b/src/devices/bus/spectrum/sdi.h
index b85f7eb40dc..539ca55eb6b 100644
--- a/src/devices/bus/spectrum/sdi.h
+++ b/src/devices/bus/spectrum/sdi.h
@@ -41,7 +41,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
required_memory_region m_rom;
required_device<i8255_device> m_ppi;
@@ -50,7 +50,7 @@ protected:
void ppic_w(uint8_t data);
uint8_t ppic_r();
- int m_romcs;
+ bool m_romcs;
};
diff --git a/src/devices/bus/spectrum/sixword.cpp b/src/devices/bus/spectrum/sixword.cpp
index 5686f61b1e5..81c3ad842a4 100644
--- a/src/devices/bus/spectrum/sixword.cpp
+++ b/src/devices/bus/spectrum/sixword.cpp
@@ -268,9 +268,9 @@ void spectrum_swiftdisc2_device::device_reset()
// IMPLEMENTATION (swiftdisc)
//**************************************************************************
-int spectrum_swiftdisc_device::romcs()
+bool spectrum_swiftdisc_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_swiftdisc_device::post_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h
index e21bcd75e82..2c35304a391 100644
--- a/src/devices/bus/spectrum/sixword.h
+++ b/src/devices/bus/spectrum/sixword.h
@@ -48,7 +48,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -63,7 +63,7 @@ protected:
required_device<rs232_port_device> m_rs232;
required_ioport m_joy;
- int m_romcs;
+ bool m_romcs;
u8 m_ram[0x2000];
u16 m_rombank;
u8 m_control;
diff --git a/src/devices/bus/spectrum/speccydos.cpp b/src/devices/bus/spectrum/speccydos.cpp
index 08440c76f78..4512da94d05 100644
--- a/src/devices/bus/spectrum/speccydos.cpp
+++ b/src/devices/bus/spectrum/speccydos.cpp
@@ -170,9 +170,9 @@ void spectrum_speccydos_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_speccydos_device::romcs()
+bool spectrum_speccydos_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_speccydos_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/speccydos.h b/src/devices/bus/spectrum/speccydos.h
index a09d61144c2..6c5ade77630 100644
--- a/src/devices/bus/spectrum/speccydos.h
+++ b/src/devices/bus/spectrum/speccydos.h
@@ -43,7 +43,7 @@ protected:
virtual void pre_opcode_fetch(offs_t offset) override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }
@@ -57,7 +57,7 @@ protected:
required_device_array<floppy_connector, 4> m_floppy;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
u8 m_control;
u8 m_ram[0x400];
};
diff --git a/src/devices/bus/spectrum/specmate.cpp b/src/devices/bus/spectrum/specmate.cpp
index c8cab185d71..4b090cf2c17 100644
--- a/src/devices/bus/spectrum/specmate.cpp
+++ b/src/devices/bus/spectrum/specmate.cpp
@@ -151,9 +151,9 @@ void spectrum_specmate_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_specmate_device::romcs()
+bool spectrum_specmate_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_specmate_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/specmate.h b/src/devices/bus/spectrum/specmate.h
index bdf5faa9b46..2c0951a119b 100644
--- a/src/devices/bus/spectrum/specmate.h
+++ b/src/devices/bus/spectrum/specmate.h
@@ -37,7 +37,7 @@ protected:
virtual void pre_opcode_fetch(offs_t offset) override;
virtual uint8_t mreq_r(offs_t offset) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }
@@ -50,7 +50,7 @@ protected:
required_memory_region m_rom;
required_device<spectrum_expansion_slot_device> m_exp;
- int m_romcs;
+ bool m_romcs;
};
// device type definition
diff --git a/src/devices/bus/spectrum/uslot.cpp b/src/devices/bus/spectrum/uslot.cpp
index 7c078599b18..d3955ec50d5 100644
--- a/src/devices/bus/spectrum/uslot.cpp
+++ b/src/devices/bus/spectrum/uslot.cpp
@@ -71,9 +71,9 @@ void spectrum_uslot_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_uslot_device::romcs()
+bool spectrum_uslot_device::romcs()
{
- return m_exp1->romcs() | m_exp2->romcs();
+ return m_exp1->romcs() || m_exp2->romcs();
}
void spectrum_uslot_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/uslot.h b/src/devices/bus/spectrum/uslot.h
index bff4679cb43..7cda022c3d9 100644
--- a/src/devices/bus/spectrum/uslot.h
+++ b/src/devices/bus/spectrum/uslot.h
@@ -44,7 +44,7 @@ protected:
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
private:
required_device<spectrum_expansion_slot_device> m_exp1;
diff --git a/src/devices/bus/spectrum/usource.cpp b/src/devices/bus/spectrum/usource.cpp
index d5561ac873c..6b9ffbbfbc0 100644
--- a/src/devices/bus/spectrum/usource.cpp
+++ b/src/devices/bus/spectrum/usource.cpp
@@ -78,7 +78,7 @@ void spectrum_usource_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_usource_device::romcs()
+bool spectrum_usource_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/usource.h b/src/devices/bus/spectrum/usource.h
index 22230be0a85..b30aadb7eec 100644
--- a/src/devices/bus/spectrum/usource.h
+++ b/src/devices/bus/spectrum/usource.h
@@ -39,13 +39,13 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void pre_opcode_fetch(offs_t offset) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t mreq_r(offs_t offset) override;
private:
required_memory_region m_rom;
- int m_romcs;
+ bool m_romcs;
};
diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp
index 586feaf8bbd..fd013dabacc 100644
--- a/src/devices/bus/spectrum/uspeech.cpp
+++ b/src/devices/bus/spectrum/uspeech.cpp
@@ -94,7 +94,7 @@ void spectrum_uspeech_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_uspeech_device::romcs()
+bool spectrum_uspeech_device::romcs()
{
return m_romcs;
}
diff --git a/src/devices/bus/spectrum/uspeech.h b/src/devices/bus/spectrum/uspeech.h
index ff6948fadb3..d1ec459c8d3 100644
--- a/src/devices/bus/spectrum/uspeech.h
+++ b/src/devices/bus/spectrum/uspeech.h
@@ -41,7 +41,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
virtual void pre_opcode_fetch(offs_t offset) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
virtual uint8_t mreq_r(offs_t offset) override;
virtual void mreq_w(offs_t offset, uint8_t data) override;
virtual uint8_t iorq_r(offs_t offset) override;
@@ -50,7 +50,7 @@ private:
required_device<sp0256_device> m_nsp;
required_memory_region m_rom;
- int m_romcs;
+ bool m_romcs;
};
diff --git a/src/devices/bus/spectrum/vtx5000.cpp b/src/devices/bus/spectrum/vtx5000.cpp
index 45a1e683de9..b028f198266 100644
--- a/src/devices/bus/spectrum/vtx5000.cpp
+++ b/src/devices/bus/spectrum/vtx5000.cpp
@@ -37,7 +37,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }
@@ -51,7 +51,7 @@ private:
required_device<i8251_device> m_usart;
required_memory_region m_rom;
- int m_romcs;
+ bool m_romcs;
};
@@ -126,9 +126,9 @@ void spectrum_vtx5000_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_vtx5000_device::romcs()
+bool spectrum_vtx5000_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
diff --git a/src/devices/bus/spectrum/wafa.cpp b/src/devices/bus/spectrum/wafa.cpp
index a085ba639d1..f1f722715b3 100644
--- a/src/devices/bus/spectrum/wafa.cpp
+++ b/src/devices/bus/spectrum/wafa.cpp
@@ -103,9 +103,9 @@ void spectrum_wafa_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-int spectrum_wafa_device::romcs()
+bool spectrum_wafa_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
void spectrum_wafa_device::pre_opcode_fetch(offs_t offset)
diff --git a/src/devices/bus/spectrum/wafa.h b/src/devices/bus/spectrum/wafa.h
index cbf885bff90..39ce95e2a76 100644
--- a/src/devices/bus/spectrum/wafa.h
+++ b/src/devices/bus/spectrum/wafa.h
@@ -44,7 +44,7 @@ protected:
virtual uint8_t mreq_r(offs_t offset) override;
virtual uint8_t iorq_r(offs_t offset) override;
virtual void iorq_w(offs_t offset, uint8_t data) override;
- virtual int romcs() override;
+ virtual bool romcs() override;
// passthru
virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }
@@ -57,7 +57,7 @@ private:
required_device<wafadrive_image_device> m_wafa1;
required_device<wafadrive_image_device> m_wafa2;
- int m_romcs;
+ bool m_romcs;
};