Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 01:11:11 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(nw) more header cleanup, make tx1 use something that looks like C++ rather than driver_data abuse (still needs splitting tx1 and buggyboy parts)

Browse Source
This commit is contained in:
Vas Crabb 2018-11-23 19:15:49 +11:00
parent 25100fc16e
commit 8dfe57c729
54 changed files with 1154 additions and 899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/cchance.cpp
View File

@ -234,7 +234,7 @@ MACHINE_CONFIG_START(cchance_state::cchance)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INIT_OWNER(tnzs_base_state, prompalette)
MCFG_PALETTE_INIT_OWNER(cchance_state, prompalette)
SPEAKER(config, "mono").front_center();

2
src/mame/drivers/taito_l.cpp
View File

@ -1471,8 +1471,6 @@ MACHINE_CONFIG_START(taitol_state::l_system_video)
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
MCFG_VIDEO_START_OVERRIDE(taitol_state, taito_l)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", taitol_state, vbl_interrupt, "screen", 0, 1)
MACHINE_CONFIG_END

2
src/mame/drivers/tnzs.cpp
View File

@ -1600,7 +1600,7 @@ MACHINE_CONFIG_START(extrmatn_state::extrmatn)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(tnzs_base_state, prompalette)
MCFG_PALETTE_INIT_OWNER(extrmatn_state, prompalette)
MACHINE_CONFIG_END
void extrmatn_state::plumppop(machine_config &config)

13
src/mame/includes/ashnojoe.h
View File

@ -6,6 +6,10 @@
Success Joe / Ashita no Joe
*************************************************************************/
#ifndef MAME_INCLUDES_ASHNOJOE_H
#define MAME_INCLUDES_ASHNOJOE_H
#pragma once
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
@ -13,8 +17,8 @@
class ashnojoe_state : public driver_device
{
public:
ashnojoe_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
ashnojoe_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_tileram_3(*this, "tileram_3"),
m_tileram_4(*this, "tileram_4"),
m_tileram_5(*this, "tileram_5"),
@ -27,7 +31,8 @@ public:
m_audiocpu(*this, "audiocpu"),
m_msm(*this, "msm"),
m_gfxdecode(*this, "gfxdecode"),
m_soundlatch(*this, "soundlatch") { }
m_soundlatch(*this, "soundlatch")
{ }
/* memory pointers */
uint16_t * m_tileram_1;
@ -92,3 +97,5 @@ public:
void sound_map(address_map &map);
void sound_portmap(address_map &map);
};
#endif // MAME_INCLUDES_ASHNOJOE_H

10
src/mame/includes/bking.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Mike Balfour, Zsolt Vasvari
#ifndef MAME_INCLUDES_BKING_H
#define MAME_INCLUDES_BKING_H
#pragma once
#include "machine/taito68705interface.h"
#include "machine/gen_latch.h"
@ -10,8 +14,8 @@
class bking_state : public driver_device
{
public:
bking_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
bking_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_playfield_ram(*this, "playfield_ram"),
m_audiocpu(*this, "audiocpu"),
m_bmcu(*this, "bmcu"),
@ -101,3 +105,5 @@ public:
void bking_io_map(address_map &map);
void bking_map(address_map &map);
};
#endif // MAME_INCLUDES_BKING_H

26
src/mame/includes/bogeyman.h
View File

@ -5,6 +5,10 @@
Bogey Manor
*************************************************************************/
#ifndef MAME_INCLUDES_BOGEYMAN_H
#define MAME_INCLUDES_BOGEYMAN_H
#pragma once
#include "sound/ay8910.h"
#include "emupal.h"
@ -12,8 +16,8 @@
class bogeyman_state : public driver_device
{
public:
bogeyman_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
bogeyman_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
@ -23,8 +27,17 @@ public:
m_videoram2(*this, "videoram2"),
m_colorram(*this, "colorram"),
m_colorram2(*this, "colorram2"),
m_spriteram(*this, "spriteram") { }
m_spriteram(*this, "spriteram")
{ }
void bogeyman(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@ -59,13 +72,10 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(bogeyman);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void bogeyman(machine_config &config);
void bogeyman_map(address_map &map);
};
#endif // MAME_INCLUDES_BOGEYMAN_H

10
src/mame/includes/buggychl.h
View File

@ -3,6 +3,10 @@
/*
buggychl
*/
#ifndef MAME_INCLUDES_BUGGYCHL_H
#define MAME_INCLUDES_BUGGYCHL_H
#pragma once
#include "machine/taito68705interface.h"
#include "machine/input_merger.h"
@ -16,8 +20,8 @@
class buggychl_state : public driver_device
{
public:
buggychl_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
buggychl_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_charram(*this, "charram"),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
@ -106,3 +110,5 @@ private:
bool m_sound_irq_enable;
uint8_t m_sprite_lookup[0x2000];
};
#endif // MAME_INCLUDES_BUGGYCHL_H

13
src/mame/includes/chaknpop.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:BUT
#ifndef MAME_INCLUDES_CHAKNPOP_H
#define MAME_INCLUDES_CHAKNPOP_H
#pragma once
#include "machine/taito68705interface.h"
#include "emupal.h"
@ -7,15 +11,16 @@
class chaknpop_state : public driver_device
{
public:
chaknpop_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
chaknpop_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_bmcu(*this, "bmcu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_tx_ram(*this, "tx_ram"),
m_attr_ram(*this, "attr_ram"),
m_spr_ram(*this, "spr_ram") { }
m_spr_ram(*this, "spr_ram")
{ }
/* devices */
required_device<cpu_device> m_maincpu;
@ -63,3 +68,5 @@ public:
void chaknpop(machine_config &config);
void chaknpop_map(address_map &map);
};
#endif // MAME_INCLUDES_CHAKNPOP_H

13
src/mame/includes/crbaloon.h
View File

@ -5,6 +5,10 @@
Crazy Ballooon
*************************************************************************/
#ifndef MAME_INCLUDES_CRBALOON_H
#define MAME_INCLUDES_CRBALOON_H
#pragma once
#include "sound/discrete.h"
#include "sound/sn76477.h"
@ -16,8 +20,8 @@ Crazy Ballooon
class crbaloon_state : public driver_device
{
public:
crbaloon_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
crbaloon_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_spriteram(*this, "spriteram"),
@ -25,7 +29,8 @@ public:
m_maincpu(*this, "maincpu"),
m_sn(*this, "snsnd"),
m_discrete(*this, "discrete"),
m_gfxdecode(*this, "gfxdecode") { }
m_gfxdecode(*this, "gfxdecode")
{ }
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
@ -69,3 +74,5 @@ public:
void main_io_map(address_map &map);
void main_map(address_map &map);
};
#endif // MAME_INCLUDES_CRBALOON_H

36
src/mame/includes/darius.h
View File

@ -5,6 +5,10 @@
Darius
*************************************************************************/
#ifndef MAME_INCLUDES_DARIUS_H
#define MAME_INCLUDES_DARIUS_H
#pragma once
#include "sound/flt_vol.h"
#include "sound/msm5205.h"
@ -17,8 +21,8 @@
class darius_state : public driver_device
{
public:
darius_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
darius_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_spriteram(*this, "spriteram"),
m_fg_ram(*this, "fg_ram"),
m_maincpu(*this, "maincpu"),
@ -46,12 +50,17 @@ public:
m_msm5205_l(*this, "msm5205.l"),
m_msm5205_r(*this, "msm5205.r"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
m_palette(*this, "palette")
{ }
void darius(machine_config &config);
private:
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint16_t> m_spriteram;
required_shared_ptr<uint16_t> m_fg_ram;
@ -119,21 +128,18 @@ private:
DECLARE_WRITE8_MEMBER(darius_write_portB1);
DECLARE_WRITE8_MEMBER(adpcm_data_w);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_darius_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_darius_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_darius_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void darius_postload();
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int primask, int x_offs, int y_offs );
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int primask, int x_offs, int y_offs);
uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffs);
void parse_control( ) /* assumes Z80 sandwiched between 68Ks */;
void update_fm0( );
void update_fm1( );
void update_psg0( int port );
void update_psg1( int port );
void update_da( );
void parse_control(); // assumes Z80 sandwiched between 68Ks
void update_fm0();
void update_fm1();
void update_psg0(int port);
void update_psg1(int port);
void update_da();
DECLARE_WRITE_LINE_MEMBER(darius_adpcm_int);
void darius_cpub_map(address_map &map);
void darius_map(address_map &map);
@ -141,3 +147,5 @@ private:
void darius_sound2_map(address_map &map);
void darius_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_DARIUS_H

7
src/mame/includes/ddragon.h
View File

@ -5,6 +5,10 @@
Double Dragon & Double Dragon II (but also China Gate)
*************************************************************************/
#ifndef MAME_INCLUDES_DDRAGON_H
#define MAME_INCLUDES_DDRAGON_H
#pragma once
#include "cpu/m6805/m68705.h"
#include "machine/bankdev.h"
@ -178,7 +182,6 @@ private:
DECLARE_WRITE8_MEMBER(darktowr_bankswitch_w);
DECLARE_WRITE8_MEMBER(mcu_port_a_w);
void darktowr_map(address_map &map);
void darktowr_banked_map(address_map &map);
@ -206,3 +209,5 @@ private:
void toffy_map(address_map &map);
};
#endif // MAME_INCLUDES_DDRAGON_H

