diff options
author | Dirk Best <mail@dirk-best.de> | 2017-01-29 12:42:26 +0100 |
---|---|---|
committer | Dirk Best <mail@dirk-best.de> | 2017-01-29 12:43:02 +0100 |
commit | 094ace1fbfb77d5ab075df25a3a81cf00c98ee31 (patch) | |
tree | cff1ce8dbc1ac74249e6e21f022ce213843347ea /src/mame/includes/amiga.h | |
parent | f2f55c1568a99c55b679775426e3fdd99e8c0bf9 (diff) |
Amiga: Move audio related registers into Paula device
The device is now independent from the Amiga state class.
Diffstat (limited to 'src/mame/includes/amiga.h')
-rw-r--r-- | src/mame/includes/amiga.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 6f7f568c986..7e9c7bb852e 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -336,7 +336,7 @@ public: m_cia_1(*this, "cia_1"), m_rs232(*this, "rs232"), m_centronics(*this, "centronics"), - m_sound(*this, "amiga"), + m_paula(*this, "amiga"), m_fdc(*this, "fdc"), m_screen(*this, "screen"), m_palette(*this, "palette"), @@ -378,12 +378,15 @@ public: { return EXPECTED(byteoffs < m_chip_ram.bytes()) ? m_chip_ram.read(byteoffs >> 1) : 0xffff; } + void chip_ram_w(offs_t byteoffs, uint16_t data) { if (EXPECTED(byteoffs < m_chip_ram.bytes())) m_chip_ram.write(byteoffs >> 1, data); } + DECLARE_READ16_MEMBER(chip_ram_r) { return chip_ram_r(offset); } + /* sprite states */ uint8_t m_sprite_comparitor_enable_mask; uint8_t m_sprite_dma_reload_mask; @@ -467,6 +470,8 @@ public: DECLARE_READ16_MEMBER( custom_chip_r ); DECLARE_WRITE16_MEMBER( custom_chip_w ); + DECLARE_WRITE_LINE_MEMBER( paula_int_w ); + DECLARE_READ16_MEMBER( rom_mirror_r ); DECLARE_READ32_MEMBER( rom_mirror32_r ); @@ -563,7 +568,7 @@ protected: required_device<mos8520_device> m_cia_1; optional_device<rs232_port_device> m_rs232; optional_device<centronics_device> m_centronics; - required_device<paula_8364_device> m_sound; + required_device<paula_8364_device> m_paula; optional_device<amiga_fdc> m_fdc; required_device<screen_device> m_screen; optional_device<palette_device> m_palette; |