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

Remove duplicates (nw)

Browse Source
This commit is contained in:
Olivier Galibert 2018-02-15 17:05:17 +01:00
parent 301777d70e
commit 2ad89d83d2
27 changed files with 23 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,14 +467,12 @@ public:
fidel6502_state(const machine_config &mconfig, device_type type, const char *tag)
: fidelbase_state(mconfig, type, tag),
m_ppi8255(*this, "ppi8255"),
m_sc12_map(*this, "sc12_map"),
m_cart(*this, "cartslot")
m_sc12_map(*this, "sc12_map")
{ }
// devices/pointers
optional_device<i8255_device> m_ppi8255;
optional_device<address_map_bank_device> m_sc12_map;
optional_device<generic_slot_device> m_cart;
TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); }
TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); }

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

@ -56,7 +56,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, Z80_TAG)
, m_usart_l(*this, I8251_L_TAG)
, m_usart_r(*this, I8251_L_TAG)
, m_usart_r(*this, I8251_R_TAG)
{ }
DECLARE_READ8_MEMBER(ff_r);

3
src/mame/drivers/mikrosha.cpp
View File

@ -30,7 +30,6 @@ class mikrosha_state : public radio86_state
public:
mikrosha_state(const machine_config &mconfig, device_type type, const char *tag)
: radio86_state(mconfig, type, tag)
, m_cart(*this, "cartslot")
{ }
DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2);
@ -40,8 +39,6 @@ public:
void mikrosha(machine_config &config);
void mikrosha_io(address_map &map);
void mikrosha_mem(address_map &map);
protected:
required_device<generic_slot_device> m_cart;
};
MACHINE_RESET_MEMBER(mikrosha_state,mikrosha)

20
src/mame/drivers/ngp.cpp
View File

@ -131,7 +131,7 @@ public:
ngp_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
device_nvram_interface(mconfig, *this),
m_tlcs900(*this, "maincpu"),
m_maincpu(*this, "maincpu"),
m_z80(*this, "soundcpu"),
m_t6w28(*this, "t6w28"),
m_ldac(*this, "ldac"),
@ -140,8 +140,7 @@ public:
m_mainram(*this, "mainram"),
m_k1ge(*this, "k1ge"),
m_io_controls(*this, "Controls"),
m_io_power(*this, "Power") ,
m_maincpu(*this, "maincpu")
m_io_power(*this, "Power")
{
m_flash_chip[0].present = 0;
m_flash_chip[0].state = F_READ;
@ -171,7 +170,7 @@ public:
uint8_t command[2];
} m_flash_chip[2];
required_device<cpu_device> m_tlcs900;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_z80;
required_device<t6w28_device> m_t6w28;
required_device<dac_byte_interface> m_ldac;
@ -217,7 +216,6 @@ protected:
virtual void nvram_default() override;
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
required_device<cpu_device> m_maincpu;
};
@ -578,7 +576,7 @@ WRITE8_MEMBER( ngp_state::ngp_z80_comm_w )
WRITE8_MEMBER( ngp_state::ngp_z80_signal_main_w )
{
m_tlcs900->set_input_line(TLCS900_INT5, ASSERT_LINE );
m_maincpu->set_input_line(TLCS900_INT5, ASSERT_LINE );
}
@ -595,7 +593,7 @@ WRITE8_MEMBER( ngp_state::ngp_z80_clear_irq )
m_z80->set_input_line(0, CLEAR_LINE );
/* I am not exactly sure what causes the maincpu INT5 signal to be cleared. This will do for now. */
m_tlcs900->set_input_line(TLCS900_INT5, CLEAR_LINE );
m_maincpu->set_input_line(TLCS900_INT5, CLEAR_LINE );
}
@ -608,7 +606,7 @@ INPUT_CHANGED_MEMBER(ngp_state::power_callback)
{
if ( m_io_reg[0x33] & 0x04 )
{
m_tlcs900->set_input_line(TLCS900_NMI, (m_io_power->read() & 0x01 ) ? CLEAR_LINE : ASSERT_LINE );
m_maincpu->set_input_line(TLCS900_NMI, (m_io_power->read() & 0x01 ) ? CLEAR_LINE : ASSERT_LINE );
}
}
@ -631,13 +629,13 @@ INPUT_PORTS_END
WRITE_LINE_MEMBER( ngp_state::ngp_vblank_pin_w )
{
m_tlcs900->set_input_line(TLCS900_INT4, state ? ASSERT_LINE : CLEAR_LINE );
m_maincpu->set_input_line(TLCS900_INT4, state ? ASSERT_LINE : CLEAR_LINE );
}
WRITE_LINE_MEMBER( ngp_state::ngp_hblank_pin_w )
{
m_tlcs900->set_input_line(TLCS900_TIO, state ? ASSERT_LINE : CLEAR_LINE );
m_maincpu->set_input_line(TLCS900_TIO, state ? ASSERT_LINE : CLEAR_LINE );
}
@ -735,7 +733,7 @@ void ngp_state::machine_reset()
if ( m_nvram_loaded )
{
m_tlcs900->set_state_int(TLCS900_PC, 0xFF1800);
m_maincpu->set_state_int(TLCS900_PC, 0xFF1800);
}
}

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

