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 Packages Projects Releases Wiki Activity

made BEEP and RAM devices initialize in constructor of driver classes (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-04-23 07:11:57 +00:00
parent fdaf96470f
commit 6de13d280a
157 changed files with 608 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/sound/beep.h
View File

@ -3,9 +3,6 @@
#ifndef __BEEP_H__
#define __BEEP_H__
#define BEEPER_TAG "beeper"
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************

12
src/mame/drivers/deshoros.c
View File

@ -36,10 +36,12 @@ class destiny_state : public driver_device
public:
destiny_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
m_maincpu(*this, "maincpu"),
m_beeper(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
required_device<beep_device> m_beeper;
char m_led_array[21];
@ -158,7 +160,7 @@ INPUT_CHANGED_MEMBER(destiny_state::coin_inserted)
WRITE8_MEMBER(destiny_state::sound_w)
{
// a0: sound on/off
machine().device<beep_device>(BEEPER_TAG)->set_state(~offset & 1);
m_beeper->set_state(~offset & 1);
}
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, destiny_state )
@ -247,8 +249,8 @@ INPUT_PORTS_END
void destiny_state::machine_start()
{
machine().device<beep_device>(BEEPER_TAG)->set_frequency(800); // TODO: determine exact frequency thru schematics
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(800); // TODO: determine exact frequency thru schematics
m_beeper->set_state(0);
}
void destiny_state::machine_reset()
@ -275,7 +277,7 @@ static MACHINE_CONFIG_START( destiny, destiny_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END

13
src/mame/drivers/dlair.c
View File

@ -54,7 +54,8 @@ public:
m_pr7820(*this, "ld_pr7820"),
m_22vp932(*this, "ld_22vp932") ,
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_beeper(*this, "beeper") { }
void laserdisc_data_w(UINT8 data)
{
@ -120,6 +121,7 @@ public:
DECLARE_WRITE16_MEMBER(serial_transmit);
DECLARE_READ16_MEMBER(serial_receive);
required_device<cpu_device> m_maincpu;
optional_device<beep_device> m_beeper;
};
@ -284,12 +286,11 @@ MACHINE_RESET_MEMBER(dlair_state,dlair)
INTERRUPT_GEN_MEMBER(dlair_state::vblank_callback)
{
/* also update the speaker on the European version */
beep_device *beep = machine().device<beep_device>("beep");
if (beep != NULL)
if (m_beeper != NULL)
{
z80ctc_device *ctc = machine().device<z80ctc_device>("ctc");
beep->set_state(1);
beep->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
m_beeper->set_state(1);
m_beeper->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
}
}
@ -789,7 +790,7 @@ static MACHINE_CONFIG_START( dleuro, dlair_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("beep", BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)

10
src/mess/drivers/a5105.c
View File

@ -40,13 +40,14 @@ public:
m_maincpu(*this, "maincpu"),
m_hgdc(*this, "upd7220"),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_fdc(*this, "upd765a"),
m_floppy0(*this, "upd765a:0"),
m_floppy1(*this, "upd765a:1"),
m_floppy2(*this, "upd765a:2"),
m_floppy3(*this, "upd765a:3"),
m_video_ram(*this, "video_ram")
m_video_ram(*this, "video_ram"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
@ -80,6 +81,7 @@ public:
virtual void video_start();
virtual void palette_init();
DECLARE_FLOPPY_FORMATS( floppy_formats );
required_device<ram_device> m_ram;
};
/* TODO */
@ -484,7 +486,7 @@ void a5105_state::machine_reset()
a5105_ab_w(space, 0, 9); // turn motor off
m_beep->set_frequency(500);
m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
m_ram_base = (UINT8*)m_ram->pointer();
m_rom_base = (UINT8*)memregion("maincpu")->base();
membank("bank1")->set_base(m_rom_base);
@ -601,7 +603,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */

2
src/mess/drivers/ace.c
View File

@ -76,7 +76,7 @@ SNAPSHOT_LOAD_MEMBER( ace_state, ace )
unsigned char ace_repeat, ace_byte, loop;
int done=0, ace_index=0x2000;
if (machine().device<ram_device>(RAM_TAG)->size() < 16*1024)
if (m_ram->size() < 16*1024)
{
image.seterror(IMAGE_ERROR_INVALIDIMAGE, "At least 16KB RAM expansion required");
image.message("At least 16KB RAM expansion required");

4
src/mess/drivers/alphatro.c
View File

@ -40,7 +40,7 @@ public:
m_crtc(*this, "crtc"),
m_usart(*this, "usart"),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_p_ram(*this, "p_ram"),
m_p_videoram(*this, "p_videoram"){ }
@ -437,7 +437,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)

4
src/mess/drivers/aquarius.c
View File

@ -187,8 +187,8 @@ DRIVER_INIT_MEMBER(aquarius_state,aquarius)
{
address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_readwrite_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 0x1000 - 1, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
space.install_readwrite_bank(0x4000, 0x4000 + m_ram->size() - 0x1000 - 1, "bank1");
membank("bank1")->set_base(m_ram->pointer());
}
}

4
src/mess/drivers/bigbord2.c
View File

@ -98,7 +98,7 @@ public:
m_floppy1(*this, FLOPPY_1),
m_floppy2(*this, FLOPPY_2),
m_floppy3(*this, FLOPPY_3),
m_beeper(*this, BEEPER_TAG)
m_beeper(*this, "beeper")
{ }
virtual void machine_start();
@ -712,7 +712,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END

4
src/mess/drivers/bmjr.c
View File

@ -26,7 +26,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
,
m_p_wram(*this, "p_wram"){ }
@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( bmjr, bmjr_state )
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)

4
src/mess/drivers/bml3.c
View File

@ -49,7 +49,7 @@ public:
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
//m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -918,7 +918,7 @@ static MACHINE_CONFIG_START( bml3, bml3_state )
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_ADD("ym2203", YM2203, 2000000) //unknown clock / divider

6
src/mess/drivers/comx35.c
View File

@ -37,9 +37,9 @@ enum
image_fread_memory - read image to memory
-------------------------------------------------*/
static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
void comx35_state::image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
{
UINT8 *ram = image.device().machine().device<ram_device>(RAM_TAG)->pointer() + (addr - 0x4000);
UINT8 *ram = m_ram->pointer() + (addr - 0x4000);
image.fread(ram, count);
}
@ -55,7 +55,7 @@ QUICKLOAD_LOAD_MEMBER( comx35_state, comx35_comx )
UINT8 header[16] = {0};
int size = image.length();
if (size > machine().device<ram_device>(RAM_TAG)->size())
if (size > m_ram->size())
{
return IMAGE_INIT_FAIL;
}

2
src/mess/drivers/electron.c
View File

@ -192,7 +192,7 @@ static MACHINE_CONFIG_START( electron, electron_state )
MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_CASSETTE_ADD( "cassette", electron_cassette_interface )

6
src/mess/drivers/enterp.c
View File

@ -70,10 +70,10 @@ void ep_state::enterprise_update_memory_page(address_space &space, offs_t page,
case 0xfa:
case 0xfb:
/* additional 64k ram */
if (space.machine().device<ram_device>(RAM_TAG)->size() == 128*1024)
if (m_ram->size() == 128*1024)
{
space.install_readwrite_bank(start, end, page_num);
membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xf4) * 0x4000);
membank(page_num)->set_base(m_ram->pointer() + (index - 0xf4) * 0x4000);
}
else
{
@ -87,7 +87,7 @@ void ep_state::enterprise_update_memory_page(address_space &space, offs_t page,
case 0xff:
/* basic 64k ram */
space.install_readwrite_bank(start, end, page_num);
membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xfc) * 0x4000);
membank(page_num)->set_base(m_ram->pointer() + (index - 0xfc) * 0x4000);
break;
default:

16
src/mess/drivers/ex800.c
View File

@ -137,7 +137,8 @@ class ex800_state : public driver_device
public:
ex800_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_beeper(*this, "beeper") { }
int m_irq_state;
DECLARE_READ8_MEMBER(ex800_porta_r);
@ -157,6 +158,7 @@ public:
virtual void machine_start();
DECLARE_INPUT_CHANGED_MEMBER(online_switch);
required_device<cpu_device> m_maincpu;
required_device<beep_device> m_beeper;
};
@ -208,10 +210,9 @@ INPUT_CHANGED_MEMBER(ex800_state::online_switch)
void ex800_state::machine_start()
{
m_irq_state = ASSERT_LINE;
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
/* Setup beep */
speaker->set_state(0);
speaker->set_frequency(4000); /* measured at 4000 Hz */
m_beeper->set_state(0);
m_beeper->set_frequency(4000); /* measured at 4000 Hz */
}
@ -267,11 +268,10 @@ WRITE8_MEMBER(ex800_state::ex800_portb_w)
WRITE8_MEMBER(ex800_state::ex800_portc_w)
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
if (data & 0x80)
speaker->set_state(0);
m_beeper->set_state(0);
else
speaker->set_state(1);
m_beeper->set_state(1);
logerror("PC W %x @%x\n", data, space.device().safe_pc());
}
@ -458,7 +458,7 @@ static MACHINE_CONFIG_START( ex800, ex800_state )
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

2
src/mess/drivers/fidelz80.c
View File

