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

misc cleanup and compile fix for superqix.cpp (nw)

Browse Source
This commit is contained in:
Vas Crabb 2018-07-03 03:18:42 +10:00
parent b1652588fa
commit 7da0bb19d6
20 changed files with 111 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/24cdjuke.cpp
View File

@ -69,7 +69,7 @@ public:
, m_io_row3(*this, "ROW3")
, m_charset(*this, "charset")
, m_digits(*this, "digit%u", 0U)
{ }
{ }
void midcoin24cdjuke(machine_config &config);

12
src/mame/drivers/cclimber.cpp
View File

@ -1111,11 +1111,11 @@ WRITE_LINE_MEMBER(cclimber_state::bagmanf_vblank_irq)
MACHINE_CONFIG_START(cclimber_state::root)
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_ADD(m_maincpu, Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_PROGRAM_MAP(cclimber_map)
MCFG_DEVICE_IO_MAP(cclimber_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_DEVICE_ADD(m_mainlatch, LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_y_w))
@ -1194,7 +1194,7 @@ MACHINE_CONFIG_START(cclimber_state::yamato)
root(config);
/* basic machine hardware */
MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_REPLACE(m_maincpu, SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_PROGRAM_MAP(yamato_map)
MCFG_DEVICE_IO_MAP(yamato_portmap)
MCFG_DEVICE_OPCODES_MAP(yamato_decrypted_opcodes_map)
@ -1225,7 +1225,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::toprollr)
cclimber(config);
MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_REPLACE(m_maincpu, SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
MCFG_DEVICE_PROGRAM_MAP(toprollr_map)
MCFG_DEVICE_IO_MAP(cclimber_portmap)
MCFG_DEVICE_OPCODES_MAP(toprollr_decrypted_opcodes_map)
@ -1252,10 +1252,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::swimmer)
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_DEVICE_ADD(m_maincpu, Z80, XTAL(18'432'000)/6) /* verified on pcb */
MCFG_DEVICE_PROGRAM_MAP(swimmer_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_DEVICE_ADD(m_mainlatch, LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_y_w))

6
src/mame/drivers/galaga.cpp
View File

@ -1728,7 +1728,7 @@ MACHINE_CONFIG_START(galaga_state::galaga)
/* synchronization of the CPUs */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(galaga_state, screen_update_galaga)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, screen_vblank_galaga))
@ -1832,7 +1832,7 @@ MACHINE_CONFIG_START(xevious_state::xevious)
/* synchronization of the CPUs */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(xevious_state, screen_update_xevious)
MCFG_SCREEN_PALETTE("palette")
@ -1948,7 +1948,7 @@ MACHINE_CONFIG_START(digdug_state::digdug)
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_ADD(m_screen, RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(digdug_state, screen_update_digdug)
MCFG_SCREEN_PALETTE("palette")

8
src/mame/drivers/namcos21.cpp
View File

@ -1933,7 +1933,7 @@ MACHINE_CONFIG_START(namcos21_state::namcos21)
MCFG_DEVICE_PROGRAM_MAP(master_dsp_program)
MCFG_DEVICE_DATA_MAP(master_dsp_data)
MCFG_DEVICE_IO_MAP(master_dsp_io)
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_IN_CB(CONSTANT(0))
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos21_state, dsp_xf_w))
@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(namcos21_state::namcos21)
MCFG_DEVICE_PROGRAM_MAP(slave_dsp_program)
MCFG_DEVICE_DATA_MAP(slave_dsp_data)
MCFG_DEVICE_IO_MAP(slave_dsp_io)
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_IN_CB(CONSTANT(0))
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos21_state, slave_XF_output_w))
@ -2002,7 +2002,7 @@ MACHINE_CONFIG_START(namcos21_state::driveyes)
MCFG_DEVICE_DATA_MAP(winrun_dsp_data)
MCFG_DEVICE_IO_MAP(winrun_dsp_io)
MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos21_state, winrun_poly_reset_r))
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_IN_CB(CONSTANT(0))
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(NOOP)
@ -2063,7 +2063,7 @@ MACHINE_CONFIG_START(namcos21_state::winrun)
MCFG_DEVICE_DATA_MAP(winrun_dsp_data)
MCFG_DEVICE_IO_MAP(winrun_dsp_io)
MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos21_state, winrun_poly_reset_r))
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_IN_CB(CONSTANT(0))
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(NOOP)

4
src/mame/drivers/odyssey2.cpp
View File

