mirror of
https://github.com/holub/mame
synced 2025-04-25 17:56:43 +03:00
msx.cpp: Split out state class for MSX2 sets (nw)
This commit is contained in:
AJR
parent
4f0d8105b0
commit
c8445ac928
File diff suppressed because it is too large
Load Diff
@ -45,70 +45,70 @@
|
||||
|
||||
#define MCFG_MSX_LAYOUT_ROM(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_ROM_ADD(_tag, _page, _numpages, _region, _offset) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_RAM(_tag, _prim, _sec, _page, _numpages) \
|
||||
MCFG_MSX_SLOT_RAM_ADD(_tag, _page, _numpages) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_CARTRIDGE(_tag, _prim, _sec) \
|
||||
MCFG_MSX_SLOT_CARTRIDGE_ADD(_tag, WRITELINE(DEVICE_SELF, msx_state, msx_irq_source1)) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device);
|
||||
install_slot_pages(_prim, _sec, 0, 4, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_YAMAHA_EXPANSION(_tag, _prim, _sec, _default) \
|
||||
MCFG_MSX_SLOT_YAMAHA_EXPANSION_ADD(_tag, WRITELINE(DEVICE_SELF, msx_state, msx_irq_source2), _default) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device);
|
||||
install_slot_pages(_prim, _sec, 0, 4, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_RAM_MM(_tag, _prim, _sec, _total_size) \
|
||||
MCFG_MSX_SLOT_RAM_MM_ADD(_tag, _total_size) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device);
|
||||
install_slot_pages(_prim, _sec, 0, 4, device);
|
||||
|
||||
#define MCFG_MSX_RAMIO_SET_BITS(_ramio_set_bits) \
|
||||
MCFG_MSX_SLOT_RAMM_SET_RAMIO_BITS(_ramio_set_bits)
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK1(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK1_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */
|
||||
install_slot_pages(_prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK2(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK2_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */
|
||||
install_slot_pages(_prim, _sec, _page, _numpages + 1, device); /* Memory mapped FDC registers are also accessible through page 2 */
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK3(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK3_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK4(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK4_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK5(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK5_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1", "fdc:2", "fdc:3") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_DISK6(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_DISK6_ADD(_tag, _page, _numpages, _region, _offset, "fdc", "fdc:0", "fdc:1") \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_MUSIC(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_MUSIC_ADD(_tag, _page, _numpages, _region, _offset, "ym2413" ) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_BUNSETSU(_tag, _prim, _sec, _page, _numpages, _region, _offset, _bunsetsu_tag) \
|
||||
MCFG_MSX_SLOT_BUNSETSU_ADD(_tag, _page, _numpages, _region, _offset, _bunsetsu_tag) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_FS4600(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_FS4600_ADD(_tag, _page, _numpages, _region, _offset) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_PANASONIC08(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_PANASONIC08_ADD(_tag, _page, _numpages, _region, _offset) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
#define MCFG_MSX_LAYOUT_SONY08(_tag, _prim, _sec, _page, _numpages, _region, _offset) \
|
||||
MCFG_MSX_SLOT_SONY08_ADD(_tag, _page, _numpages, _region, _offset) \
|
||||
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
|
||||
install_slot_pages(_prim, _sec, _page, _numpages, device);
|
||||
|
||||
|
||||
class msx_state : public driver_device
|
||||
@ -117,12 +117,9 @@ public:
|
||||
msx_state(const machine_config &mconfig, device_type type, const char *tag)
|
||||
: driver_device(mconfig, type, tag)
|
||||
, m_maincpu(*this, "maincpu")
|
||||
, m_v9938(*this, "v9938")
|
||||
, m_v9958(*this, "v9958")
|
||||
, m_cassette(*this, "cassette")
|
||||
, m_ay8910(*this, "ay8910")
|
||||
, m_dac(*this, "dac")
|
||||
, m_rtc(*this, TC8521_TAG)
|
||||
, m_region_maincpu(*this, "maincpu")
|
||||
, m_region_kanji(*this, "kanji")
|
||||
, m_io_joy0(*this, "JOY0")
|
||||
@ -133,7 +130,6 @@ public:
|
||||
, m_io_key(*this, {"KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5"})
|
||||
, m_leds(*this, "led%u", 1U)
|
||||
, m_psg_b(0)
|
||||
, m_rtc_latch(0)
|
||||
, m_kanji_latch(0)
|
||||
, m_primary_slot(0)
|
||||
, m_port_c_old(0)
|
||||
@ -159,109 +155,51 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void mpc25fd(machine_config &config);
|
||||
void hc6(machine_config &config);
|
||||
void nms8220(machine_config &config);
|
||||
void hb75d(machine_config &config);
|
||||
void y805128r2e(machine_config &config);
|
||||
void fs4600(machine_config &config);
|
||||
void dpc100(machine_config &config);
|
||||
void nms8245f(machine_config &config);
|
||||
void hbf1xd(machine_config &config);
|
||||
void expert3t(machine_config &config);
|
||||
void hb55p(machine_config &config);
|
||||
void hotbi13p(machine_config &config);
|
||||
void fspc800(machine_config &config);
|
||||
void fsa1(machine_config &config);
|
||||
void mpc200(machine_config &config);
|
||||
void hb201p(machine_config &config);
|
||||
void hx22i(machine_config &config);
|
||||
void y503iiire(machine_config &config);
|
||||
void svi738dk(machine_config &config);
|
||||
void gfc1080a(machine_config &config);
|
||||
void svi738pl(machine_config &config);
|
||||
void hx10dp(machine_config &config);
|
||||
void perfect1(machine_config &config);
|
||||
void mlf110(machine_config &config);
|
||||
void fsa1gt(machine_config &config);
|
||||
void phc23(machine_config &config);
|
||||
void hbg900p(machine_config &config);
|
||||
void hbf12(machine_config &config);
|
||||
void fs5000(machine_config &config);
|
||||
void hbf1(machine_config &config);
|
||||
void phc70fd2(machine_config &config);
|
||||
void phc70fd(machine_config &config);
|
||||
void cf1200(machine_config &config);
|
||||
void hx20(machine_config &config);
|
||||
void yis604(machine_config &config);
|
||||
void cf3000(machine_config &config);
|
||||
void mpc100(machine_config &config);
|
||||
void tps312(machine_config &config);
|
||||
void phc55fd2(machine_config &config);
|
||||
void vg8020f(machine_config &config);
|
||||
void hx10f(machine_config &config);
|
||||
void hbf1xv(machine_config &config);
|
||||
void expertac(machine_config &config);
|
||||
void fsa1wsx(machine_config &config);
|
||||
void cf2000(machine_config &config);
|
||||
void expertpl(machine_config &config);
|
||||
void fsa1wxa(machine_config &config);
|
||||
void hx23i(machine_config &config);
|
||||
void fsa1wx(machine_config &config);
|
||||
void fsa1fx(machine_config &config);
|
||||
void cpc61(machine_config &config);
|
||||
void hbf1xdj(machine_config &config);
|
||||
void expert3i(machine_config &config);
|
||||
void y805256(machine_config &config);
|
||||
void fs4000a(machine_config &config);
|
||||
void y805128r2(machine_config &config);
|
||||
void expertdx(machine_config &config);
|
||||
void hbf700d(machine_config &config);
|
||||
void mpc10(machine_config &config);
|
||||
void yis60464(machine_config &config);
|
||||
void cpc300(machine_config &config);
|
||||
void pv16(machine_config &config);
|
||||
void tpc310(machine_config &config);
|
||||
void jvchc7gb(machine_config &config);
|
||||
void nms8255(machine_config &config);
|
||||
void cx7m128(machine_config &config);
|
||||
void phc28(machine_config &config);
|
||||
void hx10sa(machine_config &config);
|
||||
void cx7m(machine_config &config);
|
||||
void cx5m128(machine_config &config);
|
||||
void expert10(machine_config &config);
|
||||
void mlg3(machine_config &config);
|
||||
void mbh50(machine_config &config);
|
||||
void victhc90(machine_config &config);
|
||||
void hc7(machine_config &config);
|
||||
void fstm1(machine_config &config);
|
||||
void victhc95a(machine_config &config);
|
||||
void hx34(machine_config &config);
|
||||
void gfc1080(machine_config &config);
|
||||
void ax350(machine_config &config);
|
||||
void cpc51(machine_config &config);
|
||||
void victhc95(machine_config &config);
|
||||
void ax150(machine_config &config);
|
||||
void hx23f(machine_config &config);
|
||||
void phc28s(machine_config &config);
|
||||
void mlfx1(machine_config &config);
|
||||
void tadpc200(machine_config &config);
|
||||
void gsfc200(machine_config &config);
|
||||
void hbf9pr(machine_config &config);
|
||||
void hx10d(machine_config &config);
|
||||
void hx23(machine_config &config);
|
||||
void tpp311(machine_config &config);
|
||||
void hbf900(machine_config &config);
|
||||
void y503iiir(machine_config &config);
|
||||
void expertdp(machine_config &config);
|
||||
void yis303(machine_config &config);
|
||||
void nms8255f(machine_config &config);
|
||||
void hbf9sp(machine_config &config);
|
||||
void hbf700f(machine_config &config);
|
||||
void hbg900ap(machine_config &config);
|
||||
void canonv25(machine_config &config);
|
||||
void svi738sp(machine_config &config);
|
||||
void hbf900a(machine_config &config);
|
||||
void fmx(machine_config &config);
|
||||
void phc2(machine_config &config);
|
||||
void pv7(machine_config &config);
|
||||
@ -272,82 +210,36 @@ public:
|
||||
void hx20i(machine_config &config);
|
||||
void mx10(machine_config &config);
|
||||
void mx15(machine_config &config);
|
||||
void hbf700s(machine_config &config);
|
||||
void expert13(machine_config &config);
|
||||
void hotbit20(machine_config &config);
|
||||
void vg8235(machine_config &config);
|
||||
void bruc100(machine_config &config);
|
||||
void hbf500p(machine_config &config);
|
||||
void hx21(machine_config &config);
|
||||
void nms8250(machine_config &config);
|
||||
void cf3300(machine_config &config);
|
||||
void cx5f1(machine_config &config);
|
||||
void hbf500(machine_config &config);
|
||||
void fsa1f(machine_config &config);
|
||||
void hx10e(machine_config &config);
|
||||
void dpc200(machine_config &config);
|
||||
void fsa1a(machine_config &config);
|
||||
void hbf5(machine_config &config);
|
||||
void hbf1xdm2(machine_config &config);
|
||||
void cpc300e(machine_config &config);
|
||||
void phc77(machine_config &config);
|
||||
void svi738(machine_config &config);
|
||||
void dpc200e(machine_config &config);
|
||||
void mpc27(machine_config &config);
|
||||
void mpc2500f(machine_config &config);
|
||||
void canonv10(machine_config &config);
|
||||
void mpc2300(machine_config &config);
|
||||
void nms8280g(machine_config &config);
|
||||
void yis503(machine_config &config);
|
||||
void vg8230(machine_config &config);
|
||||
void vg8235f(machine_config &config);
|
||||
void mpc200sp(machine_config &config);
|
||||
void svi738sw(machine_config &config);
|
||||
void nms8280(machine_config &config);
|
||||
void nms8260(machine_config &config);
|
||||
void vg8010f(machine_config &config);
|
||||
void nms8250j(machine_config &config);
|
||||
void nms8245(machine_config &config);
|
||||
void fs5500f2(machine_config &config);
|
||||
void dpc180(machine_config &config);
|
||||
void fs5500f1(machine_config &config);
|
||||
void hbf500f(machine_config &config);
|
||||
void vg8240(machine_config &config);
|
||||
void mlf120(machine_config &config);
|
||||
void hb201(machine_config &config);
|
||||
void piopxv60(machine_config &config);
|
||||
void hb10(machine_config &config);
|
||||
void kmc5000(machine_config &config);
|
||||
void fsa1fm(machine_config &config);
|
||||
void fsa1mk2(machine_config &config);
|
||||
void hbf9p(machine_config &config);
|
||||
void hb501p(machine_config &config);
|
||||
void cx5m(machine_config &config);
|
||||
void phc35j(machine_config &config);
|
||||
void fs4700(machine_config &config);
|
||||
void mx101(machine_config &config);
|
||||
void mx64(machine_config &config);
|
||||
void hb55d(machine_config &config);
|
||||
void nms8280f(machine_config &config);
|
||||
void nms8250f(machine_config &config);
|
||||
void nms801(machine_config &config);
|
||||
void ax370(machine_config &config);
|
||||
void svi728(machine_config &config);
|
||||
void expert20(machine_config &config);
|
||||
void hotbi13b(machine_config &config);
|
||||
void mlg10(machine_config &config);
|
||||
void cpc400s(machine_config &config);
|
||||
void hotbit12(machine_config &config);
|
||||
void nms8220a(machine_config &config);
|
||||
void mbh70(machine_config &config);
|
||||
void mlg30(machine_config &config);
|
||||
void fpc900(machine_config &config);
|
||||
void hotbit11(machine_config &config);
|
||||
void y805128(machine_config &config);
|
||||
void cpc400(machine_config &config);
|
||||
void vg8010(machine_config &config);
|
||||
void hx34i(machine_config &config);
|
||||
void canonv30f(machine_config &config);
|
||||
void cf2700(machine_config &config);
|
||||
void hx21i(machine_config &config);
|
||||
void mbh2(machine_config &config);
|
||||
@ -364,7 +256,6 @@ public:
|
||||
void yis503f(machine_config &config);
|
||||
void cx5m2(machine_config &config);
|
||||
void spc800(machine_config &config);
|
||||
void cpc330k(machine_config &config);
|
||||
void canonv20(machine_config &config);
|
||||
void hb20p(machine_config &config);
|
||||
void mbh25(machine_config &config);
|
||||
@ -379,42 +270,27 @@ public:
|
||||
void phc28l(machine_config &config);
|
||||
void hb101p(machine_config &config);
|
||||
void expert11(machine_config &config);
|
||||
void hbf9s(machine_config &config);
|
||||
void vg802020(machine_config &config);
|
||||
void fsa1st(machine_config &config);
|
||||
void hx33(machine_config &config);
|
||||
void tadpc20a(machine_config &config);
|
||||
void hb75p(machine_config &config);
|
||||
void piopx7(machine_config &config);
|
||||
void fs4500(machine_config &config);
|
||||
void canonv8(machine_config &config);
|
||||
void cpc88(machine_config &config);
|
||||
void vg802000(machine_config &config);
|
||||
void mlf80(machine_config &config);
|
||||
void cpc50a(machine_config &config);
|
||||
void hb701fd(machine_config &config);
|
||||
void canonv30(machine_config &config);
|
||||
void vg8000(machine_config &config);
|
||||
void hb55(machine_config &config);
|
||||
void vg8230j(machine_config &config);
|
||||
void mlg1(machine_config &config);
|
||||
void cpg120(machine_config &config);
|
||||
void y503iir2(machine_config &config);
|
||||
void fpc500(machine_config &config);
|
||||
void hbf700p(machine_config &config);
|
||||
|
||||
protected:
|
||||
void msx(machine_config &config);
|
||||
template<typename VDPType> void msx1(VDPType &vdp_type, machine_config &config);
|
||||
void msx2(machine_config &config);
|
||||
void msx2p(machine_config &config);
|
||||
void msx2_pal(machine_config &config);
|
||||
|
||||
void msx1_cartlist(machine_config &config);
|
||||
void msx1_floplist(machine_config &config);
|
||||
void msx2_cartlist(machine_config &config);
|
||||
void msx2_floplist(machine_config &config);
|
||||
void msx2p_floplist(machine_config &config);
|
||||
void msxr_floplist(machine_config &config);
|
||||
void msx_fd1793(machine_config &config);
|
||||
void msx_wd2793_force_ready(machine_config &config);
|
||||
void msx_wd2793(machine_config &config);
|
||||
@ -424,16 +300,14 @@ public:
|
||||
void msx_1_35_ssdd_drive(machine_config &config);
|
||||
void msx_1_35_dd_drive(machine_config &config);
|
||||
void msx_2_35_dd_drive(machine_config &config);
|
||||
void msx_ym2413(machine_config &config);
|
||||
void msx2_64kb_vram(machine_config &config);
|
||||
|
||||
private:
|
||||
// static configuration helpers
|
||||
static void install_slot_pages(device_t &owner, uint8_t prim, uint8_t sec, uint8_t page, uint8_t numpages, device_t *device);
|
||||
void install_slot_pages(uint8_t prim, uint8_t sec, uint8_t page, uint8_t numpages, device_t *device);
|
||||
|
||||
virtual void driver_start() override;
|
||||
virtual void machine_start() override;
|
||||
virtual void machine_reset() override;
|
||||
virtual void device_post_load() override;
|
||||
|
||||
DECLARE_WRITE8_MEMBER(msx_sec_slot_w);
|
||||
DECLARE_READ8_MEMBER(msx_sec_slot_r);
|
||||
@ -442,49 +316,38 @@ private:
|
||||
DECLARE_WRITE8_MEMBER(msx_ppi_port_a_w);
|
||||
DECLARE_WRITE8_MEMBER(msx_ppi_port_c_w);
|
||||
DECLARE_READ8_MEMBER(msx_ppi_port_b_r);
|
||||
DECLARE_READ8_MEMBER(msx_rtc_reg_r);
|
||||
DECLARE_WRITE8_MEMBER(msx_rtc_reg_w);
|
||||
DECLARE_WRITE8_MEMBER(msx_rtc_latch_w);
|
||||
DECLARE_READ8_MEMBER(msx_mem_read);
|
||||
DECLARE_WRITE8_MEMBER(msx_mem_write);
|
||||
DECLARE_READ8_MEMBER(msx_switched_r);
|
||||
DECLARE_WRITE8_MEMBER(msx_switched_w);
|
||||
DECLARE_WRITE_LINE_MEMBER(turbo_w);
|
||||
|
||||
void msx_memory_map_all();
|
||||
void msx_memory_map_page(uint8_t page);
|
||||
void msx_memory_reset();
|
||||
|
||||
DECLARE_FLOPPY_FORMATS(floppy_formats);
|
||||
|
||||
DECLARE_READ8_MEMBER(msx_psg_port_a_r);
|
||||
DECLARE_READ8_MEMBER(msx_psg_port_b_r);
|
||||
DECLARE_WRITE8_MEMBER(msx_psg_port_a_w);
|
||||
DECLARE_WRITE8_MEMBER(msx_psg_port_b_w);
|
||||
INTERRUPT_GEN_MEMBER(msx_interrupt);
|
||||
DECLARE_WRITE8_MEMBER(msx_ay8910_w);
|
||||
void msx_memory_init();
|
||||
void post_load();
|
||||
|
||||
private:
|
||||
void msx_memory_map_all();
|
||||
void msx_memory_map_page(uint8_t page);
|
||||
void msx_memory_reset();
|
||||
void msx_memory_init();
|
||||
|
||||
DECLARE_FLOPPY_FORMATS(floppy_formats);
|
||||
|
||||
INTERRUPT_GEN_MEMBER(msx_interrupt);
|
||||
|
||||
public:
|
||||
DECLARE_WRITE_LINE_MEMBER(msx_irq_source0) { msx_irq_source(0, state); } // usually tms9918/v9938/v9958
|
||||
DECLARE_WRITE_LINE_MEMBER(msx_irq_source1) { msx_irq_source(1, state); } // usually first cartridge slot
|
||||
DECLARE_WRITE_LINE_MEMBER(msx_irq_source2) { msx_irq_source(2, state); } // usually second cartridge slot
|
||||
DECLARE_WRITE_LINE_MEMBER(msx_irq_source3) { msx_irq_source(3, state); } // sometimes expansion slot
|
||||
|
||||
std::vector<msx_switched_interface *> m_switched;
|
||||
|
||||
void msx2_io_map(address_map &map);
|
||||
void msx2p_io_map(address_map &map);
|
||||
protected:
|
||||
void msx_io_map(address_map &map);
|
||||
void msx_memory_map(address_map &map);
|
||||
|
||||
required_device<z80_device> m_maincpu;
|
||||
optional_device<v9938_device> m_v9938;
|
||||
optional_device<v9958_device> m_v9958;
|
||||
required_device<cassette_image_device> m_cassette;
|
||||
required_device<ay8910_device> m_ay8910;
|
||||
required_device<dac_bit_interface> m_dac;
|
||||
optional_device<rp5c01_device> m_rtc;
|
||||
required_memory_region m_region_maincpu;
|
||||
optional_memory_region m_region_kanji;
|
||||
required_ioport m_io_joy0;
|
||||
@ -495,13 +358,12 @@ private:
|
||||
required_ioport_array<6> m_io_key;
|
||||
output_finder<2> m_leds;
|
||||
|
||||
private:
|
||||
/* PSG */
|
||||
int m_psg_b;
|
||||
/* mouse */
|
||||
uint16_t m_mouse[2];
|
||||
int m_mouse_stat[2];
|
||||
/* rtc */
|
||||
int m_rtc_latch;
|
||||
/* kanji */
|
||||
int m_kanji_latch;
|
||||
/* memory */
|
||||
@ -521,4 +383,168 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class msx2_state : public msx_state
|
||||
{
|
||||
public:
|
||||
msx2_state(const machine_config &mconfig, device_type type, const char *tag)
|
||||
: msx_state(mconfig, type, tag)
|
||||
, m_v9938(*this, "v9938")
|
||||
, m_v9958(*this, "v9958")
|
||||
, m_rtc(*this, TC8521_TAG)
|
||||
, m_rtc_latch(0)
|
||||
{
|
||||
}
|
||||
|
||||
void ax350(machine_config &config);
|
||||
void ax370(machine_config &config);
|
||||
void canonv25(machine_config &config);
|
||||
void canonv30(machine_config &config);
|
||||
void canonv30f(machine_config &config);
|
||||
void cpc300(machine_config &config);
|
||||
void cpc300e(machine_config &config);
|
||||
void cpc330k(machine_config &config);
|
||||
void cpc400(machine_config &config);
|
||||
void cpc400s(machine_config &config);
|
||||
void cpc61(machine_config &config);
|
||||
void cpg120(machine_config &config);
|
||||
void fpc900(machine_config &config);
|
||||
void expert20(machine_config &config);
|
||||
void mbh70(machine_config &config);
|
||||
void kmc5000(machine_config &config);
|
||||
void mlg1(machine_config &config);
|
||||
void mlg3(machine_config &config);
|
||||
void mlg10(machine_config &config);
|
||||
void mlg30(machine_config &config);
|
||||
void fs4500(machine_config &config);
|
||||
void fs4600(machine_config &config);
|
||||
void fs4700(machine_config &config);
|
||||
void fs5000(machine_config &config);
|
||||
void fs5500f1(machine_config &config);
|
||||
void fs5500f2(machine_config &config);
|
||||
void fsa1(machine_config &config);
|
||||
void fsa1a(machine_config &config);
|
||||
void fsa1f(machine_config &config);
|
||||
void fsa1fm(machine_config &config);
|
||||
void fsa1mk2(machine_config &config);
|
||||
void nms8220(machine_config &config);
|
||||
void nms8220a(machine_config &config);
|
||||
void nms8245(machine_config &config);
|
||||
void nms8245f(machine_config &config);
|
||||
void nms8250(machine_config &config);
|
||||
void nms8250f(machine_config &config);
|
||||
void nms8250j(machine_config &config);
|
||||
void nms8255(machine_config &config);
|
||||
void nms8255f(machine_config &config);
|
||||
void nms8260(machine_config &config);
|
||||
void nms8280(machine_config &config);
|
||||
void nms8280f(machine_config &config);
|
||||
void nms8280g(machine_config &config);
|
||||
void vg8230(machine_config &config);
|
||||
void vg8230j(machine_config &config);
|
||||
void vg8235(machine_config &config);
|
||||
void vg8235f(machine_config &config);
|
||||
void vg8240(machine_config &config);
|
||||
void mpc2300(machine_config &config);
|
||||
void mpc2500f(machine_config &config);
|
||||
void mpc25fd(machine_config &config);
|
||||
void mpc27(machine_config &config);
|
||||
void phc23(machine_config &config);
|
||||
void phc55fd2(machine_config &config);
|
||||
void phc77(machine_config &config);
|
||||
void hotbit20(machine_config &config);
|
||||
void hbf1(machine_config &config);
|
||||
void hbf12(machine_config &config);
|
||||
void hbf1xd(machine_config &config);
|
||||
void hbf1xdm2(machine_config &config);
|
||||
void hbf5(machine_config &config);
|
||||
void hbf500(machine_config &config);
|
||||
void hbf500f(machine_config &config);
|
||||
void hbf500p(machine_config &config);
|
||||
void hbf700d(machine_config &config);
|
||||
void hbf700f(machine_config &config);
|
||||
void hbf700p(machine_config &config);
|
||||
void hbf700s(machine_config &config);
|
||||
void hbf900(machine_config &config);
|
||||
void hbf900a(machine_config &config);
|
||||
void hbf9p(machine_config &config);
|
||||
void hbf9pr(machine_config &config);
|
||||
void hbf9s(machine_config &config);
|
||||
void hbg900ap(machine_config &config);
|
||||
void hbg900p(machine_config &config);
|
||||
void tpc310(machine_config &config);
|
||||
void tpp311(machine_config &config);
|
||||
void tps312(machine_config &config);
|
||||
void hx23(machine_config &config);
|
||||
void hx23f(machine_config &config);
|
||||
void hx23i(machine_config &config);
|
||||
void hx33(machine_config &config);
|
||||
void hx34(machine_config &config);
|
||||
void hx34i(machine_config &config);
|
||||
void fstm1(machine_config &config);
|
||||
void victhc90(machine_config &config);
|
||||
void victhc95(machine_config &config);
|
||||
void victhc95a(machine_config &config);
|
||||
void cx7m(machine_config &config);
|
||||
void cx7m128(machine_config &config);
|
||||
void y503iiir(machine_config &config);
|
||||
void y503iiire(machine_config &config);
|
||||
void yis60464(machine_config &config);
|
||||
void yis604(machine_config &config);
|
||||
void y805128(machine_config &config);
|
||||
void y805128r2(machine_config &config);
|
||||
void y805128r2e(machine_config &config);
|
||||
void y805256(machine_config &config);
|
||||
void expert3i(machine_config &config);
|
||||
void expert3t(machine_config &config);
|
||||
void expertac(machine_config &config);
|
||||
void expertdx(machine_config &config);
|
||||
void fsa1fx(machine_config &config);
|
||||
void fsa1wsx(machine_config &config);
|
||||
void fsa1wx(machine_config &config);
|
||||
void fsa1wxa(machine_config &config);
|
||||
void phc35j(machine_config &config);
|
||||
void phc70fd(machine_config &config);
|
||||
void phc70fd2(machine_config &config);
|
||||
void hbf1xdj(machine_config &config);
|
||||
void hbf1xv(machine_config &config);
|
||||
void hbf9sp(machine_config &config);
|
||||
void fsa1gt(machine_config &config);
|
||||
void fsa1st(machine_config &config);
|
||||
|
||||
protected:
|
||||
virtual void machine_start() override;
|
||||
|
||||
private:
|
||||
void msx2(machine_config &config);
|
||||
void msx2p(machine_config &config);
|
||||
void msx2_pal(machine_config &config);
|
||||
|
||||
void msx2_cartlist(machine_config &config);
|
||||
void msx2_floplist(machine_config &config);
|
||||
void msx2p_floplist(machine_config &config);
|
||||
void msxr_floplist(machine_config &config);
|
||||
void msx_ym2413(machine_config &config);
|
||||
void msx2_64kb_vram(machine_config &config);
|
||||
|
||||
DECLARE_READ8_MEMBER(msx_rtc_reg_r);
|
||||
DECLARE_WRITE8_MEMBER(msx_rtc_reg_w);
|
||||
DECLARE_WRITE8_MEMBER(msx_rtc_latch_w);
|
||||
DECLARE_READ8_MEMBER(msx_switched_r);
|
||||
DECLARE_WRITE8_MEMBER(msx_switched_w);
|
||||
DECLARE_WRITE_LINE_MEMBER(turbo_w);
|
||||
|
||||
void msx2_io_map(address_map &map);
|
||||
void msx2p_io_map(address_map &map);
|
||||
|
||||
std::vector<msx_switched_interface *> m_switched;
|
||||
|
||||
optional_device<v9938_device> m_v9938;
|
||||
optional_device<v9958_device> m_v9958;
|
||||
required_device<rp5c01_device> m_rtc;
|
||||
|
||||
/* rtc */
|
||||
int m_rtc_latch;
|
||||
};
|
||||
|
||||
|
||||
#endif // MAME_INCLUDES_MSX_H
|
||||
|
||||
@ -60,6 +60,12 @@ void msx_state::machine_start()
|
||||
{
|
||||
m_leds.resolve();
|
||||
m_port_c_old = 0xff;
|
||||
}
|
||||
|
||||
|
||||
void msx2_state::machine_start()
|
||||
{
|
||||
msx_state::machine_start();
|
||||
|
||||
for (device_t &device : device_iterator(*this))
|
||||
{
|
||||
@ -69,6 +75,8 @@ void msx_state::machine_start()
|
||||
m_switched.push_back(switched);
|
||||
}
|
||||
}
|
||||
|
||||
save_item(NAME(m_rtc_latch));
|
||||
}
|
||||
|
||||
|
||||
@ -199,7 +207,6 @@ void msx_state::driver_start()
|
||||
save_item(NAME(m_psg_b));
|
||||
save_item(NAME(m_mouse));
|
||||
save_item(NAME(m_mouse_stat));
|
||||
save_item(NAME(m_rtc_latch));
|
||||
save_item(NAME(m_kanji_latch));
|
||||
save_item(NAME(m_slot_expanded));
|
||||
save_item(NAME(m_primary_slot));
|
||||
@ -207,11 +214,9 @@ void msx_state::driver_start()
|
||||
save_item(NAME(m_port_c_old));
|
||||
save_item(NAME(m_keylatch));
|
||||
save_item(NAME(m_irq_state));
|
||||
|
||||
machine().save().register_postload(save_prepost_delegate(FUNC(msx_state::post_load), this));
|
||||
}
|
||||
|
||||
void msx_state::post_load()
|
||||
void msx_state::device_post_load()
|
||||
{
|
||||
for (int page = 0; page < 4; page++)
|
||||
{
|
||||
@ -315,17 +320,17 @@ WRITE8_MEMBER(msx_state::msx_psg_port_b_w)
|
||||
** RTC functions
|
||||
*/
|
||||
|
||||
WRITE8_MEMBER( msx_state::msx_rtc_latch_w )
|
||||
WRITE8_MEMBER( msx2_state::msx_rtc_latch_w )
|
||||
{
|
||||
m_rtc_latch = data & 15;
|
||||
}
|
||||
|
||||
WRITE8_MEMBER( msx_state::msx_rtc_reg_w )
|
||||
WRITE8_MEMBER( msx2_state::msx_rtc_reg_w )
|
||||
{
|
||||
m_rtc->write(space, m_rtc_latch, data);
|
||||
}
|
||||
|
||||
READ8_MEMBER( msx_state::msx_rtc_reg_r )
|
||||
READ8_MEMBER( msx2_state::msx_rtc_reg_r )
|
||||
{
|
||||
return m_rtc->read(space, m_rtc_latch);
|
||||
}
|
||||
@ -390,18 +395,17 @@ READ8_MEMBER( msx_state::msx_ppi_port_b_r )
|
||||
*
|
||||
***********************************************************************/
|
||||
|
||||
void msx_state::install_slot_pages(device_t &owner, uint8_t prim, uint8_t sec, uint8_t page, uint8_t numpages, device_t *device)
|
||||
void msx_state::install_slot_pages(uint8_t prim, uint8_t sec, uint8_t page, uint8_t numpages, device_t *device)
|
||||
{
|
||||
msx_state &msx = downcast<msx_state &>(owner);
|
||||
msx_internal_slot_interface *internal_slot = dynamic_cast<msx_internal_slot_interface *>(device);
|
||||
|
||||
for ( int i = page; i < std::min(page + numpages, 4); i++ )
|
||||
{
|
||||
msx.m_all_slots[prim][sec][i] = internal_slot;
|
||||
m_all_slots[prim][sec][i] = internal_slot;
|
||||
}
|
||||
if ( sec )
|
||||
{
|
||||
msx.m_slot_expanded[prim] = true;
|
||||
m_slot_expanded[prim] = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -519,7 +523,7 @@ WRITE8_MEMBER( msx_state::msx_kanji_w )
|
||||
m_kanji_latch = (m_kanji_latch & 0x1f800) | ((data & 0x3f) << 5);
|
||||
}
|
||||
|
||||
READ8_MEMBER( msx_state::msx_switched_r )
|
||||
READ8_MEMBER( msx2_state::msx_switched_r )
|
||||
{
|
||||
uint8_t data = 0xff;
|
||||
|
||||
@ -531,7 +535,7 @@ READ8_MEMBER( msx_state::msx_switched_r )
|
||||
return data;
|
||||
}
|
||||
|
||||
WRITE8_MEMBER( msx_state::msx_switched_w )
|
||||
WRITE8_MEMBER( msx2_state::msx_switched_w )
|
||||
{
|
||||
for (int i = 0; i < m_switched.size(); i++)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user