@ -1296,7 +1296,7 @@ static MACHINE_CONFIG_START( cc10, fidelz80_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END

13
src/mess/drivers/fk1.c
View File

@ -19,10 +19,13 @@ class fk1_state : public driver_device
public:
fk1_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
DECLARE_WRITE8_MEMBER(fk1_ppi_1_a_w);
DECLARE_WRITE8_MEMBER(fk1_ppi_1_b_w);
DECLARE_WRITE8_MEMBER(fk1_ppi_1_c_w);
@ -297,7 +300,7 @@ WRITE8_MEMBER( fk1_state::fk1_intr_w )
READ8_MEMBER( fk1_state::fk1_bank_ram_r )
{
address_space &space_mem = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
space_mem.install_write_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->set_base(ram);
@ -310,7 +313,7 @@ READ8_MEMBER( fk1_state::fk1_bank_rom_r )
address_space &space_mem = m_maincpu->space(AS_PROGRAM);
space_mem.unmap_write(0x0000, 0x3fff);
membank("bank1")->set_base(memregion("maincpu")->base());
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x10000);
membank("bank2")->set_base(m_ram->pointer() + 0x10000);
return 0;
}
@ -421,7 +424,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::vsync_callback)
void fk1_state::machine_reset()
{
address_space &space = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
space.unmap_write(0x0000, 0x3fff);
membank("bank1")->set_base(memregion("maincpu")->base()); // ROM
@ -436,7 +439,7 @@ UINT32 fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con
{
UINT8 code;
int y, x, b;
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
for (x = 0; x < 64; x++)
{

38
src/mess/drivers/fm7.c
View File

@ -229,7 +229,7 @@ READ8_MEMBER(fm7_state::fm7_irq_cause_r)
TIMER_CALLBACK_MEMBER(fm7_state::fm7_beeper_off)
{
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_state(0);
logerror("timed beeper off\n");
}
@ -239,23 +239,23 @@ WRITE8_MEMBER(fm7_state::fm7_beeper_w)
if(!m_speaker_active) // speaker not active, disable all beeper sound
{
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_state(0);
return;
}
if(data & 0x80)
{
if(m_speaker_active)
machine().device<beep_device>(BEEPER_TAG)->set_state(1);
m_beeper->set_state(1);
}
else
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_state(0);
if(data & 0x40)
{
if(m_speaker_active)
{
machine().device<beep_device>(BEEPER_TAG)->set_state(1);
m_beeper->set_state(1);
logerror("timed beeper on\n");
machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
}
@ -272,7 +272,7 @@ READ8_MEMBER(fm7_state::fm7_sub_beeper_r)
{
if(m_speaker_active)
{
machine().device<beep_device>(BEEPER_TAG)->set_state(1);
m_beeper->set_state(1);
logerror("timed beeper on\n");
machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
}
@ -1836,8 +1836,8 @@ MACHINE_START_MEMBER(fm7_state,fm7)
memset(m_shared_ram,0xff,0x80);
m_type = SYS_FM7;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(1200);
m_beeper->set_state(0);
}
MACHINE_START_MEMBER(fm7_state,fm77av)
@ -1857,8 +1857,8 @@ MACHINE_START_MEMBER(fm7_state,fm77av)
membank("bank21")->set_base(RAM+0x800);
m_type = SYS_FM77AV;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(1200);
m_beeper->set_state(0);
}
MACHINE_START_MEMBER(fm7_state,fm11)
@ -1868,8 +1868,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
memset(m_shared_ram,0xff,0x80);
m_type = SYS_FM11;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(1200);
m_beeper->set_state(0);
// last part of Initiate ROM is visible at the end of RAM too (interrupt vectors)
memcpy(RAM+0x3fff0,ROM+0x0ff0,16);
}
@ -1877,8 +1877,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
MACHINE_START_MEMBER(fm7_state,fm16)
{
m_type = SYS_FM16;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(1200);
m_beeper->set_state(0);
}
void fm7_state::machine_reset()
@ -2022,7 +2022,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state )
MCFG_SOUND_ADD("psg", AY8910, XTAL_4_9152MHz / 4)
MCFG_SOUND_CONFIG(fm7_psg_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25)
@ -2064,7 +2064,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state )
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@ -2107,7 +2107,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state )
MCFG_SOUND_ADD("ym", YM2203, XTAL_4_9152MHz / 4)
MCFG_SOUND_CONFIG(fm7_ym_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@ -2153,7 +2153,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state )
MCFG_CPU_IO_MAP(fm11_x86_io)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@ -2194,7 +2194,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state )
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)

6
src/mess/drivers/fmtowns.c
View File

@ -2596,7 +2596,7 @@ void towns_state::driver_start()
m_towns_cd.read_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(towns_state::towns_cdrom_read_byte),this), (void*)machine().device("dma_1"));
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(towns_state::towns_irq_callback),this));
m_maincpu->space(AS_PROGRAM).install_ram(0x100000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,NULL);
m_maincpu->space(AS_PROGRAM).install_ram(0x100000,m_ram->size()-1,0xffffffff,0,NULL);
}
@ -2616,11 +2616,11 @@ void towns_state::machine_reset()
m_pic_master = machine().device("pic8259_master");
m_pic_slave = machine().device("pic8259_slave");
m_pit = machine().device("pit");
m_messram = machine().device<ram_device>(RAM_TAG);
m_messram = m_ram;
m_cdrom = machine().device<cdrom_image_device>("cdrom");
m_cdda = machine().device("cdda");
m_scsi = machine().device<fmscsi_device>("scsi:fm");
m_ram = machine().device<ram_device>(RAM_TAG);
m_ram = m_ram;
m_ftimer = 0x00;
m_freerun_timer = 0x00;
m_nmi_mask = 0x00;

4
src/mess/drivers/glasgow.c
View File

@ -59,7 +59,7 @@ public:
glasgow_state(const machine_config &mconfig, device_type type, const char *tag)
: mboard_state(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -511,7 +511,7 @@ static MACHINE_CONFIG_START( glasgow, glasgow_state )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(glasgow_mem)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50))

4
src/mess/drivers/h19.c
View File