@ -766,7 +766,7 @@ MACHINE_CONFIG_START(g7400_state::g7400)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(g7400_state, g7400)
MCFG_I8243_ADD( "i8243", NOOP, WRITE8(*this, g7400_state,i8243_port_w))
MCFG_I8243_ADD( "i8243", CONSTANT(0), WRITE8(*this, g7400_state,i8243_port_w))
MCFG_EF9340_1_ADD( "ef9340_1", 3540000, "screen" )
@ -807,7 +807,7 @@ MACHINE_CONFIG_START(g7400_state::odyssey3)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(g7400_state, g7400)
MCFG_I8243_ADD( "i8243", NOOP, WRITE8(*this, g7400_state,i8243_port_w))
MCFG_I8243_ADD( "i8243", CONSTANT(0), WRITE8(*this, g7400_state,i8243_port_w))
MCFG_EF9340_1_ADD( "ef9340_1", 3540000, "screen" )

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

@ -1376,7 +1376,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian)
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pbillian)
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_FORMAT_CLASS(1, superqix_state, BBGGRRII)
MCFG_PALETTE_FORMAT_CLASS(1, hotsmash_state, BBGGRRII)
MCFG_VIDEO_START_OVERRIDE(hotsmash_state, pbillian)

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

@ -346,7 +346,7 @@ MACHINE_CONFIG_START(tceptor_state::tceptor)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("adc", ADC0809, 1000000) // unknown clock (needs to >640khz or the wait loop is too fast)
MCFG_ADC0808_IN0_CB(NOOP) // unknown
MCFG_ADC0808_IN0_CB(CONSTANT(0)) // unknown
MCFG_ADC0808_IN1_CB(IOPORT("PEDAL"))
MCFG_ADC0808_IN2_CB(IOPORT("STICKX"))
MCFG_ADC0808_IN3_CB(IOPORT("STICKY"))

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

@ -7,6 +7,10 @@
driver by Aaron Giles
***************************************************************************/
#ifndef MAME_INCLUDES_BALSENTE_H
#define MAME_INCLUDES_BALSENTE_H
#pragma once
#include "machine/6850acia.h"
#include "machine/pit8253.h"
@ -233,3 +237,5 @@ private:
/*----------- defined in machine/balsente.c -----------*/
void balsente_noise_gen(device_t *device, int count, short *buffer);
#endif // MAME_INCLUDES_BALSENTE_H

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

@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#ifndef MAME_INCLUDES_CCLIMBER_H
#define MAME_INCLUDES_CCLIMBER_H
#pragma once
#include "machine/74259.h"
#include "machine/gen_latch.h"
@ -9,8 +13,8 @@
class cclimber_state : public driver_device
{
public:
cclimber_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
cclimber_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"),
@ -27,7 +31,7 @@ public:
m_toprollr_bg_videoram(*this, "bg_videoram"),
m_toprollr_bg_coloram(*this, "bg_coloram"),
m_decrypted_opcodes(*this, "decrypted_opcodes")
{ }
{ }
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
@ -142,3 +146,5 @@ public:
void yamato_map(address_map &map);
void yamato_portmap(address_map &map);
};
#endif // MAME_INCLUDES_CCLIMBER_H

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

@ -1,13 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia
#ifndef MAME_INCLUDES_CLSHROAD_H
#define MAME_INCLUDES_CLSHROAD_H
#pragma once
#include "emupal.h"
class clshroad_state : public driver_device
{
public:
clshroad_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
clshroad_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"),
@ -15,7 +19,8 @@ public:
m_spriteram(*this, "spriteram"),
m_vram_0(*this, "vram_0"),
m_vram_1(*this, "vram_1"),
m_vregs(*this, "vregs") { }
m_vregs(*this, "vregs")
{ }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@ -63,3 +68,5 @@ public:
void clshroad_map(address_map &map);
void clshroad_sound_map(address_map &map);
};
#endif // MAME_INCLUDES_CLSHROAD_H

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

@ -1,17 +1,22 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#ifndef MAME_INCLUDES_DIGDUG_H
#define MAME_INCLUDES_DIGDUG_H
#pragma once
#include "machine/er2055.h"
class digdug_state : public galaga_state
{
public:
digdug_state(const machine_config &mconfig, device_type type, const char *tag)
: galaga_state(mconfig, type, tag),
digdug_state(const machine_config &mconfig, device_type type, const char *tag) :
galaga_state(mconfig, type, tag),
m_earom(*this, "earom"),
m_digdug_objram(*this, "digdug_objram"),
m_digdug_posram(*this, "digdug_posram"),
m_digdug_flpram(*this, "digdug_flpram") { }
m_digdug_flpram(*this, "digdug_flpram")
{ }
void dzigzag(machine_config &config);
void digdug(machine_config &config);
@ -46,3 +51,5 @@ private:
void digdug_map(address_map &map);
};
#endif // MAME_INCLUDES_DIGDUG_H

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

