diff options
Diffstat (limited to 'src/mame/includes')
29 files changed, 61 insertions, 32 deletions
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 6e6e03738eb..470306f3d4e 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "video/decbac06.h" #include "video/decmxc06.h" +#include "cpu/h6280/h6280.h" /************************************************************************* @@ -32,7 +33,7 @@ public: int m_trio_control_select; /* devices */ - required_device<cpu_device> m_maincpu; + required_device<h6280_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<deco_bac06_device> m_tilegen1; required_device<deco_bac06_device> m_tilegen2; diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h index a6356812534..dd3d7626070 100644 --- a/src/mame/includes/adam.h +++ b/src/mame/includes/adam.h @@ -52,7 +52,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_netcpu; + required_device<m6801_cpu_device> m_netcpu; required_device<tms9928a_device> m_vdc; required_device<sn76489a_device> m_psg; required_device<ram_device> m_ram; diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index df5433a7591..e346c434618 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail #include "machine/gen_latch.h" +#include "cpu/h6280/h6280.h" #include "sound/msm5205.h" #include "video/huc6260.h" #include "video/huc6270.h" @@ -22,8 +23,8 @@ public: m_soundlatch(*this, "soundlatch") { } - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_maincpu; + required_device<h6280_device> m_audiocpu; required_device<msm5205_device> m_msm; required_device<screen_device> m_screen; required_device<huc6260_device> m_huc6260; diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 9c71487aa24..039ae681755 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -6,6 +6,7 @@ *************************************************************************/ +#include "cpu/h6280/h6280.h" #include "sound/okim6295.h" #include "video/deco16ic.h" #include "video/deco_ace.h" @@ -40,7 +41,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; optional_device<deco104_device> m_deco104; required_device<deco_ace_device> m_deco_ace; required_device<deco16ic_device> m_deco_tilegen1; diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 78ba755ece0..9a297c11200 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -117,6 +117,6 @@ protected: uint16_t m_sprite_dest_offs; uint16_t m_misc_control; int m_xcount; - required_device<cpu_device> m_maincpu; + required_device<tms34020_device> m_maincpu; required_device<screen_device> m_screen; }; diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 9c49fccee24..b9c1ebdf48c 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "cpu/h6280/h6280.h" #include "video/bufsprite.h" #include "video/decospr.h" #include "video/deco16ic.h" @@ -30,7 +31,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device_array<deco16ic_device, 2> m_deco_tilegen; required_device<palette_device> m_palette; required_device<buffered_spriteram16_device> m_spriteram; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 7e840150af2..8bd4461b88c 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -6,6 +6,7 @@ *************************************************************************/ +#include "cpu/h6280/h6280.h" #include "sound/okim6295.h" #include "video/deco16ic.h" #include "video/bufsprite.h" diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index 878754ae9f2..8fd3dc9a9bc 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -17,7 +17,7 @@ public: m_vram_base(*this, "vram_base"), m_nvram(*this, "nvram") { } - required_device<cpu_device> m_maincpu; + required_device<tms34010_device> m_maincpu; required_device<cpu_device> m_dsp; optional_device<tlc34076_device> m_tlc34076; diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 56ee1055679..dc697a9d842 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail #include "machine/gen_latch.h" +#include "cpu/h6280/h6280.h" #include "video/deco16ic.h" #include "video/bufsprite.h" #include "video/decospr.h" @@ -26,7 +27,7 @@ public: m_generic_paletteram2_16(*this, "paletteram2") { } required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<palette_device> m_palette; required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 57e8b27c565..b4394351605 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "cpu/h6280/h6280.h" #include "sound/okim6295.h" #include "video/deco16ic.h" #include "video/decocomn.h" @@ -39,7 +40,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<cpu_device> m_subcpu; required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index e7f30a8ecfd..7e97e21675e 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail #include "machine/74157.h" +#include "cpu/h6280/h6280.h" #include "machine/bankdev.h" #include "machine/gen_latch.h" #include "video/decbac06.h" @@ -38,7 +39,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; - optional_device<cpu_device> m_subcpu; + optional_device<h6280_device> m_subcpu; optional_device<cpu_device> m_mcu; required_device<palette_device> m_palette; optional_device<deco_bac06_device> m_tilegen1; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index aa49d351e9b..b4dc81273de 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#include "cpu/h6280/h6280.h" #include "audio/decobsmt.h" #include "video/bufsprite.h" #include "video/decospr.h" diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 743938cb501..f07f3fced9c 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -6,6 +6,7 @@ *************************************************************************/ +#include "cpu/h6280/h6280.h" #include "video/decospr.h" #include "video/deco16ic.h" #include "machine/deco104.h" @@ -35,7 +36,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<deco16ic_device> m_deco_tilegen1; required_shared_ptr<uint16_t> m_decrypted_opcodes; DECLARE_DRIVER_INIT(dietgo); diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index c019aa7057d..dcd315fffdb 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -89,4 +89,11 @@ public: void multchmp_sound_io_map(address_map &map); void multchmp_sound_map(address_map &map); void tangtang_map(address_map &map); + + void esd16_io_area_dsw(address_map &map, u32 base); + void esd16_io_area_eeprom(address_map &map, u32 base); + void esd16_vid_attr_area(address_map &map, u32 base); + void esd16_palette_area(address_map &map, u32 base); + void esd16_sprite_area(address_map &map, u32 base); + void esd16_vram_area(address_map &map, u32 base); }; diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 68d3bb55469..ad53dff6fae 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -24,7 +24,7 @@ public: m_master_videoram(*this, "master_videoram"), m_slave_videoram(*this, "slave_videoram") { } - required_device<cpu_device> m_maincpu; + required_device<tms34010_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_audioslave; required_device_array<generic_latch_8_device, 2> m_soundlatch; diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index e24b32942ea..3ff4eb9ec6b 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -6,6 +6,7 @@ *************************************************************************/ +#include "cpu/h6280/h6280.h" #include "video/decospr.h" #include "video/deco16ic.h" #include "machine/deco146.h" @@ -35,7 +36,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<deco16ic_device> m_deco_tilegen1; DECLARE_DRIVER_INIT(funkyjet); virtual void machine_start() override; diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 254c175f735..6089d889bac 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -71,7 +71,6 @@ public: protected: required_device<m68000_device> m_maincpu; -private: uint32_t snowboard_latch; uint16_t *m_videoram; diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 1992879c9c1..4cd01f2f64b 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -3,6 +3,9 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "cpu/m6809/m6809.h" +#include "cpu/mcs48/mcs48.h" +#include "cpu/z80/z80.h" class gladiatr_state_base : public driver_device @@ -55,13 +58,13 @@ protected: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_subcpu; - required_device<cpu_device> m_audiocpu; - optional_device<cpu_device> m_cctl; - optional_device<cpu_device> m_ccpu; - optional_device<cpu_device> m_ucpu; - optional_device<cpu_device> m_csnd; + required_device<z80_device> m_maincpu; + required_device<z80_device> m_subcpu; + required_device<mc6809_device> m_audiocpu; + optional_device<upi41_cpu_device> m_cctl; + optional_device<upi41_cpu_device> m_ccpu; + optional_device<upi41_cpu_device> m_ucpu; + optional_device<upi41_cpu_device> m_csnd; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; required_device<msm5205_device> m_msm; diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index 2a9bdaa429b..cb84cc334a9 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -68,8 +68,8 @@ public: m_kbrequest(1) { } - required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_subcpu; + required_device<hd63701_cpu_device> m_maincpu; + required_device<hd63701_cpu_device> m_subcpu; required_device<mc146818_device> m_rtc; required_device<upd7227_device> m_lcdc0; required_device<upd7227_device> m_lcdc1; diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index c74873d0eee..f33a0f2dffc 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -35,7 +35,7 @@ public: m_light1_y(*this, "LIGHT1_Y") { } - required_device<cpu_device> m_maincpu; + required_device<tms34010_device> m_maincpu; required_device<screen_device> m_screen; required_device<ticket_dispenser_device> m_ticket; optional_ioport m_paddle; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 1c632770dbc..86fbe55aad5 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#include "cpu/m6800/m6801.h" #include "machine/c117.h" #include "sound/dac.h" #include "sound/namco.h" @@ -35,7 +36,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<cpu_device> m_audiocpu; - required_device<cpu_device> m_mcu; + required_device<hd63701_cpu_device> m_mcu; required_device<namco_c116_device> m_c116; required_device<namco_c117_device> m_c117; required_device<dac_8bit_r2r_device> m_dac0; diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 0911a123317..8f2f2866305 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#include "cpu/m6800/m6801.h" #include "sound/namco.h" #include "screen.h" @@ -19,7 +20,7 @@ public: m_spriteram(*this, "spriteram") { } required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_mcu; + required_device<hd63701_cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 50d7d2fdeda..69fcea02ddf 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -58,7 +58,7 @@ public: void vanvan_portmap(address_map &map); void woodpek_map(address_map &map); void writeport(address_map &map); -private: +protected: optional_device<namco_device> m_namco_sound; required_device<watchdog_timer_device> m_watchdog; optional_shared_ptr<uint8_t> m_spriteram; diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index e2e6068e0e1..43893709a3e 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/okim6295.h" +#include "cpu/h6280/h6280.h" #include "video/deco16ic.h" #include "video/decocomn.h" #include "video/bufsprite.h" @@ -33,7 +34,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<deco_146_base_device> m_ioprot; required_device<decocomn_device> m_decocomn; required_device_array<deco16ic_device, 2> m_deco_tilegen; diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 43251d0c324..2fe11a37549 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia +#include "cpu/m6800/m6801.h" #include "sound/namco.h" class skykid_state : public driver_device @@ -21,7 +22,7 @@ public: required_shared_ptr<uint8_t> m_textram; required_shared_ptr<uint8_t> m_spriteram; required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_mcu; + required_device<hd63701_cpu_device> m_mcu; required_device<namco_cus30_device> m_cus30; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index c33b84b68ec..34f20749778 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -206,4 +206,6 @@ protected: required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; + + void ssv_map(address_map &map, u32 rom); }; diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index e1b6cf38857..cbf980aa93f 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -130,6 +130,8 @@ protected: virtual void machine_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void tc0180vcu_memrw(address_map &map, u32 addr); + private: /* memory pointers */ required_shared_ptr<uint16_t> m_spriteram; diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index 67d1eff90aa..7cbbb239274 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -71,7 +71,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<ti8x_link_port_device> m_link_port; optional_shared_ptr<uint8_t> m_nvram; - optional_device<intelfsh_device> m_flash; + optional_device<intelfsh8_device> m_flash; optional_device<address_map_bank_device> m_membank1; optional_device<address_map_bank_device> m_membank2; optional_device<address_map_bank_device> m_membank3; diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index 2b0d1838d51..83bd7db716f 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -6,6 +6,7 @@ *************************************************************************/ +#include "cpu/h6280/h6280.h" #include "machine/gen_latch.h" #include "video/bufsprite.h" #include "video/deco16ic.h" @@ -29,7 +30,7 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; + required_device<h6280_device> m_audiocpu; required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; required_device<deco_mxc06_device> m_spritegen; |