@ -49,7 +49,7 @@ public:
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
m_ace(*this, "ins8250"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_p_videoram(*this, "p_videoram")
{ }
@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( h19, h19_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END

4
src/mess/drivers/h8.c
View File

@ -28,7 +28,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
//m_cass(*this, "cassette"),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -232,7 +232,7 @@ static MACHINE_CONFIG_START( h8, h8_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END

4
src/mess/drivers/jr100.c
View File

@ -31,7 +31,7 @@ public:
m_vram(*this, "vram"),
m_via(*this, "via"),
m_cassette(*this, "cassette"),
m_beeper(*this, BEEPER_TAG),
m_beeper(*this, "beeper"),
m_speaker(*this, "speaker"),
m_region_maincpu(*this, "maincpu"),
m_line0(*this, "LINE0"),
@ -413,7 +413,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state )
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_CASSETTE_ADD( "cassette", jr100_cassette_interface )

4
src/mess/drivers/jr200.c
View File

@ -29,7 +29,7 @@ public:
m_cram(*this, "cram"),
m_mn1271_ram(*this, "mn1271_ram"),
m_maincpu(*this, "maincpu"),
m_beeper(*this, BEEPER_TAG),
m_beeper(*this, "beeper"),
m_pcg(*this, "pcg"),
m_gfx_rom(*this, "gfx_rom"),
m_gfx_ram(*this, "gfx_ram"),
@ -559,7 +559,7 @@ static MACHINE_CONFIG_START( jr200, jr200_state )
// AY-8910 ?
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END

4
src/mess/drivers/kaypro.c
View File

@ -263,7 +263,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */

4
src/mess/drivers/lx800.c
View File

@ -31,7 +31,7 @@ public:
lx800_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -268,7 +268,7 @@ static MACHINE_CONFIG_START( lx800, lx800_state )
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* gate array */

4
src/mess/drivers/mephisto.c
View File

@ -74,7 +74,7 @@ public:
mephisto_state(const machine_config &mconfig, device_type type, const char *tag)
: mboard_state(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_beep(*this, BEEPER_TAG)
, m_beep(*this, "beeper")
, m_key1_0(*this, "KEY1_0")
, m_key1_1(*this, "KEY1_1")
, m_key1_2(*this, "KEY1_2")
@ -459,7 +459,7 @@ static MACHINE_CONFIG_START( mephisto, mephisto_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", mephisto_state, update_nmi, attotime::from_hz(600))

2
src/mess/drivers/micronic.c
View File

@ -384,7 +384,7 @@ static MACHINE_CONFIG_START( micronic, micronic_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
/* ram banks */

31
src/mess/drivers/mmodular.c
View File

@ -129,10 +129,12 @@ class polgar_state : public mboard_state
public:
polgar_state(const machine_config &mconfig, device_type type, const char *tag)
: mboard_state(mconfig, type, tag),
m_lcdc(*this, "hd44780")
m_lcdc(*this, "hd44780"),
m_beeper(*this, "beeper")
{ }
optional_device<hd44780_device> m_lcdc;
optional_device<beep_device> m_beeper;
UINT8 led_status;
UINT8 lcd_char;
@ -244,9 +246,9 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO)
}
if (BIT(data,2) || BIT(data,3))
machine().device<beep_device>("beep")->set_state(1);
m_beeper->set_state(1);
else
machine().device<beep_device>("beep")->set_state(0);
m_beeper->set_state(0);
if (BIT(data,7) && BIT(data, 4)) {
for (i = 0;i < 8;i++)
@ -412,9 +414,9 @@ WRITE8_MEMBER(polgar_state::milano_write_LED)
WRITE8_MEMBER(polgar_state::megaiv_write_LED)
{
if (BIT(data,7))
machine().device<beep_device>("beep")->set_state(1);
m_beeper->set_state(1);
else
machine().device<beep_device>("beep")->set_state(0);
m_beeper->set_state(0);
output_set_led_value(102,BIT(data,1)?1:0);
output_set_led_value(107,BIT(data,6)?1:0);
@ -475,13 +477,13 @@ if ((data & 0xa1) == 0xa1) {
}
if (BIT(data,7))
machine().device<beep_device>("beep")->set_state(1);
m_beeper->set_state(1);
else
machine().device<beep_device>("beep")->set_state(0);
m_beeper->set_state(0);
if (BIT(data,1))
machine().device<beep_device>("beep")->set_state(1);
m_beeper->set_state(1);
else
machine().device<beep_device>("beep")->set_state(0);
m_beeper->set_state(0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
if (!found) {
logerror("unknown LED mask %d\n",data);
@ -724,9 +726,9 @@ READ32_MEMBER(polgar_state::read_keys_BPL32)
WRITE8_MEMBER(polgar_state::beep_academy)
{
if (!BIT(data,7))
machine().device<beep_device>("beep")->set_state(1);
m_beeper->set_state(1);
else
machine().device<beep_device>("beep")->set_state(0);
m_beeper->set_state(0);
}
WRITE8_MEMBER(polgar_state::megaiv_IO)
@ -878,7 +880,6 @@ WRITE16_MEMBER(polgar_state::write_LCD_data)
void polgar_state::write_IOenable(unsigned char data,address_space &space)
{
hd44780_device * hd44780 = space.machine().device<hd44780_device>("hd44780");
beep_device *speaker = machine().device<beep_device>("beep");
if (BIT(data,5) && BIT(data,4)) {
if (BIT(data,1)) {
@ -904,9 +905,9 @@ void polgar_state::write_IOenable(unsigned char data,address_space &space)
logerror("Write to IOENBL data: %08x\n",data);
if (BIT(data,2) || BIT(data,3))
speaker->set_state(1);
m_beeper->set_state(1);
else
speaker->set_state(0);
m_beeper->set_state(0);
}
}
@ -1532,7 +1533,7 @@ static MACHINE_CONFIG_FRAGMENT ( chess_common )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("beep", BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END

8
src/mess/drivers/ms0515.c
View File

@ -19,10 +19,12 @@ class ms0515_state : public driver_device
public:
ms0515_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
DECLARE_WRITE16_MEMBER(ms0515_bank_w);
DECLARE_WRITE8_MEMBER(ms0515_sys_w);
@ -83,7 +85,7 @@ ADDRESS_MAP_END
WRITE16_MEMBER(ms0515_state::ms0515_bank_w)
{
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
membank("bank0")->set_base(ram + 0000000 + BIT(data,0) * 0160000);
membank("bank1")->set_base(ram + 0020000 + BIT(data,1) * 0160000);
membank("bank2")->set_base(ram + 0040000 + BIT(data,2) * 0160000);
@ -118,7 +120,7 @@ WRITE8_MEMBER(ms0515_state::ms0515_sys_w)
void ms0515_state::machine_reset()
{
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
ms0515_bank_w(machine().driver_data()->generic_space(),0,0);
m_video_ram = ram + 0000000 + 0340000;

6
src/mess/drivers/mstation.c
View File

@ -36,10 +36,12 @@ class mstation_state : public driver_device
public:
mstation_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
intelfsh8_device *m_flashes[2];
UINT8 m_bank1[2];
@ -454,7 +456,7 @@ void mstation_state::machine_start()
// allocate the videoram
m_vram = (UINT8*)machine().memory().region_alloc( "vram", 9600, 1, ENDIANNESS_LITTLE )->base();
m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
m_ram_base = (UINT8*)m_ram->pointer();
// map firsh RAM bank at 0xc000-0xffff
membank("sysram")->set_base(m_ram_base);

12
src/mess/drivers/multi8.c
View File

@ -28,13 +28,13 @@ public:
m_maincpu(*this, "maincpu"),
m_ppi(*this, "ppi8255_0"),
m_crtc(*this, "crtc"),
m_beep(*this, BEEPER_TAG)
m_beeper(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
required_device<i8255_device> m_ppi;
required_device<mc6845_device> m_crtc;
required_device<beep_device> m_beep;
required_device<beep_device> m_beeper;
DECLARE_WRITE8_MEMBER(multi8_6845_w);
DECLARE_READ8_MEMBER(key_input_r);
DECLARE_READ8_MEMBER(key_status_r);
@ -629,7 +629,7 @@ static I8255_INTERFACE( ppi8255_intf_0 )
WRITE8_MEMBER( multi8_state::ym2203_porta_w )
{
m_beep->set_state((data & 0x08));
m_beeper->set_state((data & 0x08));
}
static const ym2203_interface ym2203_config =
@ -655,8 +655,8 @@ void multi8_state::machine_start()
void multi8_state::machine_reset()
{
machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200); //guesswork
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(1200); //guesswork
m_beeper->set_state(0);
m_mcu_init = 0;
}
@ -682,7 +682,7 @@ static MACHINE_CONFIG_START( multi8, multi8_state )
MCFG_SOUND_ADD("aysnd", AY8912, 1500000) //unknown clock / divider
MCFG_SOUND_CONFIG(ym2203_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
/* Devices */

4
src/mess/drivers/mz2000.c
View File

@ -43,7 +43,7 @@ public:
m_maincpu(*this, "maincpu"),
m_mb8877a(*this, "mb8877a"),
m_pit8253(*this, "pit"),
m_beeper(*this, BEEPER_TAG),
m_beeper(*this, "beeper"),
m_region_tvram(*this, "tvram"),
m_region_gvram(*this, "gvram"),
m_region_chargen(*this, "chargen"),
@ -892,7 +892,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END

12
src/mess/drivers/mz2500.c
View File

@ -65,11 +65,13 @@ public:
mz2500_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_rtc(*this, RP5C15_TAG)
m_rtc(*this, RP5C15_TAG),
m_beeper(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
required_device<rp5c15_device> m_rtc;
required_device<beep_device> m_beeper;
UINT8 *m_main_ram;
UINT8 *m_ipl_rom;
@ -1806,8 +1808,8 @@ void mz2500_state::machine_reset()
m_cg_clear_flag = 0;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(4096);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(4096);
m_beeper->set_state(0);
// m_monitor_type = ioport("DSW1")->read() & 0x40 ? 1 : 0;
}
@ -1921,7 +1923,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_portc_w)
m_old_portc = data;
machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x04);
m_beeper->set_state(data & 0x04);
m_screen_enable = data & 1;
@ -2157,7 +2159,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END

13
src/mess/drivers/mz3500.c
View File

@ -46,7 +46,8 @@ public:
m_hgdc1(*this, "upd7220_chr"),
m_hgdc2(*this, "upd7220_gfx"),
m_fdc(*this, "upd765a"),
m_video_ram(*this, "video_ram")
m_video_ram(*this, "video_ram"),
m_beeper(*this, "beeper")
{ }
// devices
@ -56,6 +57,8 @@ public:
required_device<upd7220_device> m_hgdc2;
required_device<upd765a_device> m_fdc;
required_shared_ptr<UINT8> m_video_ram;
required_device<beep_device> m_beeper;
UINT8 *m_ipl_rom;
UINT8 *m_basic_rom;
UINT8 *m_work_ram;
@ -661,7 +664,7 @@ WRITE8_MEMBER(mz3500_state::mz3500_pc_w)
*/
//printf("%02x PC\n",data);
machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10);
m_beeper->set_state(data & 0x10);
}
@ -815,8 +818,8 @@ void mz3500_state::machine_reset()
}
}
machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(2400);
m_beeper->set_state(0);
}
@ -883,7 +886,7 @@ static MACHINE_CONFIG_START( mz3500, mz3500_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END

22
src/mess/drivers/nc.c
View File

@ -347,7 +347,7 @@ void nc_state::nc_refresh_memory_bank_config(int bank)
mem_bank = mem_bank & m_membank_internal_ram_mask;
addr = machine().device<ram_device>(RAM_TAG)->pointer() + (mem_bank<<14);
addr = m_ram->pointer() + (mem_bank<<14);
membank(bank1)->set_base(addr);
membank(bank5)->set_base(addr);
@ -420,13 +420,13 @@ void nc_state::nc_common_restore_memory_from_stream()
if (m_file->read(&stored_size, sizeof(UINT32)) != sizeof(UINT32))
stored_size = 0;
if (stored_size > machine().device<ram_device>(RAM_TAG)->size())
restore_size = machine().device<ram_device>(RAM_TAG)->size();
if (stored_size > m_ram->size())
restore_size = m_ram->size();
else
restore_size = stored_size;
/* read as much as will fit into memory */
m_file->read(machine().device<ram_device>(RAM_TAG)->pointer(), restore_size);
m_file->read(m_ram->pointer(), restore_size);
/* seek over remaining data */
m_file->seek(SEEK_CUR,stored_size - restore_size);
}
@ -434,7 +434,7 @@ void nc_state::nc_common_restore_memory_from_stream()
/* store a block of memory to the nvram file */
void nc_state::nc_common_store_memory_to_stream()
{
UINT32 size = machine().device<ram_device>(RAM_TAG)->size();
UINT32 size = m_ram->size();
if (!m_file)
return;
@ -443,7 +443,7 @@ void nc_state::nc_common_store_memory_to_stream()
m_file->write(&size, sizeof(UINT32));
/* write data block */
m_file->write(machine().device<ram_device>(RAM_TAG)->pointer(), size);
m_file->write(m_ram->pointer(), size);
}
void nc_state::nc_common_open_stream_for_reading()
@ -660,15 +660,15 @@ void nc_state::nc_sound_update(int channel)
int on;
int frequency;
int period;
const char *beeper_device = NULL;
beep_device *beeper_device = NULL;
switch(channel)
{
case 0:
beeper_device = "beep.1";
beeper_device = m_beeper1;
break;
case 1:
beeper_device = "beep.2";
beeper_device = m_beeper2;
break;
}
@ -681,9 +681,9 @@ void nc_state::nc_sound_update(int channel)
frequency = (int)(1000000.0f/((float)((period & 0x07fff)<<1) * 1.6276f));
/* set state */
machine().device<beep_device>(beeper_device)->set_state(on);
beeper_device->set_state(on);
/* set frequency */
machine().device<beep_device>(beeper_device)->set_frequency(frequency);
beeper_device->set_frequency(frequency);
}
WRITE8_MEMBER(nc_state::nc_sound_w)

2
src/mess/drivers/osborne1.c
View File

@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_PALETTE_LENGTH( 3 )
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_PIA6821_ADD( "pia_0", osborne1_ieee_pia_config )

7
src/mess/drivers/osi.c
View File

@ -852,7 +852,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state )
MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
MCFG_SOUND_CONFIG_DISCRETE(osi600c_discrete_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_PIA6821_ADD( "pia_1", pia_dummy_intf )
@ -933,9 +933,8 @@ ROM_END
TIMER_CALLBACK_MEMBER(sb2m600_state::setup_beep)
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
speaker->set_state(0);
speaker->set_frequency(300);
m_beeper->set_state(0);
m_beeper->set_frequency(300);
}
DRIVER_INIT_MEMBER(c1p_state,c1p)

4
src/mess/drivers/p8k.c
View File

@ -792,7 +792,7 @@ static MACHINE_CONFIG_START( p8k, p8k_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
/* video hardware */
@ -819,7 +819,7 @@ static MACHINE_CONFIG_START( p8k_16, p8k_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
/* video hardware */

9
src/mess/drivers/pb1000.c
View File

@ -31,12 +31,12 @@ public:
pb1000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_beep(*this, BEEPER_TAG),
m_beeper(*this, "beeper"),
m_hd44352(*this, "hd44352")
{ }
required_device<hd61700_cpu_device> m_maincpu;
required_device<beep_device> m_beep;
required_device<beep_device> m_beeper;
required_device<hd44352_device> m_hd44352;
emu_timer *m_kb_timer;
@ -443,7 +443,8 @@ static UINT8 pb2000c_port_r(hd61700_cpu_device &device)
static void port_w(hd61700_cpu_device &device, UINT8 data)
{
device.machine().device<beep_device>(BEEPER_TAG)->set_state((BIT(data,7) ^ BIT(data,6)));
pb1000_state *state = device.machine().driver_data<pb1000_state>();
state->m_beeper->set_state((BIT(data,7) ^ BIT(data,6)));
//printf("%x\n", data);
}
@ -526,7 +527,7 @@ static MACHINE_CONFIG_START( pb1000, pb1000_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END

15
src/mess/drivers/pc100.c
View File

@ -67,9 +67,9 @@ public:
pc100_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_rtc(*this, "rtc"),
m_palram(*this, "palram")
,
m_maincpu(*this, "maincpu") { }
m_palram(*this, "palram"),
m_maincpu(*this, "maincpu"),
m_beeper(*this, "beeper") { }
required_device<msm58321_device> m_rtc;
required_shared_ptr<UINT16> m_palram;
@ -118,6 +118,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(pc100_10hz_irq);
IRQ_CALLBACK_MEMBER(pc100_irq_callback);
required_device<cpu_device> m_maincpu;
required_device<beep_device> m_beeper;
};
void pc100_state::video_start()
@ -219,7 +220,7 @@ WRITE8_MEMBER( pc100_state::pc100_output_w )
if(offset == 0)
{
m_timer_mode = (data & 0x18) >> 3;
machine().device<beep_device>(BEEPER_TAG)->set_state(((data & 0x40) >> 6) ^ 1);
m_beeper->set_state(((data & 0x40) >> 6) ^ 1);
printf("%02x\n",data & 0xc0);
}
}
@ -429,8 +430,8 @@ void pc100_state::machine_start()
void pc100_state::machine_reset()
{
machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(2400);
m_beeper->set_state(0);
}
INTERRUPT_GEN_MEMBER(pc100_state::pc100_vblank_irq)
@ -517,7 +518,7 @@ static MACHINE_CONFIG_START( pc100, pc100_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END

4
src/mess/drivers/pc2000.c
View File

@ -28,7 +28,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_lcdc(*this, "hd44780"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_bank1(*this, "bank1"),
m_bank2(*this, "bank2")
{ }
@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( pc2000, pc2000_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_CARTSLOT_ADD("cart")

2
src/mess/drivers/pc4.c
View File

@ -233,7 +233,7 @@ static MACHINE_CONFIG_START( pc4, pc4_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_RP5C01_ADD("rtc", XTAL_32_768kHz, rtc_intf)

16
src/mess/drivers/pc8801.c
View File

@ -303,7 +303,8 @@ public:
m_fdccpu(*this, "fdccpu"),
m_pic(*this, I8214_TAG),
m_rtc(*this, UPD1990A_TAG),
m_cassette(*this, "cassette")
m_cassette(*this, "cassette"),
m_beeper(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -311,6 +312,7 @@ public:
optional_device<i8214_device> m_pic;
required_device<upd1990a_device> m_rtc;
required_device<cassette_image_device> m_cassette;
required_device<beep_device> m_beeper;
UINT8 *m_work_ram;
UINT8 *m_hi_work_ram;
UINT8 *m_ext_work_ram;
@ -1185,10 +1187,10 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
m_rtc->clk_w((data & 4) >> 2);
if(((m_device_ctrl_data & 0x20) == 0x00) && ((data & 0x20) == 0x20))
machine().device<beep_device>(BEEPER_TAG)->set_state(1);
m_beeper->set_state(1);
if(((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00))
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_state(0);
if((m_device_ctrl_data & 0x40) != (data & 0x40))
{
@ -1215,7 +1217,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
/* TODO: is SING a buzzer mask? Bastard Special relies on this ... */
if(m_device_ctrl_data & 0x80)
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_state(0);
m_device_ctrl_data = data;
}
@ -2473,8 +2475,8 @@ void pc8801_state::machine_reset()
m_crtc.status = 0;
}
machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(2400);
m_beeper->set_state(0);
#ifdef USE_PROPER_I8214
{
@ -2708,7 +2710,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
MCFG_SOUND_CONFIG(pc88_ym2608_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", pc8801_state, pc8801_rtc_irq, attotime::from_hz(600))

20
src/mess/drivers/pc9801.c
View File

@ -365,7 +365,9 @@ public:
m_hgdc2(*this, "upd7220_btm"),
m_sasibus(*this, SASIBUS_TAG ":host"),
m_video_ram_1(*this, "video_ram_1"),
m_video_ram_2(*this, "video_ram_2"){ }
m_video_ram_2(*this, "video_ram_2"),
m_beeper(*this, "beeper"),
m_ram(*this, RAM_TAG) { }
required_device<cpu_device> m_maincpu;
required_device<am9517a_device> m_dmac;
@ -379,6 +381,8 @@ public:
optional_device<scsicb_device> m_sasibus;
required_shared_ptr<UINT8> m_video_ram_1;
required_shared_ptr<UINT8> m_video_ram_2;
required_device<beep_device> m_beeper;
optional_device<ram_device> m_ram;
virtual void video_start();
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@ -3109,7 +3113,7 @@ READ8_MEMBER(pc9801_state::ppi_prn_portb_r){ return ioport("DSW5")->read(); }
WRITE8_MEMBER(pc9801_state::ppi_sys_portc_w)
{
machine().device<beep_device>(BEEPER_TAG)->set_state(!(data & 0x08));
m_beeper->set_state(!(data & 0x08));
}
static I8255A_INTERFACE( ppi_system_intf )
@ -3388,7 +3392,7 @@ MACHINE_START_MEMBER(pc9801_state,pc9801rs)
state_save_register_global_pointer(machine(), m_work_ram, 0xa0000);
state_save_register_global_pointer(machine(), m_ext_work_ram, 0x700000);
m_ram_size = machine().device<ram_device>(RAM_TAG)->size() - 0xa0000;
m_ram_size = m_ram->size() - 0xa0000;
upd765a_device *fdc;
fdc = machine().device<upd765a_device>(":upd765_2hd");
@ -3427,8 +3431,8 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801_common)
m_tvram[(0x3fe0)+i*2] = default_memsw_data[i];
}
machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(2400);
m_beeper->set_state(0);
m_nmi_ff = 0;
m_mouse.control = 0xff;
@ -3612,7 +3616,7 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END
@ -3677,7 +3681,7 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state )
// MCFG_SOUND_CONFIG(pc98_ym2608_intf)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END
@ -3743,7 +3747,7 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state )
// MCFG_SOUND_CONFIG(pc98_ym2608_intf)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END

6
src/mess/drivers/pce220.c
View File

@ -42,7 +42,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_serial(*this, PCE220SERIAL_TAG)
{ }
@ -939,7 +939,7 @@ static MACHINE_CONFIG_START( pce220, pce220_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
@ -974,7 +974,7 @@ static MACHINE_CONFIG_START( pcg850v, pcg850v_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))

20
src/mess/drivers/pcw.c
View File

@ -239,7 +239,7 @@ void pcw_state::pcw_update_read_memory_block(int block, int bank)
space.install_read_bank(block * 0x04000 + 0x0000, block * 0x04000 + 0x3fff,block_name);
// LOG(("MEM: read block %i -> bank %i\n",block,bank));
}
membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
}
@ -249,7 +249,7 @@ void pcw_state::pcw_update_write_memory_block(int block, int bank)
char block_name[10];
sprintf(block_name,"bank%d",block+5);
membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
// LOG(("MEM: write block %i -> bank %i\n",block,bank));
}
@ -407,7 +407,6 @@ WRITE8_MEMBER(pcw_state::pcw_vdu_video_control_register_w)
WRITE8_MEMBER(pcw_state::pcw_system_control_w)
{
upd765a_device *fdc = machine().device<upd765a_device>("upd765");
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
LOG(("SYSTEM CONTROL: %d\n",data));
switch (data)
@ -545,14 +544,14 @@ WRITE8_MEMBER(pcw_state::pcw_system_control_w)
/* beep on */
case 11:
{
speaker->set_state(1);
m_beeper->set_state(1);
}
break;
/* beep off */
case 12:
{
speaker->set_state(0);
m_beeper->set_state(0);
}
break;
@ -995,9 +994,8 @@ ADDRESS_MAP_END
TIMER_CALLBACK_MEMBER(pcw_state::setup_beep)
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
speaker->set_state(0);
speaker->set_frequency(3750);
m_beeper->set_state(0);
m_beeper->set_frequency(3750);
}
@ -1028,9 +1026,9 @@ void pcw_state::machine_reset()
m_boot = 0; // System starts up in bootstrap mode, disabled until it's possible to emulate it.
/* copy boot code into RAM - yes, it's skipping a step */
memset(machine().device<ram_device>(RAM_TAG)->pointer(),0x00,machine().device<ram_device>(RAM_TAG)->size());
memset(m_ram->pointer(),0x00,m_ram->size());
for(x=0;x<256;x++)
machine().device<ram_device>(RAM_TAG)->pointer()[x+2] = code[x+0x300];
m_ram->pointer()[x+2] = code[x+0x300];
/* and hack our way past the MCU side of the boot process */
code[0x01] = 0x40;
@ -1291,7 +1289,7 @@ static MACHINE_CONFIG_START( pcw, pcw_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_UPD765A_ADD("upd765", true, true)

11
src/mess/drivers/pcw16.c
View File

@ -842,14 +842,14 @@ WRITE8_MEMBER(pcw16_state::pcw16_system_control_w)
/* bleeper on */
case 0x0b:
{
m_speaker->set_state(1);
m_beeper->set_state(1);
}
break;
/* bleeper off */
case 0x0c:
{
m_speaker->set_state(0);
m_beeper->set_state(0);
}
break;
@ -1005,7 +1005,6 @@ void pcw16_state::machine_reset()
void pcw16_state::machine_start()
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
m_system_status = 0;
m_interrupt_counter = 0;
@ -1015,8 +1014,8 @@ void pcw16_state::machine_start()
at_keyboard_init(machine(), AT_KEYBOARD_TYPE_AT);
at_keyboard_set_scan_code_set(3);
speaker->set_state(0);
speaker->set_frequency(3750);
m_beeper->set_state(0);
m_beeper->set_frequency(3750);
}
static INPUT_PORTS_START(pcw16)
@ -1062,7 +1061,7 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* printer */

2
src/mess/drivers/portfoli.c
View File

@ -762,7 +762,7 @@ void portfolio_state::machine_start()
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(portfolio_state::portfolio_int_ack),this));
/* memory expansions */
switch (machine().device<ram_device>(RAM_TAG)->size())
switch (m_ram->size())
{
case 128 * 1024:
program.unmap_readwrite(0x1f000, 0x9efff);

2
src/mess/drivers/psion.c
View File

@ -490,7 +490,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_NVRAM_HANDLER(psion)

2
src/mess/drivers/pyl601.c
View File

@ -498,7 +498,7 @@ static MC6845_INTERFACE( pyl601a_crtc6845_interface )
DRIVER_INIT_MEMBER(pyl601_state,pyl601)
{
memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, 64 * 1024);
memset(m_ram->pointer(), 0, 64 * 1024);
}
INTERRUPT_GEN_MEMBER(pyl601_state::pyl601_interrupt)

11
src/mess/drivers/qx10.c
View File

@ -64,9 +64,9 @@ public:
m_fdc(*this, "upd765"),
m_hgdc(*this, "upd7220"),
m_rtc(*this, "rtc"),
m_vram_bank(0)
,
m_maincpu(*this, "maincpu") { }
m_vram_bank(0),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
required_device<pit8253_device> m_pit_1;
required_device<pit8253_device> m_pit_2;
@ -149,6 +149,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed);
IRQ_CALLBACK_MEMBER(irq_callback);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
static UPD7220_DISPLAY_PIXELS( hgdc_display_pixels )
@ -274,7 +275,7 @@ void qx10_state::update_memory_mapping()
}
else
{
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024);
membank("bank1")->set_base(m_ram->pointer() + drambank*64*1024);
}
if (m_memcmos)
{
@ -282,7 +283,7 @@ void qx10_state::update_memory_mapping()
}
else
{
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024 + 32*1024);
membank("bank2")->set_base(m_ram->pointer() + drambank*64*1024 + 32*1024);
}
}