39
src/mame/includes/ddragon3.h
View File

@ -6,6 +6,10 @@
Double Dragon 3 & The Combatribes
*************************************************************************/
#ifndef MAME_INCLUDES_DDRAGON3_H
#define MAME_INCLUDES_DDRAGON3_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/timer.h"
@ -18,8 +22,8 @@
class ddragon3_state : public driver_device
{
public:
ddragon3_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
ddragon3_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
@ -67,18 +71,6 @@ protected:
uint16_t m_bg1_dx[2];
uint16_t m_sprite_xoff;
DECLARE_WRITE16_MEMBER(ddragon3_scroll_w);
DECLARE_READ16_MEMBER(ddragon3_scroll_r);
DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w);
DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void sound_map(address_map &map);
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint16_t> m_bg_videoram;
required_shared_ptr<uint16_t> m_fg_videoram;
@ -89,6 +81,18 @@ private:
required_device<okim6295_device> m_oki;
required_device<screen_device> m_screen;
DECLARE_WRITE16_MEMBER(ddragon3_scroll_w);
DECLARE_READ16_MEMBER(ddragon3_scroll_r);
DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w);
DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void sound_map(address_map &map);
virtual void video_start() override;
private:
DECLARE_WRITE16_MEMBER(ddragon3_vreg_w);
DECLARE_WRITE16_MEMBER(irq6_ack_w);
DECLARE_WRITE16_MEMBER(irq5_ack_w);
@ -110,8 +114,8 @@ private:
class wwfwfest_state : public ddragon3_state
{
public:
wwfwfest_state(const machine_config &mconfig, device_type type, const char *tag)
: ddragon3_state(mconfig, type, tag),
wwfwfest_state(const machine_config &mconfig, device_type type, const char *tag) :
ddragon3_state(mconfig, type, tag),
m_fg0_videoram(*this, "fg0_videoram"),
m_paletteram(*this, "palette")
{
@ -132,7 +136,6 @@ private:
tilemap_t *m_fg0_tilemap;
DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w);
//required_device<buffered_spriteram16_device> m_spriteram;
DECLARE_WRITE8_MEMBER(wwfwfest_priority_w);
DECLARE_WRITE16_MEMBER(wwfwfest_irq_ack_w);
@ -149,3 +152,5 @@ private:
void main_map(address_map &map);
};
#endif // MAME_INCLUDES_DDRAGON3_H

16
src/mame/includes/dogfgt.h
View File

@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#ifndef MAME_INCLUDES_DOGFGT_H
#define MAME_INCLUDES_DOGFGT_H
#pragma once
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
@ -11,8 +16,8 @@
class dogfgt_state : public driver_device
{
public:
dogfgt_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
dogfgt_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_bgvideoram(*this, "bgvideoram"),
m_spriteram(*this, "spriteram"),
m_sharedram(*this, "sharedram"),
@ -21,7 +26,8 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_ay(*this, "ay%u", 0U) { }
m_ay(*this, "ay%u", 0U)
{ }
void dogfgt(machine_config &config);
@ -74,8 +80,10 @@ private:
TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_PALETTE_INIT(dogfgt);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect );
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
void main_map(address_map &map);
void sub_map(address_map &map);
};
#endif // MAME_INCLUDES_DOGFGT_H

28
src/mame/includes/fgoal.h
View File