@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria
#ifndef MAME_INCLUDES_GAPLUS_H
#define MAME_INCLUDES_GAPLUS_H
#pragma once
#include "sound/namco.h"
#include "sound/samples.h"
#include "machine/namcoio.h"
@ -153,3 +158,5 @@ protected:
output_finder<2> m_lamps;
};
#endif // MAME_INCLUDES_GAPLUS_H

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

@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#ifndef MAME_INCLUDES_MAPPY_H
#define MAME_INCLUDES_MAPPY_H
#pragma once
#include "machine/namcoio.h"
#include "sound/dac.h"
#include "sound/namco.h"
@ -107,3 +112,5 @@ private:
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
#endif // MAME_INCLUDES_MAPPY_H

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

@ -1,20 +1,25 @@
// license:BSD-3-Clause
// copyright-holders:Zsolt Vasvari
#ifndef MAME_INCLUDES_MARINEB_H
#define MAME_INCLUDES_MARINEB_H
#pragma once
#include "emupal.h"
class marineb_state : public driver_device
{
public:
marineb_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
marineb_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_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
m_palette(*this, "palette")
{ }
void springer(machine_config &config);
void wanted(machine_config &config);
@ -70,3 +75,5 @@ private:
void marineb_map(address_map &map);
void wanted_io_map(address_map &map);
};
#endif // MAME_INCLUDES_MARINEB_H

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

@ -5,6 +5,10 @@
nbmj9195 - Nichibutsu Mahjong games for years 1991-1995
******************************************************************************/
#ifndef MAME_INCLUDES_NBMJ9195_H
#define MAME_INCLUDES_NBMJ9195_H
#pragma once
#include "cpu/z80/tmpz84c011.h"
#include "machine/nb1413m3.h" // needed for mahjong input controller
@ -26,8 +30,8 @@ public:
TIMER_BLITTER
};
nbmj9195_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
nbmj9195_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
@ -186,3 +190,5 @@ private:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
#endif // MAME_INCLUDES_NBMJ9195_H

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

@ -21,8 +21,8 @@
class polepos_state : public driver_device
{
public:
polepos_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
polepos_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "sub"),
m_subcpu2(*this, "sub2"),
@ -36,7 +36,8 @@ public:
m_view16_memory(*this, "view16_memory"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette") { }
m_palette(*this, "palette")
{ }
DECLARE_CUSTOM_INPUT_MEMBER(auto_start_r);

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

@ -1,13 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
#ifndef MAME_INCLUDES_VASTAR_H
#define MAME_INCLUDES_VASTAR_H
#pragma once
#include "emupal.h"
class vastar_state : public driver_device
{
public:
vastar_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
vastar_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "sub"),
m_gfxdecode(*this, "gfxdecode"),
@ -16,7 +20,8 @@ public:
m_bg2videoram(*this, "bg2videoram"),
m_fgvideoram(*this, "fgvideoram"),
m_sprite_priority(*this, "sprite_priority"),
m_sharedram(*this, "sharedram") { }
m_sharedram(*this, "sharedram")
{ }
void vastar(machine_config &config);
@ -68,3 +73,5 @@ private:
void main_map(address_map &map);
void main_port_map(address_map &map);
};
#endif // MAME_INCLUDES_VASTAR_H

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

@ -1,20 +1,25 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
#ifndef MAME_INCLUDES_WIPING_H
#define MAME_INCLUDES_WIPING_H
#pragma once
#include "emupal.h"
class wiping_state : public driver_device
{
public:
wiping_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
wiping_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_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_spriteram(*this, "spriteram") { }
m_spriteram(*this, "spriteram")
{ }
void wiping(machine_config &config);
@ -49,3 +54,5 @@ private:
void main_map(address_map &map);
void sound_map(address_map &map);
};
#endif // MAME_INCLUDES_WIPING_H

2
src/mame/machine/namco51.h
View File

@ -37,7 +37,7 @@ class namco_51xx_device : public device_t
public:
namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_screen_tag(const char *tag) { m_screen.set_tag(tag); }
template <typename T> void set_screen_tag(T &&tag) { m_screen.set_tag(std::forward<T>(tag)); }
template <unsigned N, class Object> devcb_base &set_input_callback(Object &&cb) { return m_in[N].set_callback(std::forward<Object>(cb)); }
template <unsigned N, class Object> devcb_base &set_output_callback(Object &&cb) { return m_out[N].set_callback(std::forward<Object>(cb)); }

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

@ -354,7 +354,7 @@ static void tetrisp2_draw_sprites(_BitmapClass &bitmap, bitmap_ind8 &bitmap_pri,
code = (color & 0x0fff);
// encoded to first word when YUV sprites are used
if(is_yuv == true)
if(is_yuv)
color = (attr & 0x7f00) >> 8;
else
color = (color >> 12) & 0xf;