@ -313,14 +313,12 @@ public:
m_m50458(*this,"m50458"),
m_s3520cf(*this, "s3520cf"),
m_rp5h01(*this,"rp5h01"),
m_screen(*this, "screen"),
m_palette(*this, "palette")
{ }
required_device<m50458_device> m_m50458;
required_device<s3520cf_device> m_s3520cf;
required_device<rp5h01_device> m_rp5h01;
required_device<screen_device> m_screen;
optional_device<palette_device> m_palette;
uint8_t m_wram_wp_flag;

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

@ -30,7 +30,6 @@ class pk8000_state : public pk8000_base_state
public:
pk8000_state(const machine_config &mconfig, device_type type, const char *tag)
: pk8000_base_state(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_cassette(*this, "cassette")
, m_ram(*this, RAM_TAG)
, m_speaker(*this, "speaker")
@ -69,7 +68,6 @@ public:
void pk8000_io(address_map &map);
void pk8000_mem(address_map &map);
protected:
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
required_device<speaker_sound_device> m_speaker;

3
src/mame/drivers/powerbal.cpp
View File

@ -30,15 +30,12 @@ class powerbal_state : public playmark_state
public:
powerbal_state(const machine_config &mconfig, device_type type, const char *tag)
: playmark_state(mconfig, type, tag)
, m_eeprom(*this, "eeprom")
{ }
/* powerbal-specific */
int m_tilebank;
int m_bg_yoffset;
optional_device<eeprom_serial_93cxx_device> m_eeprom;
DECLARE_DRIVER_INIT(powerbal);
DECLARE_DRIVER_INIT(magicstk);
TILE_GET_INFO_MEMBER(powerbal_get_bg_tile_info);

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

@ -164,8 +164,6 @@ public:
, m_iop_s2(*this, "S2")
, m_iop_s3(*this, "S3")
, m_iop_s4(*this, "S4")
, m_cassette1(*this, "cassette")
, m_cassette2(*this, "cassette2")
{ }
DECLARE_READ8_MEMBER( sol20_f8_r );
@ -213,8 +211,6 @@ private:
required_ioport m_iop_s2;
required_ioport m_iop_s3;
required_ioport m_iop_s4;
required_device<cassette_image_device> m_cassette1;
required_device<cassette_image_device> m_cassette2;
};
@ -224,9 +220,9 @@ private:
cassette_image_device *sol20_state::cassette_device_image()
{
if (m_sol20_fa & 0x40)
return m_cassette2;
return m_cass2;
else
return m_cassette1;
return m_cass1;
}

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

@ -121,7 +121,7 @@ public:
m_mdv1(*this, MDV_1),
m_mdv2(*this, MDV_2),
m_ser1(*this, RS232_A_TAG),
m_ser2(*this, RS232_A_TAG),
m_ser2(*this, RS232_B_TAG),
m_ram(*this, RAM_TAG),
m_exp(*this, "exp"),
m_cart(*this, "rom"),

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