@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Stefan Jokisch
#ifndef MAME_INCLUDES_FGOAL_H
#define MAME_INCLUDES_FGOAL_H
#pragma once
#include "machine/mb14241.h"
#include "emupal.h"
#include "screen.h"
@ -7,25 +12,31 @@
class fgoal_state : public driver_device
{
public:
fgoal_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
fgoal_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_mb14241(*this, "mb14241"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_video_ram(*this, "video_ram") { }
m_video_ram(*this, "video_ram")
{ }
void fgoal(machine_config &config);
DECLARE_CUSTOM_INPUT_MEMBER(_80_r);
private:
protected:
enum
{
TIMER_INTERRUPT
};
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<mb14241_device> m_mb14241;
@ -68,16 +79,15 @@ private:
TIMER_CALLBACK_MEMBER(interrupt_callback);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(fgoal);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int intensity(int bits);
unsigned video_ram_address( );
static int intensity(int bits);
unsigned video_ram_address();
void cpu_map(address_map &map);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
#endif // MAME_INCLUDES_FGOAL_H

17
src/mame/includes/flstory.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#ifndef MAME_INCLUDES_FLSTORY_H
#define MAME_INCLUDES_FLSTORY_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/input_merger.h"
@ -12,8 +16,8 @@
class flstory_state : public driver_device
{
public:
flstory_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
flstory_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_scrlram(*this, "scrlram"),
@ -28,7 +32,8 @@ public:
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
m_soundlatch2(*this, "soundlatch2"),
m_soundnmi(*this, "soundnmi") { }
m_soundnmi(*this, "soundnmi")
{ }
void flstory(machine_config &config);
void rumba(machine_config &config);
@ -38,6 +43,9 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(victnine_mcu_status_bit01_r);
protected:
virtual void machine_start() override;
private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@ -96,7 +104,6 @@ private:
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(victnine_get_tile_info);
TILE_GET_INFO_MEMBER(get_rumba_tile_info);
virtual void machine_start() override;
DECLARE_MACHINE_RESET(flstory);
DECLARE_VIDEO_START(flstory);
DECLARE_VIDEO_START(victnine);
@ -116,3 +123,5 @@ private:
void sound_map(address_map &map);
void victnine_map(address_map &map);
};
#endif // MAME_INCLUDES_FLSTORY_H

29
src/mame/includes/grchamp.h
View File

@ -5,6 +5,10 @@
Taito Grand Champ hardware
*************************************************************************/
#ifndef MAME_INCLUDES_GRCHAMP_H
#define MAME_INCLUDES_GRCHAMP_H
#pragma once
#include "machine/input_merger.h"
#include "machine/watchdog.h"
@ -15,8 +19,8 @@
class grchamp_state : public driver_device
{
public:
grchamp_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
grchamp_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub"),
@ -33,10 +37,15 @@ public:
m_rightram(*this, "rightram"),
m_centerram(*this, "centerram"),
m_digits(*this, "digit%u", 0U)
{ }
{ }
void grchamp(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
DECLARE_WRITE8_MEMBER(cpu0_outputs_w);
DECLARE_WRITE8_MEMBER(led_board_w);
@ -98,14 +107,10 @@ private:
uint8_t m_collmode;
bitmap_ind16 m_work_bitmap;
tilemap_t * m_text_tilemap;
tilemap_t * m_left_tilemap;
tilemap_t * m_center_tilemap;
tilemap_t * m_right_tilemap;
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
tilemap_t *m_text_tilemap;
tilemap_t *m_left_tilemap;
tilemap_t *m_center_tilemap;
tilemap_t *m_right_tilemap;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -140,3 +145,5 @@ private:
/*----------- defined in audio/grchamp.c -----------*/
DISCRETE_SOUND_EXTERN( grchamp_discrete );
#endif // MAME_INCLUDES_GRCHAMP_H

17
src/mame/includes/gsword.h
View File

@ -30,6 +30,7 @@ public:
{
}
protected:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<cpu_device> m_subcpu;
@ -85,6 +86,12 @@ public:
{
}
void init_gsword();
void init_gsword2();
void gsword(machine_config &config);
protected:
DECLARE_READ8_MEMBER(hack_r);
DECLARE_WRITE8_MEMBER(nmi_set_w);
DECLARE_WRITE8_MEMBER(sound_command_w);
@ -94,19 +101,16 @@ public:
INTERRUPT_GEN_MEMBER(sound_interrupt);
void init_gsword();
void init_gsword2();
DECLARE_PALETTE_INIT(gsword);
virtual void machine_start() override;
virtual void machine_reset() override;
void gsword(machine_config &config);
void cpu1_io_map(address_map &map);
void cpu2_io_map(address_map &map);
void cpu2_map(address_map &map);
void cpu3_map(address_map &map);
private:
required_device<generic_latch_8_device> m_soundlatch;
required_device<msm5205_device> m_msm;
@ -128,6 +132,9 @@ public:
{
}
void josvolly(machine_config &config);
protected:
DECLARE_READ8_MEMBER(mcu1_p1_r);
DECLARE_READ8_MEMBER(mcu1_p2_r);
DECLARE_READ8_MEMBER(mcu2_p1_r);
@ -145,10 +152,10 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
void josvolly(machine_config &config);
void josvolly_cpu1_io_map(address_map &map);
void josvolly_cpu2_io_map(address_map &map);
void josvolly_cpu2_map(address_map &map);
private:
bool m_cpu2_nmi_enable;
u8 m_mcu1_p1;

17
src/mame/includes/kickgoal.h
View File

@ -5,6 +5,10 @@
Kick Goal - Action Hollywood
*************************************************************************/
#ifndef MAME_INCLUDES_KICKGOAL_H
#define MAME_INCLUDES_KICKGOAL_H
#pragma once
#include "sound/okim6295.h"
#include "machine/eepromser.h"
@ -14,8 +18,8 @@
class kickgoal_state : public driver_device
{
public:
kickgoal_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
kickgoal_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_fgram(*this, "fgram"),
m_bgram(*this, "bgram"),
m_bg2ram(*this, "bg2ram"),
@ -37,6 +41,10 @@ public:
void init_kickgoal();
void init_actionhw();
protected:
void machine_start() override;
void machine_reset() override;
private:
DECLARE_READ16_MEMBER(kickgoal_eeprom_r);
DECLARE_WRITE16_MEMBER(kickgoal_eeprom_w);
@ -69,9 +77,6 @@ private:
void kickgoal_program_map(address_map &map);
void oki_map(address_map &map);
virtual void machine_start() override;
virtual void machine_reset() override;
/* video-related */
tilemap_t *m_fgtm;
tilemap_t *m_bgtm;
@ -115,3 +120,5 @@ private:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
};
#endif // MAME_INCLUDES_KICKGOAL_H

21
src/mame/includes/ksayakyu.h
View File

@ -6,6 +6,10 @@
Kusayakyuu
*************************************************************************/
#ifndef MAME_INCLUDES_KSAYAKYU_H
#define MAME_INCLUDES_KSAYAKYU_H
#pragma once
#include "machine/gen_latch.h"
#include "emupal.h"
@ -13,17 +17,23 @@
class ksayakyu_state : public driver_device
{
public:
ksayakyu_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
ksayakyu_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch") { }
m_soundlatch(*this, "soundlatch")
{ }
void ksayakyu(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@ -49,9 +59,6 @@ private:
DECLARE_WRITE8_MEMBER(dummy3_w);
TILE_GET_INFO_MEMBER(get_ksayakyu_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(ksayakyu);
uint32_t screen_update_ksayakyu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
@ -62,3 +69,5 @@ private:
void maincpu_map(address_map &map);
void soundcpu_map(address_map &map);
};
#endif // MAME_INCLUDES_KSAYAKYU_H

21
src/mame/includes/lkage.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Phil Stroffolino
#ifndef MAME_INCLUDES_LKAGE_H
#define MAME_INCLUDES_LKAGE_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/input_merger.h"
@ -9,8 +13,8 @@
class lkage_state : public driver_device
{
public:
lkage_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
lkage_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_vreg(*this, "vreg"),
m_scroll(*this, "scroll"),
m_spriteram(*this, "spriteram"),
@ -21,7 +25,8 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
m_soundnmi(*this, "soundnmi") { }
m_soundnmi(*this, "soundnmi")
{ }
void lkageb(machine_config &config);
void lkage(machine_config &config);
@ -29,6 +34,11 @@ public:
void init_bygone();
void init_lkage();
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
required_shared_ptr<uint8_t> m_vreg;
required_shared_ptr<uint8_t> m_scroll;
@ -71,9 +81,6 @@ private:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_lkage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
void lkage_io_map(address_map &map);
@ -82,3 +89,5 @@ private:
void lkage_map_mcu(address_map &map);
void lkage_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_LKAGE_H

6
src/mame/includes/lockon.h
View File

@ -5,6 +5,10 @@
Lock-On hardware
*************************************************************************/
#ifndef MAME_INCLUDES_LOCKON_H
#define MAME_INCLUDES_LOCKON_H
#pragma once
#include "machine/watchdog.h"
#include "sound/flt_vol.h"
@ -152,3 +156,5 @@ private:
void sound_io(address_map &map);
void sound_prg(address_map &map);
};
#endif // MAME_INCLUDES_LOCKON_H

14
src/mame/includes/matmania.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Brad Oliver
#ifndef MAME_INCLUDES_MATMANIA_H
#define MAME_INCLUDES_MATMANIA_H
#pragma once
#include "machine/taito68705interface.h"
@ -10,8 +14,8 @@
class matmania_state : public driver_device
{
public:
matmania_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
matmania_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_videoram2(*this, "videoram2"),
m_videoram3(*this, "videoram3"),
@ -34,6 +38,9 @@ public:
void matmania(machine_config &config);
void maniach(machine_config &config);
protected:
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@ -64,7 +71,6 @@ private:
DECLARE_WRITE8_MEMBER(matmania_sh_command_w);
DECLARE_WRITE8_MEMBER(maniach_sh_command_w);
DECLARE_WRITE8_MEMBER(matmania_paletteram_w);
virtual void video_start() override;
DECLARE_PALETTE_INIT(matmania);
uint32_t screen_update_matmania(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_maniach(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -73,3 +79,5 @@ private:
void matmania_map(address_map &map);
void matmania_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_MATMANIA_H

21
src/mame/includes/msisaac.h
View File

@ -1,5 +1,9 @@
// license:GPL-2.0+
// copyright-holders:Jarek Burczynski
#ifndef MAME_INCLUDES_MSISAAC_H
#define MAME_INCLUDES_MSISAAC_H
#pragma once
#include "machine/taito68705interface.h"
#include "machine/gen_latch.h"
@ -13,8 +17,8 @@
class msisaac_state : public driver_device
{
public:
msisaac_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
msisaac_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_spriteram(*this, "spriteram"),
m_videoram(*this, "videoram"),
m_videoram3(*this, "videoram3"),
@ -26,10 +30,16 @@ public:
m_ta7630(*this, "ta7630"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch") { }
m_soundlatch(*this, "soundlatch")
{ }
void msisaac(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint8_t> m_spriteram;
@ -92,12 +102,11 @@ private:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_bg2_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_msisaac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(nmi_callback);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void msisaac_map(address_map &map);
void msisaac_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_MSISAAC_H

12
src/mame/includes/nycaptor.h
View File

@ -41,6 +41,11 @@ public:
void init_bronx();
void init_nycaptor();
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@ -100,12 +105,9 @@ private:
DECLARE_WRITE8_MEMBER(nycaptor_scrlram_w);
DECLARE_WRITE8_MEMBER(unk_w);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_nycaptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int nycaptor_spot( );
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri );
int nycaptor_spot();
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri);
void bronx_master_map(address_map &map);
void bronx_slave_io_map(address_map &map);
void bronx_slave_map(address_map &map);

21
src/mame/includes/pitnrun.h
View File

@ -1,24 +1,34 @@
// license:BSD-3-Clause
// copyright-holders:Tomasz Slanina, Pierpaolo Prazzoli
#ifndef MAME_INCLUDES_PITNRUN_H
#define MAME_INCLUDES_PITNRUN_H
#pragma once
#include "emupal.h"
class pitnrun_state : public driver_device
{
public:
pitnrun_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
pitnrun_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_mcu(*this, "mcu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_videoram2(*this, "videoram2"),
m_spriteram(*this, "spriteram") { }
m_spriteram(*this, "spriteram")
{ }
void pitnrun_mcu(machine_config &config);
void pitnrun(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_mcu;
@ -77,9 +87,6 @@ private:
TIMER_CALLBACK_MEMBER(mcu_data_real_r);
TIMER_CALLBACK_MEMBER(mcu_status_real_w);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(pitnrun);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -90,3 +97,5 @@ private:
void pitnrun_sound_io_map(address_map &map);
void pitnrun_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_PITNRUN_H

24
src/mame/includes/rastan.h
View File

@ -5,6 +5,10 @@
Rastan
*************************************************************************/
#ifndef MAME_INCLUDES_RASTAN_H
#define MAME_INCLUDES_RASTAN_H
#pragma once
#include "machine/74157.h"
#include "sound/msm5205.h"
@ -14,16 +18,24 @@
class rastan_state : public driver_device
{
public:
rastan_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
rastan_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_msm(*this, "msm"),
m_adpcm_sel(*this, "adpcm_sel"),
m_adpcm_data(*this, "adpcm"),
m_pc080sn(*this, "pc080sn"),
m_pc090oj(*this, "pc090oj") { }
m_pc090oj(*this, "pc090oj")
{ }
void rastan(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
private:
/* video-related */
u16 m_sprite_ctrl;
u16 m_sprites_flipscreen;
@ -40,16 +52,16 @@ public:
required_region_ptr<u8> m_adpcm_data;
required_device<pc080sn_device> m_pc080sn;
required_device<pc090oj_device> m_pc090oj;
DECLARE_WRITE8_MEMBER(rastan_msm5205_address_w);
DECLARE_WRITE16_MEMBER(rastan_spritectrl_w);
DECLARE_WRITE8_MEMBER(rastan_bankswitch_w);
DECLARE_WRITE8_MEMBER(rastan_msm5205_start_w);
DECLARE_WRITE8_MEMBER(rastan_msm5205_stop_w);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_rastan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(rastan_msm5205_vck);
void rastan(machine_config &config);
void rastan_map(address_map &map);
void rastan_s_map(address_map &map);
};
#endif // MAME_INCLUDES_RASTAN_H

5
src/mame/includes/rbisland.h
View File

@ -41,6 +41,9 @@ public:
void init_jumping();
void init_rbisland();
protected:
virtual void machine_start() override;
private:
DECLARE_WRITE16_MEMBER(jumping_sound_w);
DECLARE_READ8_MEMBER(jumping_latch_r);
@ -53,7 +56,6 @@ private:
DECLARE_WRITE16_MEMBER(jumping_spritectrl_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_WRITE8_MEMBER(counters_w);
virtual void machine_start() override;
DECLARE_VIDEO_START(jumping);
uint32_t screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_jumping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -87,5 +89,4 @@ private:
optional_device<timer_device> m_cchip_irq_clear;
};
#endif // MAME_INCLUDES_RBISLAND_H

15
src/mame/includes/renegade.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Phil Stroffolino, Carlos A. Lozano, Rob Rosenbrock
#ifndef MAME_INCLUDES_RENEGADE_H
#define MAME_INCLUDES_RENEGADE_H
#pragma once
#include "machine/taito68705interface.h"
@ -31,6 +35,11 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(mcu_status_r);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -73,10 +82,6 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -84,3 +89,5 @@ private:
void renegade_nomcu_map(address_map &map);
void renegade_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_RENEGADE_H

7
src/mame/includes/retofinv.h
View File

@ -34,6 +34,10 @@ public:
void retofinv(machine_config &config);
void retofinvb1(machine_config &config);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
DECLARE_WRITE8_MEMBER(cpu2_m6000_w);
DECLARE_READ8_MEMBER(cpu0_mf800_r);
@ -64,9 +68,6 @@ private:
void sound_map(address_map &map);
void sub_map(address_map &map);
virtual void machine_start() override;
virtual void video_start() override;
void draw_sprites(bitmap_ind16 &bitmap);
required_device<cpu_device> m_maincpu;

19
src/mame/includes/rollrace.h
View File

@ -1,23 +1,32 @@
// license:BSD-3-Clause
// copyright-holders:Pierpaolo Prazzoli
#ifndef MAME_INCLUDES_ROLLRACE_H
#define MAME_INCLUDES_ROLLRACE_H
#pragma once
#include "emupal.h"
class rollrace_state : public driver_device
{
public:
rollrace_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
rollrace_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_spriteram(*this, "spriteram") { }
m_spriteram(*this, "spriteram")
{ }
void rollace2(machine_config &config);
void rollrace(machine_config &config);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@ -59,8 +68,6 @@ private:
void tilemap_refresh_flip();
DECLARE_PALETTE_INIT(rollrace);
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -69,3 +76,5 @@ private:
void rollrace_map(address_map &map);
void rollrace_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_ROLLRACE_H

18
src/mame/includes/shadfrce.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
#ifndef MAME_INCLUDES_SHADFRCE_H
#define MAME_INCLUDES_SHADFRCE_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/timer.h"
@ -10,8 +14,8 @@
class shadfrce_state : public driver_device
{
public:
shadfrce_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
shadfrce_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_oki(*this, "oki"),
@ -30,10 +34,14 @@ public:
m_fgvideoram(*this, "fgvideoram"),
m_bg0videoram(*this, "bg0videoram"),
m_bg1videoram(*this, "bg1videoram"),
m_spvideoram(*this, "spvideoram") { }
m_spvideoram(*this, "spvideoram")
{ }
void shadfrce(machine_config &config);
protected:
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -87,8 +95,6 @@ private:
TILE_GET_INFO_MEMBER(get_bg0tile_info);
TILE_GET_INFO_MEMBER(get_bg1tile_info);
virtual void video_start() override;
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -98,3 +104,5 @@ private:
void shadfrce_map(address_map &map);
void shadfrce_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_SHADFRCE_H

39
src/mame/includes/slapshot.h
View File

@ -5,6 +5,10 @@
Slapshot / Operation Wolf 3
*************************************************************************/
#ifndef MAME_INCLUDES_SLAPSHOT_H
#define MAME_INCLUDES_SLAPSHOT_H
#pragma once
#include "audio/taitosnd.h"
#include "machine/taitoio.h"
@ -12,21 +16,11 @@
#include "video/tc0480scp.h"
#include "emupal.h"
struct slapshot_tempsprite
{
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
class slapshot_state : public driver_device
{
public:
slapshot_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
slapshot_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_tc0140syt(*this, "tc0140syt"),
m_tc0480scp(*this, "tc0480scp"),
@ -35,7 +29,8 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_spriteram(*this,"spriteram"),
m_spriteext(*this,"spriteext") { }
m_spriteext(*this,"spriteext")
{ }
void opwolf3(machine_config &config);
void slapshot(machine_config &config);
@ -43,14 +38,24 @@ public:
void init_slapshot();
protected:
enum
{
TIMER_SLAPSHOT_INTERRUPT6
};
virtual void machine_start() override;
virtual void video_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
enum
struct slapshot_tempsprite
{
TIMER_SLAPSHOT_INTERRUPT6
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
/* devices */
@ -69,7 +74,7 @@ private:
std::unique_ptr<uint16_t[]> m_spriteram_delayed;
/* video-related */
struct slapshot_tempsprite *m_spritelist;
slapshot_tempsprite *m_spritelist;
int32_t m_sprites_disabled;
int32_t m_sprites_active_area;
int32_t m_sprites_master_scrollx;
@ -99,3 +104,5 @@ private:
void opwolf3_z80_sound_map(address_map &map);
void slapshot_map(address_map &map);
};
#endif // MAME_INCLUDES_SLAPSHOT_H

21
src/mame/includes/spdodgeb.h
View File

@ -5,6 +5,10 @@
Super Dodge Ball hardware
*************************************************************************/
#ifndef MAME_INCLUDES_SPDODGEB_H
#define MAME_INCLUDES_SPDODGEB_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/timer.h"
@ -15,8 +19,8 @@
class spdodgeb_state : public driver_device
{
public:
spdodgeb_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
spdodgeb_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_audiocpu(*this, "audiocpu"),
m_msm1(*this, "msm1"),
@ -26,12 +30,18 @@ public:
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram") { }
m_spriteram(*this, "spriteram")
{ }
void spdodgeb(machine_config &config);
DECLARE_CUSTOM_INPUT_MEMBER(mcu63705_busy_r);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -80,9 +90,6 @@ private:
TILEMAP_MAPPER_MEMBER(background_scan);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(spdodgeb);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -95,3 +102,5 @@ private:
void spdodgeb_map(address_map &map);
void spdodgeb_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_SPDODGEB_H

13
src/mame/includes/speedbal.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Joseba Epalza
#ifndef MAME_INCLUDES_SPEEDBAL_H
#define MAME_INCLUDES_SPEEDBAL_H
#pragma once
#include "emupal.h"
@ -22,6 +26,10 @@ public:
void init_speedbal();
void init_musicbal();
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@ -37,9 +45,6 @@ private:
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
virtual void machine_start() override;
virtual void video_start() override;
DECLARE_WRITE8_MEMBER(coincounter_w);
DECLARE_WRITE8_MEMBER(foreground_videoram_w);
DECLARE_WRITE8_MEMBER(background_videoram_w);
@ -59,3 +64,5 @@ private:
void sound_cpu_io_map(address_map &map);
void sound_cpu_map(address_map &map);
};
#endif // MAME_INCLUDES_SPEEDBAL_H

21
src/mame/includes/speedspn.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Farfetch'd
#ifndef MAME_INCLUDES_SPEEDSPN_H
#define MAME_INCLUDES_SPEEDSPN_H
#pragma once
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
@ -8,8 +12,8 @@
class speedspn_state : public driver_device
{
public:
speedspn_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
speedspn_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_oki(*this, "oki"),
@ -18,10 +22,15 @@ public:
m_soundlatch(*this, "soundlatch"),
m_prgbank(*this, "prgbank"),
m_okibank(*this, "okibank"),
m_attram(*this, "attram") { }
m_attram(*this, "attram")
{ }
void speedspn(machine_config &config);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -48,13 +57,13 @@ private:
DECLARE_WRITE8_MEMBER(display_disable_w);
DECLARE_WRITE8_MEMBER(okibank_w);
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void io_map(address_map &map);
void oki_map(address_map &map);
void program_map(address_map &map);
void sound_map(address_map &map);
};
#endif // MAME_INCLUDES_SPEEDSPN_H

20
src/mame/includes/ssozumo.h
View File

@ -1,13 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
#ifndef MAME_INCLUDES_SSOZUMO_H
#define MAME_INCLUDES_SSOZUMO_H
#pragma once
#include "emupal.h"
class ssozumo_state : public driver_device
{
public:
ssozumo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
ssozumo_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
@ -17,12 +21,17 @@ public:
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_videoram2(*this, "videoram2"),
m_colorram2(*this, "colorram2") { }
m_colorram2(*this, "colorram2")
{ }
void ssozumo(machine_config &config);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
DECLARE_WRITE8_MEMBER(videoram_w);
@ -44,9 +53,6 @@ private:
void ssozumo_map(address_map &map);
void ssozumo_sound_map(address_map &map);
virtual void machine_start() override;
virtual void video_start() override;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@ -66,3 +72,5 @@ private:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
};
#endif // MAME_INCLUDES_SSOZUMO_H

21
src/mame/includes/ssrj.h
View File

@ -1,13 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Tomasz Slanina
#ifndef MAME_INCLUDES_SSRJ_H
#define MAME_INCLUDES_SSRJ_H
#pragma once
#include "emupal.h"
class ssrj_state : public driver_device
{
public:
ssrj_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
ssrj_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
@ -15,10 +19,16 @@ public:
m_vram2(*this, "vram2"),
m_vram3(*this, "vram3"),
m_vram4(*this, "vram4"),
m_scrollram(*this, "scrollram") { }
m_scrollram(*this, "scrollram")
{ }
void ssrj(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@ -45,9 +55,6 @@ private:
TILE_GET_INFO_MEMBER(get_tile_info2);
TILE_GET_INFO_MEMBER(get_tile_info4);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(ssrj);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -56,3 +63,5 @@ private:
void ssrj_map(address_map &map);
};
#endif // MAME_INCLUDES_SSRJ_H

22
src/mame/includes/superchs.h
View File

@ -9,16 +9,6 @@
#include "video/tc0480scp.h"
#include "emupal.h"
struct schs_tempsprite
{
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
class superchs_state : public driver_device
{
public:
@ -44,6 +34,16 @@ protected:
virtual void video_start() override;
private:
struct schs_tempsprite
{
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
required_shared_ptr<uint32_t> m_ram;
required_shared_ptr<uint32_t> m_spriteram;
required_shared_ptr<uint32_t> m_shared_ram;
@ -59,7 +59,7 @@ private:
DECLARE_READ32_MEMBER(main_cycle_r);
DECLARE_READ16_MEMBER(sub_cycle_r);
uint32_t screen_update_superchs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int x_offs, int y_offs);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<tc0480scp_device> m_tc0480scp;

19
src/mame/includes/tagteam.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Steve Ellenoff, Brad Oliver
#ifndef MAME_INCLUDES_TAGTEAM_H
#define MAME_INCLUDES_TAGTEAM_H
#pragma once
#include "machine/gen_latch.h"
#include "emupal.h"
@ -7,20 +11,25 @@
class tagteam_state : public driver_device
{
public:
tagteam_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
tagteam_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram") { }
m_colorram(*this, "colorram")
{ }
void tagteam(machine_config &config);
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -50,8 +59,6 @@ private:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(tagteam);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -59,3 +66,5 @@ private:
void main_map(address_map &map);
void sound_map(address_map &map);
};
#endif // MAME_INCLUDES_TAGTEAM_H

6
src/mame/includes/taito_f3.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail
#ifndef MAME_INCLUDES_TAITO_F3_H
#define MAME_INCLUDES_TAITO_F3_H
#pragma once
#include "audio/taito_en.h"
#include "machine/eepromser.h"
@ -409,3 +413,5 @@ protected:
void get_vram_info(tilemap_t *vram_tilemap, tilemap_t *pixel_tilemap, int sx, int sy);
void scanline_draw(bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
#endif // MAME_INCLUDES_TAITO_F3_H

6
src/mame/includes/taito_h.h
View File

@ -34,6 +34,10 @@ public:
void dleague(machine_config &config);
void tetristh(machine_config &config);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
private:
/* memory pointers */
required_shared_ptr<uint16_t> m_m68000_mainram;
@ -49,8 +53,6 @@ private:
DECLARE_WRITE8_MEMBER(coin_control_w);
DECLARE_READ8_MEMBER(syvalion_input_bypass_r);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_syvalion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_recordbr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_dleague(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);

35
src/mame/includes/taito_l.h
View File

@ -77,7 +77,7 @@ protected:
DECLARE_WRITE8_MEMBER(vram_w);
template<int Offset> TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
DECLARE_VIDEO_START(taito_l);
virtual void video_start() override;
u32 screen_update_taitol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol);
TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt);
@ -119,6 +119,11 @@ public:
void kurikint(machine_config &config);
void evilston(machine_config &config);
void raimais(machine_config &config);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
void evilston_2_map(address_map &map);
void evilston_map(address_map &map);
void kurikint_2_map(address_map &map);
@ -127,10 +132,6 @@ public:
void raimais_3_map(address_map &map);
void raimais_map(address_map &map);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
required_device<cpu_device> m_audio_cpu;
required_memory_region m_audio_prg;
optional_memory_bank m_audio_bnk;
@ -154,13 +155,15 @@ public:
DECLARE_WRITE8_MEMBER(portA_w);
void fhawk(machine_config &config);
void fhawk_2_map(address_map &map);
void fhawk_3_map(address_map &map);
void fhawk_map(address_map &map);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
void fhawk_2_map(address_map &map);
void fhawk_3_map(address_map &map);
void fhawk_map(address_map &map);
required_memory_region m_slave_prg;
required_memory_bank m_slave_bnk;
@ -190,13 +193,15 @@ public:
DECLARE_WRITE8_MEMBER(msm5205_volume_w);
void champwr(machine_config &config);
void champwr_2_map(address_map &map);
void champwr_3_map(address_map &map);
void champwr_map(address_map &map);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
void champwr_2_map(address_map &map);
void champwr_3_map(address_map &map);
void champwr_map(address_map &map);
required_device<msm5205_device> m_msm;
required_region_ptr<u8> m_adpcm_rgn;
@ -231,14 +236,16 @@ public:
void puzznici(machine_config &config);
void cachat(machine_config &config);
void puzznic(machine_config &config);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
void cachat_map(address_map &map);
void palamed_map(address_map &map);
void plotting_map(address_map &map);
void puzznic_map(address_map &map);
void puzznici_map(address_map &map);
protected:
virtual void state_register() override;
virtual void taito_machine_reset() override;
required_device<ym2203_device> m_ymsnd;
optional_device_array<ls157_x2_device, 2> m_mux;

19
src/mame/includes/taito_o.h
View File

@ -5,6 +5,10 @@
Taito O system
*************************************************************************/
#ifndef MAME_INCLUDES_TAITO_O_H
#define MAME_INCLUDES_TAITO_O_H
#pragma once
#include "machine/timer.h"
#include "machine/watchdog.h"
@ -14,16 +18,20 @@
class taitoo_state : public driver_device
{
public:
taitoo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
taitoo_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_watchdog(*this, "watchdog"),
m_tc0080vco(*this, "tc0080vco"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
m_palette(*this, "palette")
{ }
void parentj(machine_config &config);
protected:
virtual void machine_start() override;
private:
/* devices */
required_device<cpu_device> m_maincpu;
@ -34,9 +42,10 @@ private:
DECLARE_WRITE16_MEMBER(io_w);
DECLARE_READ16_MEMBER(io_r);
virtual void machine_start() override;
uint32_t screen_update_parentj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(parentj_interrupt);
void parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
void parentj_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority);
void parentj_map(address_map &map);
};
#endif // MAME_INCLUDES_TAITO_O_H

11
src/mame/includes/tatsumi.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, Angelo Salese
#ifndef MAME_INCLUDES_TATSUMI_H
#define MAME_INCLUDES_TATSUMI_H
#pragma once
#include "sound/okim6295.h"
#include "sound/ym2151.h"
@ -200,12 +204,14 @@ public:
{
}
void cyclwarr(machine_config &config);
void bigfight(machine_config &config);
void init_cyclwarr();
protected:
virtual void machine_reset() override;
private:
DECLARE_READ16_MEMBER(cyclwarr_sprite_r);
DECLARE_WRITE16_MEMBER(cyclwarr_sprite_w);
@ -231,8 +237,6 @@ private:
void slave_map(address_map &map);
void sound_map(address_map &map);
virtual void machine_reset() override;
required_device<generic_latch_8_device> m_soundlatch;
required_shared_ptr<uint16_t> m_master_ram;
@ -258,3 +262,4 @@ private:
void apply_highlight_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &highlight_bitmap);
};
#endif // MAME_INCLUDES_TATSUMI_H

19
src/mame/includes/tnzs.h
View File

@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, Mirko Buffoni, Takahiro Nogi
#ifndef MAME_INCLUDES_TNZS_H
#define MAME_INCLUDES_TNZS_H
#pragma once
#ifndef MAME_INCLUDES_TNZS_H
#define MAME_INCLUDES_TNZS_H
#include "sound/dac.h"
#include "sound/samples.h"
@ -15,7 +15,6 @@
#include "machine/upd4701.h"
#include "emupal.h"
#define MAX_SAMPLES 0x2f /* max samples */
class tnzs_base_state : public driver_device
{
@ -33,8 +32,6 @@ public:
void tnzs_base(machine_config &config);
void tnzs_mainbank(machine_config &config);
DECLARE_PALETTE_INIT(prompalette);
protected:
virtual void machine_start() override;
@ -42,6 +39,7 @@ protected:
DECLARE_WRITE8_MEMBER(ramrom_bankswitch_w);
DECLARE_PALETTE_INIT(prompalette);
uint32_t screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_tnzs);
@ -185,10 +183,13 @@ public:
void init_kageki();
private:
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
private:
static constexpr unsigned MAX_SAMPLES = 0x2f;
virtual DECLARE_WRITE8_MEMBER(bankswitch1_w) override;
DECLARE_READ8_MEMBER(csport_r);
@ -222,9 +223,10 @@ public:
void jpopnics(machine_config &config);
private:
protected:
virtual void machine_reset() override;
private:
DECLARE_WRITE8_MEMBER(subbankswitch_w);
void jpopnics_main_map(address_map &map);
@ -284,9 +286,10 @@ public:
void kabukiz(machine_config &config);
private:
protected:
virtual void machine_start() override;
private:
DECLARE_WRITE8_MEMBER(sound_bank_w);
void kabukiz_cpu2_map(address_map &map);

14
src/mame/includes/topspeed.h
View File

@ -5,6 +5,10 @@
Top Speed / Full Throttle
*************************************************************************/
#ifndef MAME_INCLUDES_TOPSPEED_H
#define MAME_INCLUDES_TOPSPEED_H
#pragma once
#include "sound/msm5205.h"
#include "sound/flt_vol.h"
@ -39,6 +43,10 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(pedal_r);
protected:
virtual void machine_start() override;
virtual void machine_reset() override;
private:
required_shared_ptr<uint16_t> m_spritemap;
required_shared_ptr<uint16_t> m_raster_ctrl;
@ -74,10 +82,6 @@ private:
uint8_t m_dislayer[5];
#endif
// drivers/topspeed.c
virtual void machine_start() override;
virtual void machine_reset() override;
void msm5205_update(int chip);
DECLARE_WRITE16_MEMBER(cpua_ctrl_w);
@ -100,3 +104,5 @@ private:
void z80_io(address_map &map);
void z80_prg(address_map &map);
};
#endif // MAME_INCLUDES_TOPSPEED_H

177
src/mame/includes/tx1.h
View File

@ -38,103 +38,112 @@
#define CPU_MASTER_CLOCK (XTAL(15'000'000))
#define BUGGYBOY_ZCLK (CPU_MASTER_CLOCK / 2)
struct math_t
{
uint16_t cpulatch;
uint16_t promaddr;
uint16_t inslatch;
uint32_t mux;
uint16_t ppshift;
uint32_t i0ff;
uint16_t retval;
uint16_t muxlatch; // TX-1
int dbgaddr;
int dbgpc;
};
/*
SN74S516 16x16 Multiplier/Divider
*/
struct sn74s516_t
{
int16_t X;
int16_t Y;
union
{
#ifdef LSB_FIRST
struct { uint16_t W; int16_t Z; } as16bit;
#else
struct { int16_t Z; uint16_t W; } as16bit;
#endif
int32_t ZW32;
} ZW;
int code;
int state;
int ZWfl;
};
struct vregs_t
{
uint16_t scol; /* Road colours */
uint32_t slock; /* Scroll lock */
uint8_t flags; /* Road flags */
uint32_t ba_val; /* Accumulator */
uint32_t ba_inc;
uint32_t bank_mode;
uint16_t h_val; /* Accumulator */
uint16_t h_inc;
uint16_t h_init;
uint8_t slin_val; /* Accumulator */
uint8_t slin_inc;
/* Buggyboy only */
uint8_t wa8;
uint8_t wa4;
uint16_t wave_lfsr;
uint8_t sky;
uint16_t gas;
uint8_t shift;
};
class tx1_state : public driver_device
{
public:
tx1_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_mathcpu(*this, "math_cpu"),
m_maincpu(*this, "main_cpu"),
m_math_ram(*this, "math_ram"),
m_vram(*this, "vram"),
m_objram(*this, "objram"),
m_rcram(*this, "rcram"),
m_char_tiles(*this, "char_tiles"),
m_obj_tiles(*this, "obj_tiles"),
m_road_rom(*this, "road"),
m_obj_map(*this, "obj_map"),
m_obj_luts(*this, "obj_luts"),
m_proms(*this, "proms"),
m_screen(*this, "screen"),
m_sound(*this, "soundbrd")
{ }
tx1_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_mathcpu(*this, "math_cpu"),
m_maincpu(*this, "main_cpu"),
m_math_ram(*this, "math_ram"),
m_vram(*this, "vram"),
m_objram(*this, "objram"),
m_rcram(*this, "rcram"),
m_char_tiles(*this, "char_tiles"),
m_obj_tiles(*this, "obj_tiles"),
m_road_rom(*this, "road"),
m_obj_map(*this, "obj_map"),
m_obj_luts(*this, "obj_luts"),
m_proms(*this, "proms"),
m_screen(*this, "screen"),
m_sound(*this, "soundbrd")
{ }
void tx1(machine_config &config);
void tx1j(machine_config &config);
void buggyboy(machine_config &config);
void buggybjr(machine_config &config);
private:
struct math_t
{
uint16_t cpulatch;
uint16_t promaddr;
uint16_t inslatch;
uint32_t mux;
uint16_t ppshift;
uint32_t i0ff;
uint16_t retval;
uint16_t muxlatch; // TX-1
int dbgaddr;
int dbgpc;
uint16_t get_datarom_addr() const;
uint16_t get_bb_datarom_addr() const;
};
// SN74S516 16x16 Multiplier/Divider
class sn74s516_t
{
public:
int16_t X;
int16_t Y;
union
{
#ifdef LSB_FIRST
struct { uint16_t W; int16_t Z; } as16bit;
#else
struct { int16_t Z; uint16_t W; } as16bit;
#endif
int32_t ZW32;
} ZW;
int code;
int state;
int ZWfl;
void kick(running_machine &machine, math_t &math, uint16_t *data, int ins);
private:
void multiply(running_machine &machine);
void divide(running_machine &machine);
void update(running_machine &machine, int ins);
};
struct vregs_t
{
uint16_t scol; /* Road colours */
uint32_t slock; /* Scroll lock */
uint8_t flags; /* Road flags */
uint32_t ba_val; /* Accumulator */
uint32_t ba_inc;
uint32_t bank_mode;
uint16_t h_val; /* Accumulator */
uint16_t h_inc;
uint16_t h_init;
uint8_t slin_val; /* Accumulator */
uint8_t slin_inc;
/* Buggyboy only */
uint8_t wa8;
uint8_t wa4;
uint16_t wave_lfsr;
uint8_t sky;
uint16_t gas;
uint8_t shift;
};
math_t m_math;
sn74s516_t m_sn74s516;
required_device<cpu_device> m_mathcpu;
private:
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint16_t> m_math_ram;
required_shared_ptr<uint16_t> m_vram;
@ -161,6 +170,10 @@ private:
bool m_needs_update;
void kick_sn74s516(uint16_t *data, int ins);
void tx1_update_state();
void buggyboy_update_state();
DECLARE_READ16_MEMBER(tx1_math_r);
DECLARE_WRITE16_MEMBER(tx1_math_w);
DECLARE_READ16_MEMBER(tx1_spcs_rom_r);

26
src/mame/includes/undrfire.h
View File

@ -10,16 +10,6 @@
#include "video/tc0480scp.h"
#include "emupal.h"
struct uf_tempsprite
{
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
class undrfire_state : public driver_device
{
public:
@ -44,14 +34,24 @@ public:
void init_cbombers();
protected:
virtual void video_start() override;
private:
enum
{
TIMER_INTERRUPT5
};
virtual void video_start() override;
private:
struct uf_tempsprite
{
int gfx;
int code,color;
int flipx,flipy;
int x,y;
int zoomx,zoomy;
int primask;
};
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_subcpu;
required_device<tc0100scn_device> m_tc0100scn;

11
src/mame/includes/volfied.h
View File

@ -30,11 +30,17 @@ public:
void volfied(machine_config &config);
private:
protected:
enum
{
TIMER_VOLFIED
};
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
private:
DECLARE_READ16_MEMBER(video_ram_r);
DECLARE_WRITE16_MEMBER(video_ram_w);
DECLARE_WRITE16_MEMBER(video_ctrl_w);
@ -42,9 +48,6 @@ private:
DECLARE_WRITE16_MEMBER(video_mask_w);
DECLARE_WRITE16_MEMBER(sprite_ctrl_w);
DECLARE_WRITE8_MEMBER(counters_w);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb);

23
src/mame/includes/wgp.h
View File

@ -5,6 +5,10 @@
World Grand Prix
*************************************************************************/
#ifndef MAME_INCLUDES_WGP_H
#define MAME_INCLUDES_WGP_H
#pragma once
#include "audio/taitosnd.h"
#include "machine/taitoio.h"
@ -15,8 +19,8 @@
class wgp_state : public driver_device
{
public:
wgp_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
wgp_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_spritemap(*this, "spritemap"),
m_spriteram(*this, "spriteram"),
m_pivram(*this, "pivram"),
@ -41,7 +45,7 @@ public:
void init_wgp();
void init_wgp2();
private:
protected:
enum
{
TIMER_INTERRUPT4,
@ -49,6 +53,12 @@ private:
TIMER_CPUB_INTERRUPT6
};
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
DECLARE_WRITE8_MEMBER(coins_w);
DECLARE_WRITE16_MEMBER(cpua_ctrl_w);
DECLARE_READ16_MEMBER(lan_status_r);
@ -67,11 +77,6 @@ private:
void main_map(address_map &map);
void z80_sound_map(address_map &map);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
TILE_GET_INFO_MEMBER(get_piv0_tile_info);
TILE_GET_INFO_MEMBER(get_piv1_tile_info);
TILE_GET_INFO_MEMBER(get_piv2_tile_info);
@ -120,3 +125,5 @@ private:
optional_ioport m_unknown;
optional_ioport m_fake;
};
#endif // MAME_INCLUDES_WGP_H

18
src/mame/includes/wwfsstar.h
View File

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
#ifndef MAME_INCLUDES_WWFSSTAR_H
#define MAME_INCLUDES_WWFSSTAR_H
#pragma once
#include "machine/gen_latch.h"
#include "machine/timer.h"
@ -9,8 +13,8 @@
class wwfsstar_state : public driver_device
{
public:
wwfsstar_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
wwfsstar_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
@ -19,12 +23,16 @@ public:
m_soundlatch(*this, "soundlatch"),
m_spriteram(*this, "spriteram"),
m_fg0_videoram(*this, "fg0_videoram"),
m_bg0_videoram(*this, "bg0_videoram") { }
m_bg0_videoram(*this, "bg0_videoram")
{ }
void wwfsstar(machine_config &config);
DECLARE_CUSTOM_INPUT_MEMBER(vblank_r);
protected:
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -55,11 +63,11 @@ private:
TILEMAP_MAPPER_MEMBER(bg0_scan);
TILE_GET_INFO_MEMBER(get_bg0_tile_info);
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
void main_map(address_map &map);
void sound_map(address_map &map);
};
#endif // MAME_INCLUDES_WWFSSTAR_H

9
src/mame/includes/xain.h
View File

@ -40,6 +40,10 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(vblank_r);
DECLARE_CUSTOM_INPUT_MEMBER(mcu_status_r);
protected:
virtual void machine_start() override;
virtual void video_start() override;
private:
DECLARE_WRITE8_MEMBER(cpuA_bankswitch_w);
DECLARE_WRITE8_MEMBER(cpuB_bankswitch_w);
@ -66,10 +70,7 @@ private:
void cpu_map_B(address_map &map);
void sound_map(address_map &map);
virtual void machine_start() override;
virtual void video_start() override;
inline int scanline_to_vcount(int scanline);
int scanline_to_vcount(int scanline);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);

1000
src/mame/machine/tx1.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/mame/video/taito_l.cpp
View File

@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_tx_tile_info)
***************************************************************************/
VIDEO_START_MEMBER(taitol_state, taito_l)
void taitol_state::video_start()
{
m_buff_spriteram = make_unique_clear<u8[]>(SPRITERAM_SIZE);
int i;