4
src/mess/drivers/rex6000.c
View File

@ -61,7 +61,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
@ -684,7 +684,7 @@ static MACHINE_CONFIG_START( rex6000, rex6000_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END

10
src/mess/drivers/rt1715.c
View File

@ -27,7 +27,8 @@ class rt1715_state : public driver_device
public:
rt1715_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
int m_led1_val;
int m_led2_val;
@ -41,6 +42,7 @@ public:
virtual void machine_reset();
virtual void palette_init();
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
@ -109,8 +111,8 @@ WRITE8_MEMBER(rt1715_state::k7658_data_w)
void rt1715_state::machine_start()
{
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0800);
membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
membank("bank2")->set_base(m_ram->pointer() + 0x0800);
membank("bank3")->set_base(m_ram->pointer());
}
void rt1715_state::machine_reset()
@ -124,7 +126,7 @@ WRITE8_MEMBER(rt1715_state::rt1715_rom_disable)
logerror("%s: rt1715_set_bank %02x\n", machine().describe_context(), data);
/* disable ROM, enable RAM */
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
membank("bank1")->set_base(m_ram->pointer());
}
/***************************************************************************

8
src/mess/drivers/rx78.c
View File

@ -52,8 +52,9 @@ class rx78_state : public driver_device
public:
rx78_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cass(*this, "cassette")
m_maincpu(*this, "maincpu"),
m_cass(*this, "cassette"),
m_ram(*this, RAM_TAG)
{ }
DECLARE_READ8_MEMBER( key_r );
@ -78,6 +79,7 @@ public:
DECLARE_DRIVER_INIT(rx78);
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cass;
required_device<ram_device> m_ram;
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( rx78_cart );
};
@ -514,7 +516,7 @@ ROM_END
DRIVER_INIT_MEMBER(rx78_state,rx78)
{
UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
UINT32 ram_size = m_ram->size();
address_space &prg = m_maincpu->space(AS_PROGRAM);
if(ram_size == 0x4000)

4
src/mess/drivers/sc2.c
View File

@ -20,7 +20,7 @@ class sc2_state : public driver_device
public:
sc2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_beep(*this, BEEPER_TAG)
m_beep(*this, "beeper")
,
m_maincpu(*this, "maincpu") { }
@ -219,7 +219,7 @@ static MACHINE_CONFIG_START( sc2, sc2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
MACHINE_CONFIG_END

12
src/mess/drivers/smc777.c
View File

@ -52,13 +52,15 @@ public:
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
m_fdc(*this, "fdc"),
m_sn(*this, "sn1")
m_sn(*this, "sn1"),
m_beeper(*this, "beeper")
{ }
required_device<cpu_device> m_maincpu;
required_device<mc6845_device> m_crtc;
required_device<mb8876_device> m_fdc;
optional_device<sn76489a_device> m_sn;
required_device<beep_device> m_beeper;
UINT8 *m_ipl_rom;
UINT8 *m_work_ram;
@ -528,7 +530,7 @@ WRITE8_MEMBER(smc777_state::system_output_w)
m_raminh_prefetch = (UINT8)(space.device().state().state_int(Z80_R)) & 0x7f;
break;
case 0x02: printf("Interlace %s\n",data & 0x10 ? "on" : "off"); break;
case 0x05: machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10); break;
case 0x05: m_beeper->set_state(data & 0x10); break;
default: printf("System FF W %02x\n",data); break;
}
}
@ -990,8 +992,8 @@ void smc777_state::machine_reset()
m_raminh_prefetch = 0xff;
m_pal_mode = 0x10;
machine().device<beep_device>(BEEPER_TAG)->set_frequency(300); //TODO: correct frequency
machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_beeper->set_frequency(300); //TODO: correct frequency
m_beeper->set_state(0);
}
@ -1114,7 +1116,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_CONFIG(psg_intf)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", smc777_state, keyboard_callback, attotime::from_hz(240/32))

10
src/mess/drivers/spc1000.c
View File

@ -22,7 +22,8 @@ public:
spc1000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_vdg(*this, "mc6847") ,
m_maincpu(*this, "maincpu") {}
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) {}
required_device<mc6847_base_device> m_vdg;
UINT8 m_IPLK;
@ -44,6 +45,7 @@ public:
DECLARE_READ8_MEMBER(spc1000_gmode_r);
DECLARE_READ8_MEMBER(spc1000_mc6847_videoram_r);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
@ -62,7 +64,7 @@ WRITE8_MEMBER(spc1000_state::spc1000_iplk_w)
membank("bank1")->set_base(mem);
membank("bank3")->set_base(mem);
} else {
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
membank("bank1")->set_base(ram);
membank("bank3")->set_base(ram + 0x8000);
}
@ -76,7 +78,7 @@ READ8_MEMBER(spc1000_state::spc1000_iplk_r)
membank("bank1")->set_base(mem);
membank("bank3")->set_base(mem);
} else {
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
membank("bank1")->set_base(ram);
membank("bank3")->set_base(ram + 0x8000);
}
@ -229,7 +231,7 @@ void spc1000_state::machine_reset()
{
address_space &space = m_maincpu->space(AS_PROGRAM);
UINT8 *mem = memregion("maincpu")->base();
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
space.install_read_bank(0x0000, 0x7fff, "bank1");
space.install_read_bank(0x8000, 0xffff, "bank3");

13
src/mess/drivers/studio2.c
View File

@ -446,7 +446,7 @@ READ_LINE_MEMBER( studio2_state::ef4_r )
WRITE_LINE_MEMBER( studio2_state::q_w )
{
m_speaker->set_state(state);
m_beeper->set_state(state);
}
static COSMAC_INTERFACE( studio2_cosmac_intf )
@ -550,7 +550,7 @@ static MACHINE_CONFIG_START( studio2, studio2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_FRAGMENT_ADD( studio2_cartslot )
@ -569,7 +569,7 @@ static MACHINE_CONFIG_START( visicom, visicom_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_FRAGMENT_ADD( studio2_cartslot )
@ -588,7 +588,7 @@ static MACHINE_CONFIG_START( mpt02, mpt02_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CDP1864_ADD(CDP1864_TAG, CDP1864_CLOCK, mpt02_cdp1864_intf)
@ -629,9 +629,8 @@ ROM_END
TIMER_CALLBACK_MEMBER(studio2_state::setup_beep)
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
speaker->set_state(0);
speaker->set_frequency(300);
m_beeper->set_state(0);
m_beeper->set_frequency(300);
}
DRIVER_INIT_MEMBER(studio2_state,studio2)

4
src/mess/drivers/supercon.c
View File

@ -29,7 +29,7 @@ public:
supercon_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_b_white(*this, "B_WHITE"),
m_b_black(*this, "B_BLACK"),
m_b_clr(*this, "B_CLR"),
@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( supercon, supercon_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("artwork_timer", supercon_state, update_artwork, attotime::from_hz(20))

16
src/mess/drivers/thomson.c
View File

@ -317,7 +317,7 @@ static ADDRESS_MAP_START ( to7, AS_PROGRAM, 8, thomson_state )
/* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
/* RAM mapping:
0x0000 - 0x3fff: 16 KB video RAM (actually 8 K x 8 bits + 8 K x 6 bits)
0x4000 - 0x5fff: 8 KB base RAM
0x6000 - 0x9fff: 16 KB extended RAM
@ -784,7 +784,7 @@ static ADDRESS_MAP_START ( to770, AS_PROGRAM, 8, thomson_state )
/* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
/* RAM mapping:
0x00000 - 0x03fff: 16 KB video RAM
0x04000 - 0x07fff: 16 KB unbanked base RAM
0x08000 - 0x1ffff: 6 * 16 KB banked extended RAM
@ -975,7 +975,7 @@ static ADDRESS_MAP_START ( mo5, AS_PROGRAM, 8, thomson_state )
/* 0x10000 - 0x1ffff: 16 KB integrated BASIC / 64 KB external cartridge */
/* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
/* RAM mapping:
0x00000 - 0x03fff: 16 KB video RAM
0x04000 - 0x0bfff: 32 KB unbanked base RAM
0x0c000 - 0x1bfff: 4 * 16 KB bank extended RAM
@ -1182,7 +1182,7 @@ static ADDRESS_MAP_START ( to9, AS_PROGRAM, 8, thomson_state )
/* 0x20000 - 0x3ffff: 128 KB internal software ROM */
/* 0x40000 - 0x447ff: 18 KB external floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
/* RAM mapping:
0x00000 - 0x03fff: 16 KB video RAM
0x04000 - 0x07fff: 16 KB unbanked base RAM
0x08000 - 0x2ffff: 10 * 16 KB banked extended RAM
@ -1507,7 +1507,7 @@ static ADDRESS_MAP_START ( to8, AS_PROGRAM, 8, thomson_state )
/* 0x30000 - 0x33fff: 16 KB BIOS ROM */
/* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
/* RAM mapping: 512 KB flat (including video) */
ADDRESS_MAP_END
@ -1703,7 +1703,7 @@ static ADDRESS_MAP_START ( to9p, AS_PROGRAM, 8, thomson_state )
/* 0x30000 - 0x33fff: 16 KB BIOS ROM */
/* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
/* RAM mapping: 512 KB flat (including video) */
ADDRESS_MAP_END
@ -1863,7 +1863,7 @@ static ADDRESS_MAP_START ( mo6, AS_PROGRAM, 8, thomson_state )
/* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
/* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
/* RAM mapping: 128 KB flat (including video) */
ADDRESS_MAP_END
@ -2178,7 +2178,7 @@ static ADDRESS_MAP_START ( mo5nr, AS_PROGRAM, 8, thomson_state )
/* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
/* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
/* RAM mapping: 128 KB flat (including video) */
ADDRESS_MAP_END

