Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-18 10:06:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

meritm: doesn't use AY8930 expanded mode either, too bad

Browse source
This commit is contained in:
hap 2016-02-23 20:46:45 +01:00
parent 880082b862
commit fcf08e29f5
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/mame/drivers/meritm.cpp
View file

@ -205,9 +205,22 @@ public:
m_region_extra(*this, "extra")
{ }
std::unique_ptr<UINT8[]> m_ram;
required_device<z80pio_device> m_z80pio_0;
required_device<z80pio_device> m_z80pio_1;
required_device<ds1204_device> m_ds1204;
required_device<v9938_device> m_v9938_0;
required_device<v9938_device> m_v9938_1;
optional_device<microtouch_device> m_microtouch;
optional_device<ns16550_device> m_uart;
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
required_memory_bank m_bank1;
optional_memory_bank m_bank2;
optional_memory_bank m_bank3;
required_memory_region m_region_maincpu;
optional_memory_region m_region_extra;
std::unique_ptr<UINT8[]> m_ram;
int m_vint;
int m_interrupt_vdp0_state;
int m_interrupt_vdp1_state;
@ -216,11 +229,7 @@ public:
int m_bank;
int m_psd_a15;
UINT16 m_questions_loword_address;
required_device<ds1204_device> m_ds1204;
required_device<v9938_device> m_v9938_0;
required_device<v9938_device> m_v9938_1;
optional_device<microtouch_device> m_microtouch;
optional_device<ns16550_device> m_uart;
DECLARE_WRITE8_MEMBER(meritm_crt250_bank_w);
DECLARE_WRITE8_MEMBER(meritm_psd_a15_w);
DECLARE_WRITE8_MEMBER(meritm_bank_w);
@ -254,13 +263,6 @@ public:
UINT8 binary_to_BCD(UINT8 data);
DECLARE_WRITE_LINE_MEMBER(meritm_vdp0_interrupt);
DECLARE_WRITE_LINE_MEMBER(meritm_vdp1_interrupt);
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
required_memory_bank m_bank1;
optional_memory_bank m_bank2;
optional_memory_bank m_bank3;
required_memory_region m_region_maincpu;
optional_memory_region m_region_extra;
};
@ -541,8 +543,8 @@ static ADDRESS_MAP_START( meritm_crt250_io_map, AS_IO, 8, meritm_state )
AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("ppi8255", i8255_device, read, write)
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_device, read, write)
AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_device, read, write)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8930_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8930_device, address_data_w)
AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w)
ADDRESS_MAP_END
@ -554,8 +556,8 @@ static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, AS_IO, 8, meritm_state )
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_device, read, write)
AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_device, read, write)
AM_RANGE(0x60, 0x67) AM_DEVREADWRITE("ns16550", ns16550_device, ins8250_r, ins8250_w)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8930_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8930_device, address_data_w)
AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w)
ADDRESS_MAP_END
@ -575,8 +577,8 @@ static ADDRESS_MAP_START( meritm_io_map, AS_IO, 8, meritm_state )
AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("z80pio_0", z80pio_device, read, write)
AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("z80pio_1", z80pio_device, read, write)
AM_RANGE(0x60, 0x67) AM_DEVREADWRITE("ns16550", ns16550_device, ins8250_r, ins8250_w)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8910_device, address_data_w)
AM_RANGE(0x80, 0x80) AM_DEVREAD("aysnd", ay8930_device, data_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("aysnd", ay8930_device, address_data_w)
AM_RANGE(0xff, 0xff) AM_WRITE(meritm_bank_w)
ADDRESS_MAP_END
@ -1123,7 +1125,7 @@ static MACHINE_CONFIG_START( meritm_crt250, meritm_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12)
MCFG_SOUND_ADD("aysnd", AY8930, SYSTEM_CLK/12)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW")) /* Port A read */
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(meritm_state, meritm_ay8930_port_b_w)) /* Port B write */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)