@ -225,7 +225,6 @@ private:
uint8_t midi;
int midi_pos;
uint8_t port0;
required_device<cpu_device> m_maincpu;
};
mt32_state::mt32_state(const machine_config &mconfig, device_type type, const char *tag) :
@ -234,8 +233,7 @@ mt32_state::mt32_state(const machine_config &mconfig, device_type type, const ch
ram(*this, "ram"),
lcd(*this, "lcd"),
midi_timer(*this, "midi_timer")
,
m_maincpu(*this, "maincpu") {
{
}

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

@ -88,8 +88,6 @@ public:
, m_speaker(*this, "speaker")
, m_cass(*this, "cassette")
, m_tms9918(*this, "tms9918")
, m_maincpu(*this, "maincpu")
, m_cassette(*this, "cassette")
, m_tms9901_usr(*this, TMS9901_0_TAG)
, m_tms9901_sys(*this, TMS9901_1_TAG)
{ }
@ -170,8 +168,6 @@ private:
void led_set(int number, bool state);
void segment_set(int offset, bool state);
void digitsel(int offset, bool state);
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<tms9901_device> m_tms9901_usr;
required_device<tms9901_device> m_tms9901_sys;
};
@ -433,7 +429,7 @@ WRITE_LINE_MEMBER( tm990189_state::sys9901_spkrdrive_w )
WRITE_LINE_MEMBER( tm990189_state::sys9901_tapewdata_w )
{
m_cassette->output(state ? +1.0 : -1.0);
m_cass->output(state ? +1.0 : -1.0);
}
class tm990_189_rs232_image_device : public device_t,

10
src/mame/drivers/wmg.cpp
View File

@ -87,8 +87,6 @@ public:
wmg_state(const machine_config &mconfig, device_type type, const char *tag)
: williams_state(mconfig, type, tag)
, m_p_ram(*this, "nvram")
, m_pia0(*this, "pia_0")
, m_pia1(*this, "pia_1")
, m_keyboard(*this, "X%d", 0)
{ }
@ -114,8 +112,6 @@ private:
uint8_t m_wmg_port_select;
uint8_t m_wmg_vram_bank;
required_shared_ptr<uint8_t> m_p_ram;
required_device<pia6821_device> m_pia0;
required_device<pia6821_device> m_pia1;
required_ioport_array<17> m_keyboard;
};
@ -393,8 +389,8 @@ WRITE8_MEMBER( wmg_state::wmg_d000_w )
if (data == 0)
{
/* install the i/o devices into c000-cfff */
pia6821_device *pia0 = m_pia0;
pia6821_device *pia1 = m_pia1;
pia6821_device *pia0 = m_pia_0;
pia6821_device *pia1 = m_pia_1;
space.unmap_read(0xc000, 0xcfff); // throw out bank7
space.install_write_bank (0xc000, 0xc00f, "bank4");
@ -460,7 +456,7 @@ READ8_MEMBER( wmg_state::wmg_pia_0_r )
Since there is no code in rom to handle this, it must be a hardware feature
which probably just resets the cpu. */
uint8_t data = m_pia0->read(space, offset);
uint8_t data = m_pia_0->read(space, offset);
if ((m_wmg_c400) && (offset == 0) && ((data & 0x30) == 0x30)) // P1 and P2 pressed
{

6
src/mame/includes/8080bw.h
View File

@ -32,11 +32,8 @@ public:
: mw8080bw_state(mconfig, type, tag),
m_schaser_effect_555_timer(*this, "schaser_sh_555"),
m_claybust_gun_on(*this, "claybust_gun"),
m_discrete(*this, "discrete"),
m_speaker(*this, "speaker"),
m_eeprom(*this, "eeprom"),
m_sn(*this, "snsnd"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_gunx(*this, "GUNX"),
m_guny(*this, "GUNY")
@ -45,11 +42,8 @@ public:
/* devices/memory pointers */
optional_device<timer_device> m_schaser_effect_555_timer;
optional_device<timer_device> m_claybust_gun_on;
optional_device<discrete_device> m_discrete;
optional_device<speaker_sound_device> m_speaker;
optional_device<eeprom_serial_93cxx_device> m_eeprom;
optional_device<sn76477_device> m_sn;
required_device<screen_device> m_screen;
optional_device<palette_device> m_palette;
/* misc game specific */

2
src/mame/includes/atarig1.h
View File

@ -16,14 +16,12 @@ class atarig1_state : public atarigen_state
public:
atarig1_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_jsa(*this, "jsa"),
m_playfield_tilemap(*this, "playfield"),
m_alpha_tilemap(*this, "alpha"),
m_rle(*this, "rle"),
m_mo_command(*this, "mo_command") { }
required_device<cpu_device> m_maincpu;
required_device<atari_jsa_ii_device> m_jsa;
required_device<tilemap_device> m_playfield_tilemap;
required_device<tilemap_device> m_alpha_tilemap;

2
src/mame/includes/atarig42.h
View File

@ -17,7 +17,6 @@ class atarig42_state : public atarigen_state
public:
atarig42_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_jsa(*this, "jsa"),
m_playfield_tilemap(*this, "playfield"),
m_alpha_tilemap(*this, "alpha"),
@ -25,7 +24,6 @@ public:
m_asic65(*this, "asic65"),
m_mo_command(*this, "mo_command") { }
required_device<cpu_device> m_maincpu;
required_device<atari_jsa_iii_device> m_jsa;
required_device<tilemap_device> m_playfield_tilemap;

2
src/mame/includes/beathead.h
View File

@ -16,7 +16,6 @@ class beathead_state : public atarigen_state
public:
beathead_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_jsa(*this, "jsa"),
m_nvram(*this, "nvram"),
m_videoram(*this, "videoram"),
@ -32,7 +31,6 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<asap_device> m_maincpu;
required_device<atari_jsa_iii_device> m_jsa;
required_shared_ptr<uint32_t> m_nvram;

2
src/mame/includes/cyberbal.h
View File

@ -20,7 +20,6 @@ class cyberbal_state : public atarigen_state
public:
cyberbal_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_extracpu(*this, "extra"),
m_daccpu(*this, "dac"),
@ -38,7 +37,6 @@ public:
m_lscreen(*this, "lscreen"),
m_rscreen(*this, "rscreen") { }
required_device<cpu_device> m_maincpu;
optional_device<m6502_device> m_audiocpu;
optional_device<cpu_device> m_extracpu;
optional_device<cpu_device> m_daccpu;

2
src/mame/includes/cybstorm.h
View File

@ -16,13 +16,11 @@ class cybstorm_state : public atarigen_state
public:
cybstorm_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_jsa(*this, "jsa")
, m_vad(*this, "vad")
, m_vadbank(*this, "vadbank")
{ }
required_device<cpu_device> m_maincpu;
optional_device<atari_jsa_iiis_device> m_jsa;
required_device<atari_vad_device> m_vad;
required_device<address_map_bank_device> m_vadbank;

4
src/mame/includes/eprom.h
View File

@ -19,8 +19,7 @@ public:
m_alpha_tilemap(*this, "alpha"),
m_mob(*this, "mob"),
m_jsa(*this, "jsa"),
m_extra(*this, "extra"),
m_palette(*this, "palette") { }
m_extra(*this, "extra") { }
required_device<tilemap_device> m_playfield_tilemap;
required_device<tilemap_device> m_alpha_tilemap;
@ -51,7 +50,6 @@ public:
uint32_t screen_update_guts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void update_palette();
optional_device<cpu_device> m_extra;
required_device<palette_device> m_palette;
static const atari_motion_objects_config s_mob_config;
static const atari_motion_objects_config s_guts_mob_config;
void guts(machine_config &config);

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

@ -14,17 +14,12 @@ class fastfred_state : public galaxold_state
public:
fastfred_state(const machine_config &mconfig, device_type type, const char *tag)
: galaxold_state(mconfig, type, tag),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram"),
m_attributesram(*this, "attributesram"),
m_background_color(*this, "bgcolor"),
m_imago_fg_videoram(*this, "imago_fg_vram") { }
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_attributesram;

2
src/mame/includes/mcr3.h
View File

@ -15,7 +15,6 @@ class mcr3_state : public mcr_state
public:
mcr3_state(const machine_config &mconfig, device_type type, const char *tag)
: mcr_state(mconfig, type, tag),
m_cheap_squeak_deluxe(*this, "csd"),
m_spyhunt_alpharam(*this, "spyhunt_alpha"),
m_maxrpm_adc(*this, "adc"),
m_lamplatch(*this, "lamplatch"),
@ -78,7 +77,6 @@ protected:
virtual void video_start() override;
private:
optional_device<midway_cheap_squeak_deluxe_device> m_cheap_squeak_deluxe;
optional_shared_ptr<uint8_t> m_spyhunt_alpharam;
optional_device<adc0844_device> m_maxrpm_adc;
optional_device<cd4099_device> m_lamplatch;

8
src/mame/includes/mystwarr.h
View File

@ -16,19 +16,11 @@ class mystwarr_state : public konamigx_state
public:
mystwarr_state(const machine_config &mconfig, device_type type, const char *tag)
: konamigx_state(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_k053252(*this, "k053252"),
m_k056832(*this, "k056832"),
m_k055673(*this, "k055673"),
m_k054321(*this, "k054321"),
m_gx_workram(*this,"gx_workram"),
m_spriteram(*this,"spriteram")
{ }
required_device<cpu_device> m_maincpu;
required_device<k053252_device> m_k053252;
required_device<k056832_device> m_k056832;
required_device<k055673_device> m_k055673;
required_device<k054321_device> m_k054321;
required_shared_ptr<uint16_t> m_gx_workram;
optional_shared_ptr<uint16_t> m_spriteram;

4
src/mame/includes/namcofl.h
View File

@ -25,8 +25,6 @@ class namcofl_state : public namcos2_shared_state
public:
namcofl_state(const machine_config &mconfig, device_type type, const char *tag)
: namcos2_shared_state(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_mcu(*this,"mcu"),
m_c116(*this,"c116"),
m_in0(*this, "IN0"),
m_in1(*this, "IN1"),
@ -37,8 +35,6 @@ public:
m_wheel(*this, "WHEEL"),
m_shareram(*this, "shareram", 32) { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_mcu;
required_device<namco_c116_device> m_c116;
required_ioport m_in0;
required_ioport m_in1;

4
src/mame/includes/namconb1.h
View File

@ -31,8 +31,6 @@ class namconb1_state : public namcos2_shared_state
public:
namconb1_state(const machine_config &mconfig, device_type type, const char *tag)
: namcos2_shared_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_mcu(*this, "mcu"),
m_c116(*this, "c116"),
m_eeprom(*this, "eeprom"),
m_p1(*this, "P1"),
@ -48,8 +46,6 @@ public:
m_tilebank32(*this, "tilebank32"),
m_namconb_shareram(*this, "namconb_share") { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_mcu;
required_device<namco_c116_device> m_c116;
required_device<eeprom_parallel_28xx_device> m_eeprom;
required_ioport m_p1;

4
src/mame/includes/next.h
View File

@ -31,8 +31,7 @@ public:
net(*this, "net"),
mo(*this, "mo"),
fdc(*this, "fdc"),
vram(*this, "vram"),
m_maincpu(*this, "maincpu") { }
vram(*this, "vram") { }
required_device<cpu_device> maincpu;
required_device<mccs1850_device> rtc;
@ -197,7 +196,6 @@ public:
DECLARE_DRIVER_INIT(nextstc);
DECLARE_DRIVER_INIT(nextctc);
DECLARE_DRIVER_INIT(nexts);
required_device<cpu_device> m_maincpu;
};
#endif

2
src/mame/includes/thomson.h
View File

@ -115,7 +115,6 @@ public:
m_ram(*this, RAM_TAG),
m_mc6846(*this, "mc6846"),
m_mc6843(*this, "mc6843"),
m_acia6850(*this, "acia6850"),
m_screen(*this, "screen"),
m_mainirq(*this, "mainirq"),
m_mainfirq(*this, "mainfirq"),
@ -389,7 +388,6 @@ protected:
required_device<ram_device> m_ram;
optional_device<mc6846_device> m_mc6846;
optional_device<mc6843_device> m_mc6843;
optional_device<acia6850_device> m_acia6850;
required_device<screen_device> m_screen;
required_device<input_merger_device> m_mainirq;
required_device<input_merger_device> m_mainfirq;

4
src/mame/machine/thomson.cpp
View File

@ -641,8 +641,8 @@ WRITE_LINE_MEMBER( thomson_state::to7_modem_tx_w )
WRITE_LINE_MEMBER( thomson_state::write_acia_clock )
{
m_acia6850->write_txc(state);
m_acia6850->write_rxc(state);
m_acia->write_txc(state);
m_acia->write_rxc(state);
}
void thomson_state::to7_modem_reset()