2
src/mess/drivers/ti990_10.c
View File

@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( ti990_10, ti990_10_state )
/* 911 VDT has a beep tone generator */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_FRAGMENT_ADD( ti990_hdc )

2
src/mess/drivers/ti990_4.c
View File

@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
#if VIDEO_911
/* 911 VDT has a beep tone generator */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
#endif
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)

9
src/mess/drivers/tmc1800.c
View File

@ -794,7 +794,7 @@ static MACHINE_CONFIG_START( tmc1800, tmc1800_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@ -820,7 +820,7 @@ static MACHINE_CONFIG_START( osc1000b, osc1000b_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@ -907,9 +907,8 @@ ROM_END
TIMER_CALLBACK_MEMBER(tmc1800_state::setup_beep)
{
beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
speaker->set_state(0);
speaker->set_frequency(0);
m_beeper->set_state(0);
m_beeper->set_frequency(0);
}
DRIVER_INIT_MEMBER(tmc1800_state,tmc1800)

2
src/mess/drivers/tvc.c
View File

@ -621,7 +621,7 @@ QUICKLOAD_LOAD_MEMBER( tvc_state,tvc64)
if (first_byte == 0x11)
{
image.fseek(0x90, SEEK_SET);
image.fread(machine().device<ram_device>(RAM_TAG)->pointer() + 0x19ef, image.length() - 0x90);
image.fread(m_ram->pointer() + 0x19ef, image.length() - 0x90);
return IMAGE_INIT_PASS;
}
else

2
src/mess/drivers/v1050.c
View File

@ -1012,7 +1012,7 @@ void v1050_state::machine_start()
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(v1050_state::v1050_int_ack),this));
// setup memory banking
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
membank("bank1")->configure_entries(0, 2, ram, 0x10000);
membank("bank1")->configure_entry(2, ram + 0x1c000);

8
src/mess/drivers/vg5k.c
View File

@ -66,7 +66,8 @@ public:
m_ef9345(*this, "ef9345"),
m_dac(*this, "dac"),
m_printer(*this, "printer"),
m_cassette(*this, "cassette")
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
@ -74,6 +75,7 @@ public:
required_device<dac_device> m_dac;
required_device<printer_image_device> m_printer;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
offs_t m_ef9345_offset;
@ -339,8 +341,8 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
/* install expansion memory*/
address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT16 ram_size = machine().device<ram_device>(RAM_TAG)->size();
UINT8 *ram = m_ram->pointer();
UINT16 ram_size = m_ram->size();
if (ram_size > 0x4000)
program.install_ram(0x8000, 0x3fff + ram_size, ram);

4
src/mess/drivers/vk100.c
View File

@ -159,7 +159,7 @@ public:
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen"),
m_crtc(*this, "crtc"),
m_speaker(*this, BEEPER_TAG),
m_speaker(*this, "beeper"),
m_uart(*this, "i8251"),
//m_i8251_rx_timer(NULL),
//m_i8251_tx_timer(NULL),
@ -1025,7 +1025,7 @@ static MACHINE_CONFIG_START( vk100, vk100_state )
MCFG_DEFAULT_LAYOUT( layout_vk100 )
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.25 )
MACHINE_CONFIG_END

4
src/mess/drivers/vt100.c
View File

@ -33,7 +33,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_crtc(*this, "vt100_video"),
m_speaker(*this, BEEPER_TAG),
m_speaker(*this, "beeper"),
m_uart(*this, "i8251"),
m_p_ram(*this, "p_ram")
{ }
@ -454,7 +454,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state )
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", vt100_state, keyboard_callback, attotime::from_hz(800))

6
src/mess/drivers/vt220.c
View File

@ -16,12 +16,14 @@ class vt220_state : public driver_device
public:
vt220_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
virtual void machine_reset();
virtual void video_start();
UINT32 screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
@ -38,7 +40,7 @@ INPUT_PORTS_END
void vt220_state::machine_reset()
{
memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
memset(m_ram->pointer(),0,16*1024);
}
void vt220_state::video_start()

6
src/mess/drivers/vt320.c
View File

@ -16,12 +16,14 @@ class vt320_state : public driver_device
public:
vt320_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
virtual void machine_reset();
virtual void video_start();
UINT32 screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
/*
@ -64,7 +66,7 @@ INPUT_PORTS_END
void vt320_state::machine_reset()
{
memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
memset(m_ram->pointer(),0,16*1024);
}
void vt320_state::video_start()

20
src/mess/drivers/vtech1.c
View File

@ -161,14 +161,15 @@ public:
m_speaker(*this, "speaker"),
m_cassette(*this, "cassette"),
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
/* devices */
required_device<mc6847_base_device> m_mc6847;
optional_device<speaker_sound_device> m_speaker;
optional_device<cassette_image_device> m_cassette;
UINT8 *m_ram;
UINT8 *m_ram_pointer;
UINT32 m_ram_size;
required_shared_ptr<UINT8> m_videoram;
@ -204,6 +205,7 @@ public:
void vtech1_get_track();
void vtech1_put_track();
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
@ -239,7 +241,7 @@ SNAPSHOT_LOAD_MEMBER( vtech1_state, vtech1 )
}
/* write it to ram */
image.fread( &m_ram[start - 0x7800], size);
image.fread( &m_ram_pointer[start - 0x7800], size);
/* patch variables depending on snapshot type */
switch (header[21])
@ -629,18 +631,18 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
int id;
/* ram */
m_ram = machine().device<ram_device>(RAM_TAG)->pointer();
m_ram_size = machine().device<ram_device>(RAM_TAG)->size();
m_ram_pointer = m_ram->pointer();
m_ram_size = m_ram->size();
/* setup memory banking */
membank("bank1")->set_base(m_ram);
membank("bank1")->set_base(m_ram_pointer);
/* 16k memory expansion? */
if (m_ram_size == 18*1024 || m_ram_size == 22*1024 || m_ram_size == 32*1024)
{
offs_t base = 0x7800 + (m_ram_size - 0x4000);
prg.install_readwrite_bank(base, base + 0x3fff, "bank2");
membank("bank2")->set_base(m_ram + base - 0x7800);
membank("bank2")->set_base(m_ram_pointer + base - 0x7800);
}
/* 64k expansion? */
@ -648,11 +650,11 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
{
/* install fixed first bank */
prg.install_readwrite_bank(0x8000, 0xbfff, "bank2");
membank("bank2")->set_base(m_ram + 0x800);
membank("bank2")->set_base(m_ram_pointer + 0x800);
/* install the others, dynamically banked in */
prg.install_readwrite_bank(0xc000, 0xffff, "bank3");
membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram + 0x4800, 0x4000);
membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram_pointer + 0x4800, 0x4000);
membank("bank3")->set_entry(0);
}

2
src/mess/drivers/x07.c
View File

@ -1509,7 +1509,7 @@ static MACHINE_CONFIG_START( x07, x07_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)

18
src/mess/drivers/x68k.c
View File

@ -1466,7 +1466,7 @@ READ16_MEMBER(x68k_state::x68k_sram_r)
// if(offset == 0x5a/2) // 0x5a should be 0 if no SASI HDs are present.
// return 0x0000;
if(offset == 0x08/2)
return machine().device<ram_device>(RAM_TAG)->size() >> 16; // RAM size
return m_ram->size() >> 16; // RAM size
#if 0
if(offset == 0x46/2)
return 0x0024;
@ -1481,7 +1481,7 @@ READ16_MEMBER(x68k_state::x68k_sram_r)
READ32_MEMBER(x68k_state::x68k_sram32_r)
{
if(offset == 0x08/4)
return (machine().device<ram_device>(RAM_TAG)->size() & 0xffff0000); // RAM size
return (m_ram->size() & 0xffff0000); // RAM size
#if 0
if(offset == 0x46/2)
return 0x0024;
@ -1600,7 +1600,7 @@ TIMER_CALLBACK_MEMBER(x68k_state::x68k_bus_error)
{
int val = param;
int v;
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT8 *ram = m_ram->pointer();
if(strcmp(machine().system().name,"x68030") == 0)
v = 0x0b;
@ -2410,8 +2410,8 @@ MACHINE_RESET_MEMBER(x68k_state,x68000)
UINT8* romdata = memregion("user2")->base();
attotime irq_time;
memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,machine().device<ram_device>(RAM_TAG)->size());
memcpy(machine().device<ram_device>(RAM_TAG)->pointer(),romdata,8);
memset(m_ram->pointer(),0,m_ram->size());
memcpy(m_ram->pointer(),romdata,8);
// init keyboard
m_keyboard.delay = 500; // 3*100+200
@ -2468,8 +2468,8 @@ MACHINE_START_MEMBER(x68k_state,x68000)
m_spriteram = (UINT16*)(*memregion("user1"));
space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_emptyram_r),this));
space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_emptyram_w),this));
space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
membank("bank1")->set_base(m_ram->pointer());
space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_gvram_r),this));
space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_gvram_w),this));
membank("bank2")->set_base(m_gvram16); // so that code in VRAM is executable - needed for Terra Cresta
@ -2515,8 +2515,8 @@ MACHINE_START_MEMBER(x68k_state,x68030)
m_spriteram = (UINT16*)(*memregion("user1"));
space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_rom0_r),this),0xffffffff);
space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_rom0_w),this),0xffffffff);
space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
membank("bank1")->set_base(m_ram->pointer());
space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read32_delegate(FUNC(x68k_state::x68k_gvram32_r),this));
space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write32_delegate(FUNC(x68k_state::x68k_gvram32_w),this));
membank("bank2")->set_base(m_gvram32); // so that code in VRAM is executable - needed for Terra Cresta

2
src/mess/drivers/xerox820.c
View File

@ -714,7 +714,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( bigboard, xerox820, bigboard_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */
MACHINE_CONFIG_END

4
src/mess/drivers/z9001.c
View File

@ -45,7 +45,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_framecnt(0),
m_beeper(*this, BEEPER_TAG),
m_beeper(*this, "beeper"),
m_cass(*this, "cassette"),
m_p_colorram(*this, "colorram"),
m_p_videoram(*this, "videoram"){ }
@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */

4
src/mess/drivers/zrt80.c
View File

@ -30,7 +30,7 @@ public:
m_maincpu(*this, "maincpu"),
m_crtc(*this, "crtc"),
m_8250(*this, "ins8250"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_p_videoram(*this, "videoram"){ }
required_device<cpu_device> m_maincpu;
@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
MCFG_SOUND_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */

8
src/mess/includes/aim65.h
View File

@ -35,9 +35,10 @@ class aim65_state : public driver_device
public:
aim65_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette1(*this, "cassette"),
m_cassette2(*this, "cassette2")
m_maincpu(*this, "maincpu"),
m_cassette1(*this, "cassette"),
m_cassette2(*this, "cassette2"),
m_ram(*this, RAM_TAG)
{ }
DECLARE_WRITE8_MEMBER(aim65_pia_a_w);
@ -56,6 +57,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette1;
required_device<cassette_image_device> m_cassette2;
required_device<ram_device> m_ram;
virtual void machine_start();
TIMER_CALLBACK_MEMBER(aim65_printer_timer);
void aim65_pia();

5
src/mess/includes/apple1.h
View File

@ -10,6 +10,7 @@
#include "imagedev/snapquik.h"
#include "machine/6821pia.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
typedef short termchar_t;
@ -34,7 +35,8 @@ public:
apple1_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
int m_vh_clrscrn_pressed;
int m_kbd_data;
@ -80,6 +82,7 @@ public:
terminal_t *terminal_create(int gfx, int blank_char, int char_bits,int (*getcursorcode)(int original_code),int num_cols, int num_rows);
attotime apple1_vh_dsp_time_to_ready();
DECLARE_SNAPSHOT_LOAD_MEMBER( apple1 );
required_device<ram_device> m_ram;
};

5
src/mess/includes/b2m.h
View File

@ -13,6 +13,7 @@
#include "machine/wd_fdc.h"
#include "sound/speaker.h"
#include "sound/wave.h"
#include "machine/ram.h"
class b2m_state : public driver_device
{
@ -20,7 +21,8 @@ public:
b2m_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker") { }
m_speaker(*this, "speaker"),
m_ram(*this, RAM_TAG) { }
UINT8 m_b2m_8255_porta;
UINT8 m_b2m_video_scroll;
@ -42,6 +44,7 @@ public:
fd1793_t *m_fdc;
device_t *m_pic;
required_device<speaker_sound_device> m_speaker;
required_device<ram_device> m_ram;
DECLARE_READ8_MEMBER(b2m_keyboard_r);
DECLARE_WRITE8_MEMBER(b2m_palette_w);
DECLARE_READ8_MEMBER(b2m_palette_r);

5
src/mess/includes/bebox.h
View File

@ -14,6 +14,7 @@
#include "machine/8237dma.h"
#include "machine/53c810.h"
#include "machine/upd765.h"
#include "machine/ram.h"
struct bebox_devices_t
{
@ -31,11 +32,13 @@ public:
: driver_device(mconfig, type, tag),
m_ppc1(*this, "ppc1"),
m_ppc2(*this, "ppc2"),
m_lsi53c810(*this, "scsi:lsi53c810"){ }
m_lsi53c810(*this, "scsi:lsi53c810"),
m_ram(*this, RAM_TAG){ }
required_device<cpu_device> m_ppc1;
required_device<cpu_device> m_ppc2;
required_device<lsi53c810_device> m_lsi53c810;
required_device<ram_device> m_ram;
UINT32 m_cpu_imask[2];
UINT32 m_interrupts;
UINT32 m_crossproc_interrupts;

5
src/mess/includes/c65.h
View File

@ -11,6 +11,7 @@
#include "machine/cbmiec.h"
#include "imagedev/cartslot.h"
#include "imagedev/snapquik.h"
#include "machine/ram.h"
#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
@ -66,7 +67,8 @@ public:
m_c65_chargen(*this, "c65_chargen"),
m_interface(*this, "interface"),
m_roml_writable(0),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
optional_device<cbm_iec_device> m_iec;
@ -176,6 +178,7 @@ public:
void c65_common_driver_init( );
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
/*----------- defined in machine/c65.c -----------*/

6
src/mess/includes/cgenie.h
View File

@ -9,6 +9,7 @@
#include "machine/wd17xx.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
// CRTC 6845
struct CRTC6845
@ -43,7 +44,8 @@ public:
m_colorram(*this, "colorram"),
m_fontram(*this, "fontram"),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_fontram;
@ -82,6 +84,8 @@ public:
DECLARE_WRITE8_MEMBER(cgenie_sh_control_port_w);
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
void cgenie_offset_xy();
int cgenie_get_register(int indx);
void cgenie_mode_select(int mode);

1
src/mess/includes/comx35.h
View File

@ -92,6 +92,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( prd_w );
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
DECLARE_QUICKLOAD_LOAD_MEMBER( comx35_comx );
void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count);
// processor state
int m_clear; // CPU mode

4
src/mess/includes/dai.h
View File

@ -57,7 +57,8 @@ public:
m_tms5501(*this, "tms5501"),
m_sound(*this, "custom"),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
required_device<pit8253_device> m_pit;
required_device<tms5501_device> m_tms5501;
@ -86,6 +87,7 @@ public:
TIMER_CALLBACK_MEMBER(dai_timer);
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
void dai_update_memory(int dai_rom_bank);
};

5
src/mess/includes/dgn_beta.h
View File

@ -10,6 +10,7 @@
#include "video/mc6845.h"
#include "machine/wd17xx.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
/* Tags */
@ -88,7 +89,8 @@ public:
: driver_device(mconfig, type, tag),
m_mc6845(*this, "crtc"),
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
required_device<mc6845_device> m_mc6845;
required_shared_ptr<UINT8> m_videoram;
@ -207,6 +209,7 @@ public:
void ScanInKeyboard(void);
void dgn_beta_frame_interrupt (int data);
void dgn_beta_line_interrupt (int data);
required_device<ram_device> m_ram;
};

5
src/mess/includes/electron.h
View File

@ -12,6 +12,7 @@
#define ELECTRON_H_
#include "imagedev/cassette.h"
#include "sound/beep.h"
/* Interrupts */
#define INT_HIGH_TONE 0x40
@ -58,7 +59,8 @@ public:
electron_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_beeper(*this, "beeper") { }
ULA m_ula;
emu_timer *m_tape_timer;
@ -84,6 +86,7 @@ public:
TIMER_CALLBACK_MEMBER(electron_scanline_interrupt);
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<beep_device> m_beeper;
inline UINT8 read_vram( UINT16 addr );
inline void electron_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
void electron_interrupt_handler(int mode, int interrupt);

6
src/mess/includes/enterp.h
View File

@ -13,7 +13,7 @@
#define NICK_PALETTE_SIZE 256
#include "machine/ram.h"
struct NICK_STATE;
class ep_state : public driver_device
@ -21,7 +21,8 @@ class ep_state : public driver_device
public:
ep_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
UINT8 exdos_card_value; /* state of the wd1770 irq/drq lines */
UINT8 keyboard_line; /* index of keyboard line to read */
@ -39,6 +40,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_intrq_w);
DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_drq_w);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
void enterprise_update_memory_page(address_space &space, offs_t page, int index);
char Nick_FetchByte(unsigned long Addr);
void nick_write_pixel(int ci);

2
src/mess/includes/fidelz80.h
View File

@ -19,7 +19,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speech(*this, "speech"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_i8041(*this, "mcu"),
m_i8243(*this, "i8243")
{ }

5
src/mess/includes/fm7.h
View File

@ -1,4 +1,5 @@
#include "imagedev/cassette.h"
#include "sound/beep.h"
/*
*
@ -110,7 +111,8 @@ public:
m_maincpu(*this, "maincpu"),
m_sub(*this, "sub"),
m_x86(*this, "x86"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_beeper(*this, "beeper") { }
optional_shared_ptr<UINT8> m_shared_ram;
optional_shared_ptr<UINT8> m_boot_ram;
@ -262,6 +264,7 @@ public:
required_device<cpu_device> m_sub;
optional_device<cpu_device> m_x86;
required_device<cassette_image_device> m_cassette;
required_device<beep_device> m_beeper;
void fm7_alu_mask_write(UINT32 offset, int bank, UINT8 dat);
void fm7_alu_function_compare(UINT32 offset);
void fm7_alu_function_pset(UINT32 offset);

6
src/mess/includes/gb.h
View File

@ -8,7 +8,7 @@
#define GB_H_
#include "machine/gb_slot.h"
#include "machine/ram.h"
/* Interrupts */
#define VBL_INT 0 /* V-Blank */
@ -116,7 +116,8 @@ public:
m_custom(*this, "custom"),
m_region_maincpu(*this, "maincpu"),
m_rambank(*this, "cgb_ram"),
m_inputs(*this, "INPUTS") { }
m_inputs(*this, "INPUTS"),
m_ram(*this, RAM_TAG) { }
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -213,6 +214,7 @@ protected:
required_memory_region m_region_maincpu;
optional_memory_bank m_rambank; // cgb
required_ioport m_inputs;
optional_device<ram_device> m_ram;
void gb_timer_increment();
void gb_timer_check_irq();

2
src/mess/includes/genpc.h
View File

@ -16,6 +16,7 @@
#include "machine/pit8253.h"
#include "sound/speaker.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
#define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \
MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \
@ -49,6 +50,7 @@ public:
required_device<speaker_sound_device> m_speaker;
required_device<isa8_device> m_isabus;
required_device<pc_kbdc_device> m_pc_kbdc;
required_device<ram_device> m_ram;
/* U73 is an LS74 - dual flip flop */
/* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */

2
src/mess/includes/kaypro.h
View File

@ -27,7 +27,7 @@ public:
m_centronics(*this, "centronics"),
m_fdc(*this, "wd1793"),
m_crtc(*this, "crtc"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_p_videoram(*this, "p_videoram"){ }
required_device<cpu_device> m_maincpu;

8
src/mess/includes/llc.h
View File

@ -21,9 +21,10 @@ class llc_state : public driver_device
public:
llc_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_speaker(*this, "speaker"),
m_p_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu") { }
m_speaker(*this, "speaker"),
m_p_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
DECLARE_WRITE8_MEMBER(llc2_rom_disable_w);
DECLARE_WRITE8_MEMBER(llc2_basic_enable_w);
@ -55,6 +56,7 @@ public:
UINT32 screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
optional_device<ram_device> m_ram;
};

5
src/mess/includes/lviv.h
View File

@ -11,6 +11,7 @@
#include "machine/i8255.h"
#include "sound/speaker.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
class lviv_state : public driver_device
{
@ -19,7 +20,8 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
unsigned char * m_video_ram;
unsigned short m_colortable[1][4];
@ -48,6 +50,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
void lviv_update_palette(UINT8 pal);
void lviv_update_memory ();
void lviv_setup_snapshot (UINT8 * data);

2
src/mess/includes/micronic.h
View File

@ -26,7 +26,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, Z80_TAG),
m_lcdc(*this, HD61830_TAG),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_rtc(*this, MC146818_TAG),
m_ram(*this, RAM_TAG),
m_ram_base(*this, "ram_base"),

5
src/mess/includes/mtx.h
View File

@ -12,6 +12,7 @@
#include "machine/ctronics.h"
#include "machine/z80ctc.h"
#include "sound/sn76496.h"
#include "machine/ram.h"
#define Z80_TAG "z80"
#define Z80CTC_TAG "z80ctc"
@ -30,7 +31,8 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, Z80_TAG),
m_sn(*this, SN76489A_TAG),
m_cassette(*this, "cassette")
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG)
{ }
required_device<cpu_device> m_maincpu;
@ -50,6 +52,7 @@ public:
z80ctc_device *m_z80ctc;
device_t *m_z80dart;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
centronics_device *m_centronics;
/* timers */

5
src/mess/includes/mz700.h
View File

@ -17,6 +17,7 @@
#include "machine/z80pio.h"
#include "sound/speaker.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
class mz_state : public driver_device
{
@ -25,7 +26,8 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_speaker(*this, "speaker"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
int m_mz700; /* 1 if running on an mz700 */
@ -98,6 +100,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
};

5
src/mess/includes/nascom1.h
View File

@ -10,6 +10,7 @@
#include "imagedev/snapquik.h"
#include "machine/wd17xx.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
struct nascom1_portstat_t
{
@ -32,7 +33,8 @@ public:
: driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette") { }
m_cassette(*this, "cassette"),
m_ram(*this, RAM_TAG) { }
required_shared_ptr<UINT8> m_videoram;
device_t *m_hd6402;
@ -61,6 +63,7 @@ public:
DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette );
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 );
};

12
src/mess/includes/nc.h
View File

@ -6,7 +6,8 @@
#ifndef NC_H_
#define NC_H_
#include "machine/ram.h"
#include "sound/beep.h"
#define NC_NUM_COLOURS 4
@ -30,7 +31,10 @@ class nc_state : public driver_device
public:
nc_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG),
m_beeper1(*this, "beep.1"),
m_beeper2(*this, "beep.2") { }
emu_timer *m_serial_timer;
char m_memory_config[4];
@ -103,6 +107,10 @@ public:
void nc100_machine_stop();
void nc200_machine_stop();
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<beep_device> m_beeper1;
required_device<beep_device> m_beeper2;
void nc200_video_set_backlight(int state);
void nc_card_save(device_image_interface &image);
int nc_card_calculate_mask(int size);

2
src/mess/includes/osborne1.h
View File

@ -28,7 +28,7 @@ public:
m_pia0(*this, "pia_0"),
m_pia1(*this, "pia_1"),
m_fdc(*this, "mb8877"),
m_beep(*this, BEEPER_TAG),
m_beep(*this, "beeper"),
m_ram(*this, RAM_TAG),
m_ieee(*this, IEEE488_TAG),
m_row0(*this, "ROW0"),

Some files were not shown because too many files have changed in this diff Show More