summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers
diff options
context:
space:
mode:
author Andrew Gardner <andrew-gardner@users.noreply.github.com>2013-03-06 04:33:54 +0000
committer Andrew Gardner <andrew-gardner@users.noreply.github.com>2013-03-06 04:33:54 +0000
commitc64c35d64a6fbc3c58ec89a3426bc0fd5c21236d (patch)
treed3afc90121acbcac91f21c69211802b2f85fd8d3 /src/mess/drivers
parent1230f110d6aa715d65e3ea8632454b859f2db228 (diff)
Modernized the beep and taitosnd devices. [Andrew Gardner]
Diffstat (limited to 'src/mess/drivers')
-rw-r--r--src/mess/drivers/a5105.c4
-rw-r--r--src/mess/drivers/alphatro.c8
-rw-r--r--src/mess/drivers/bigbord2.c6
-rw-r--r--src/mess/drivers/bmjr.c6
-rw-r--r--src/mess/drivers/bml3.c6
-rw-r--r--src/mess/drivers/ex800.c12
-rw-r--r--src/mess/drivers/fidelz80.c2
-rw-r--r--src/mess/drivers/fm7.c28
-rw-r--r--src/mess/drivers/glasgow.c14
-rw-r--r--src/mess/drivers/h19.c6
-rw-r--r--src/mess/drivers/h8.c4
-rw-r--r--src/mess/drivers/jr100.c12
-rw-r--r--src/mess/drivers/jr200.c10
-rw-r--r--src/mess/drivers/lx800.c6
-rw-r--r--src/mess/drivers/mephisto.c6
-rw-r--r--src/mess/drivers/micronic.c4
-rw-r--r--src/mess/drivers/mmodular.c36
-rw-r--r--src/mess/drivers/multi8.c6
-rw-r--r--src/mess/drivers/mz2000.c8
-rw-r--r--src/mess/drivers/mz2500.c6
-rw-r--r--src/mess/drivers/nc.c10
-rw-r--r--src/mess/drivers/osi.c10
-rw-r--r--src/mess/drivers/pb1000.c2
-rw-r--r--src/mess/drivers/pc100.c6
-rw-r--r--src/mess/drivers/pc2000.c2
-rw-r--r--src/mess/drivers/pc4.c2
-rw-r--r--src/mess/drivers/pc8801.c10
-rw-r--r--src/mess/drivers/pc9801.c6
-rw-r--r--src/mess/drivers/pce220.c2
-rw-r--r--src/mess/drivers/pcw.c12
-rw-r--r--src/mess/drivers/pcw16.c10
-rw-r--r--src/mess/drivers/psion.c4
-rw-r--r--src/mess/drivers/rex6000.c6
-rw-r--r--src/mess/drivers/sc2.c2
-rw-r--r--src/mess/drivers/smc777.c6
-rw-r--r--src/mess/drivers/studio2.c8
-rw-r--r--src/mess/drivers/supercon.c4
-rw-r--r--src/mess/drivers/tmc1800.c7
-rw-r--r--src/mess/drivers/vk100.c4
-rw-r--r--src/mess/drivers/vt100.c6
-rw-r--r--src/mess/drivers/x07.c8
-rw-r--r--src/mess/drivers/xerox820.c8
-rw-r--r--src/mess/drivers/z9001.c4
-rw-r--r--src/mess/drivers/zrt80.c8
44 files changed, 178 insertions, 159 deletions
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index 8a19b8bedc0..323706dfbf9 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -222,7 +222,7 @@ WRITE8_MEMBER( a5105_state::a5105_ab_w )
break;
case 6:
- beep_set_state(m_beep, BIT(data, 0));
+ m_beep->set_state(BIT(data, 0));
break;
}
}
@@ -482,7 +482,7 @@ void a5105_state::machine_reset()
{
address_space &space = m_maincpu->space(AS_PROGRAM);
a5105_ab_w(space, 0, 9); // turn motor off
- beep_set_frequency(m_beep, 500);
+ m_beep->set_frequency(500);
m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
m_rom_base = (UINT8*)machine().root_device().memregion("maincpu")->base();
diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c
index 8fb48ccdef4..aa90c60389d 100644
--- a/src/mess/drivers/alphatro.c
+++ b/src/mess/drivers/alphatro.c
@@ -76,7 +76,7 @@ private:
TIMER_CALLBACK_MEMBER(alphatro_state::alphatro_beepoff)
{
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
}
READ8_MEMBER( alphatro_state::port10_r )
@@ -102,7 +102,7 @@ WRITE8_MEMBER( alphatro_state::port10_w )
if (length)
{
machine().scheduler().timer_set(attotime::from_msec(length), timer_expired_delegate(FUNC(alphatro_state::alphatro_beepoff),this));
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
}
m_cass->change_state( BIT(data, 3) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
@@ -360,8 +360,8 @@ void alphatro_state::machine_reset()
m_sys_timer->adjust(attotime::from_usec(10),0,attotime::from_usec(10));
m_serial_timer->adjust(attotime::from_hz(500),0,attotime::from_hz(500)); // USART clock - this is a guesstimate
m_timer_bit = 0;
- beep_set_state(m_beep, 0);
- beep_set_frequency(m_beep, 950); /* piezo-device needs to be measured */
+ m_beep->set_state(0);
+ m_beep->set_frequency(950); /* piezo-device needs to be measured */
}
void alphatro_state::palette_init()
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index c8ac47cc002..1f54ef8941e 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -285,7 +285,7 @@ WRITE8_MEMBER( bigbord2_state::portc8_w )
break;
case 7:
// beeper
- beep_set_state(m_beeper, m_c8[7]);
+ m_beeper->set_state(m_c8[7]);
break;
}
}
@@ -556,8 +556,8 @@ void bigbord2_state::machine_reset()
UINT8 i;
for (i = 0; i < 8; i++)
m_c8[i] = 0;
- beep_set_state(m_beeper, 0);
- beep_set_frequency(m_beeper, 950); // actual frequency is unknown
+ m_beeper->set_state(0);
+ m_beeper->set_frequency(950); // actual frequency is unknown
membank("bankr")->set_entry(0);
membank("bankv")->set_entry(0);
membank("banka")->set_entry(0);
diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c
index f8b4c118766..e9ad5f353cb 100644
--- a/src/mess/drivers/bmjr.c
+++ b/src/mess/drivers/bmjr.c
@@ -133,7 +133,7 @@ WRITE8_MEMBER( bmjr_state::tape_w )
{
if(!m_tape_switch)
{
- beep_set_state(m_beep, !BIT(data, 7));
+ m_beep->set_state(!BIT(data, 7));
}
else
{
@@ -333,8 +333,8 @@ void bmjr_state::palette_init()
void bmjr_state::machine_start()
{
- beep_set_frequency(m_beep, 1200); //guesswork
- beep_set_state(m_beep, 0);
+ m_beep->set_frequency(1200); //guesswork
+ m_beep->set_state(0);
}
void bmjr_state::machine_reset()
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index 995247e0e85..512094aa9c3 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -364,7 +364,7 @@ READ8_MEMBER( bml3_state::bml3_beep_r)
WRITE8_MEMBER( bml3_state::bml3_beep_w)
{
- beep_set_state(m_beep,!BIT(data, 7));
+ m_beep->set_state(!BIT(data, 7));
}
READ8_MEMBER( bml3_state::bml3_a000_r) { return m_extram[offset + 0xa000]; }
@@ -632,8 +632,8 @@ void bml3_state::palette_init()
void bml3_state::machine_start()
{
- beep_set_frequency(machine().device(BEEPER_TAG),1200); //guesswork
- beep_set_state(machine().device(BEEPER_TAG),0);
+ m_beep->set_frequency(1200); //guesswork
+ m_beep->set_state(0);
m_extram = auto_alloc_array(machine(),UINT8,0x10000);
}
diff --git a/src/mess/drivers/ex800.c b/src/mess/drivers/ex800.c
index ca0664c3377..cd9e7252308 100644
--- a/src/mess/drivers/ex800.c
+++ b/src/mess/drivers/ex800.c
@@ -206,10 +206,10 @@ INPUT_CHANGED_MEMBER(ex800_state::online_switch)
void ex800_state::machine_start()
{
m_irq_state = ASSERT_LINE;
- device_t *speaker = machine().device(BEEPER_TAG);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
/* Setup beep */
- beep_set_state(speaker, 0);
- beep_set_frequency(speaker, 4000); /* measured at 4000 Hz */
+ speaker->set_state(0);
+ speaker->set_frequency(4000); /* measured at 4000 Hz */
}
@@ -265,11 +265,11 @@ WRITE8_MEMBER(ex800_state::ex800_portb_w)
WRITE8_MEMBER(ex800_state::ex800_portc_w)
{
- device_t *speaker = machine().device(BEEPER_TAG);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
if (data & 0x80)
- beep_set_state(speaker, 0);
+ speaker->set_state(0);
else
- beep_set_state(speaker, 1);
+ speaker->set_state(1);
logerror("PC W %x @%x\n", data, space.device().safe_pc());
}
diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c
index e693df8b830..8e323227e7a 100644
--- a/src/mess/drivers/fidelz80.c
+++ b/src/mess/drivers/fidelz80.c
@@ -667,7 +667,7 @@ WRITE8_MEMBER( fidelz80_state::fidelz80_portc_w )
WRITE8_MEMBER( fidelz80_state::cc10_porta_w )
{
- beep_set_state(m_beep, (data & 0x80) ? 0 : 1);
+ m_beep->set_state((data & 0x80) ? 0 : 1);
m_digit_data = data;
diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c
index f83f85265da..e152631b383 100644
--- a/src/mess/drivers/fm7.c
+++ b/src/mess/drivers/fm7.c
@@ -236,7 +236,7 @@ READ8_MEMBER(fm7_state::fm7_irq_cause_r)
TIMER_CALLBACK_MEMBER(fm7_state::fm7_beeper_off)
{
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
logerror("timed beeper off\n");
}
@@ -246,23 +246,23 @@ WRITE8_MEMBER(fm7_state::fm7_beeper_w)
if(!m_speaker_active) // speaker not active, disable all beeper sound
{
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
return;
}
if(data & 0x80)
{
if(m_speaker_active)
- beep_set_state(machine().device(BEEPER_TAG),1);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(1);
}
else
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
if(data & 0x40)
{
if(m_speaker_active)
{
- beep_set_state(machine().device(BEEPER_TAG),1);
+ machine().device<beep_device>(BEEPER_TAG)->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));
}
@@ -279,7 +279,7 @@ READ8_MEMBER(fm7_state::fm7_sub_beeper_r)
{
if(m_speaker_active)
{
- beep_set_state(machine().device(BEEPER_TAG),1);
+ machine().device<beep_device>(BEEPER_TAG)->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));
}
@@ -1848,8 +1848,8 @@ MACHINE_START_MEMBER(fm7_state,fm7)
memset(m_shared_ram,0xff,0x80);
m_type = SYS_FM7;
- beep_set_frequency(machine().device(BEEPER_TAG),1200);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
}
MACHINE_START_MEMBER(fm7_state,fm77av)
@@ -1869,8 +1869,8 @@ MACHINE_START_MEMBER(fm7_state,fm77av)
membank("bank21")->set_base(RAM+0x800);
m_type = SYS_FM77AV;
- beep_set_frequency(machine().device(BEEPER_TAG),1200);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
}
MACHINE_START_MEMBER(fm7_state,fm11)
@@ -1880,8 +1880,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
memset(m_shared_ram,0xff,0x80);
m_type = SYS_FM11;
- beep_set_frequency(machine().device(BEEPER_TAG),1200);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
// last part of Initiate ROM is visible at the end of RAM too (interrupt vectors)
memcpy(RAM+0x3fff0,ROM+0x0ff0,16);
}
@@ -1889,8 +1889,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
MACHINE_START_MEMBER(fm7_state,fm16)
{
m_type = SYS_FM16;
- beep_set_frequency(machine().device(BEEPER_TAG),1200);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
}
void fm7_state::machine_reset()
diff --git a/src/mess/drivers/glasgow.c b/src/mess/drivers/glasgow.c
index 83c643b43c4..3cab4efa410 100644
--- a/src/mess/drivers/glasgow.c
+++ b/src/mess/drivers/glasgow.c
@@ -106,7 +106,7 @@ WRITE16_MEMBER( glasgow_state::glasgow_lcd_flag_w )
{
UINT16 lcd_flag = data & 0x8100;
- beep_set_state(m_beep, BIT(lcd_flag, 8));
+ m_beep->set_state(BIT(lcd_flag, 8));
if (lcd_flag)
m_led7 = 255;
@@ -153,7 +153,7 @@ WRITE16_MEMBER( glasgow_state::write_lcd_flag )
// UINT8 lcd_flag;
mboard_lcd_invert = 0;
// lcd_flag=data >> 8;
- //beep_set_state(0, (data >> 8) & 1 ? 1 : 0);
+ //m_beep->set_state((data >> 8) & 1 ? 1 : 0);
if ((data >> 8) == 0)
{
mboard_key_selector = 1;
@@ -175,7 +175,7 @@ WRITE16_MEMBER( glasgow_state::write_lcd_flag )
WRITE16_MEMBER( glasgow_state::write_irq_flag )
{
- beep_set_state(m_beep, data & 0x100);
+ m_beep->set_state(data & 0x100);
logerror("Write 0x800004 = %x \n", data);
m_irq_flag = 1;
m_beeper = data;
@@ -236,7 +236,7 @@ WRITE32_MEMBER( glasgow_state::write_lcd_flag32 )
//logerror("LCD Flag 32 = %x \n", data >> 24);
- //beep_set_state(0, (data >> 24) & 1 ? 1 : 0);
+ //m_beep->set_state((data >> 24) & 1 ? 1 : 0);
// if (lcd_flag != 0)
// m_led7 = 255;
@@ -269,7 +269,7 @@ READ16_MEMBER(glasgow_state::read_board_amsterd)
WRITE32_MEMBER( glasgow_state::write_beeper32 )
{
- beep_set_state(m_beep, data & 0x01000000);
+ m_beep->set_state(data & 0x01000000);
logerror("Write 0x8000004 = %x \n", data);
m_irq_flag = 1;
m_beeper = data;
@@ -290,7 +290,7 @@ void glasgow_state::machine_start()
mboard_key_selector = 0;
m_irq_flag = 0;
m_lcd_shift_counter = 3;
- beep_set_frequency(m_beep, 44);
+ m_beep->set_frequency(44);
mboard_savestate_register();
}
@@ -299,7 +299,7 @@ void glasgow_state::machine_start()
MACHINE_START_MEMBER(glasgow_state,dallas32)
{
m_lcd_shift_counter = 3;
- beep_set_frequency(m_beep, 44);
+ m_beep->set_frequency(44);
mboard_savestate_register();
}
diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c
index b40451c5b1e..50611f353c0 100644
--- a/src/mess/drivers/h19.c
+++ b/src/mess/drivers/h19.c
@@ -73,7 +73,7 @@ public:
TIMER_CALLBACK_MEMBER(h19_state::h19_beepoff)
{
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
}
READ8_MEMBER( h19_state::h19_80_r )
@@ -99,7 +99,7 @@ WRITE8_MEMBER( h19_state::h19_c0_w )
offset 20-3F = terminal bell */
UINT8 length = (offset & 0x20) ? 200 : 4;
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
machine().scheduler().timer_set(attotime::from_msec(length), timer_expired_delegate(FUNC(h19_state::h19_beepoff),this));
}
@@ -291,7 +291,7 @@ INPUT_PORTS_END
void h19_state::machine_reset()
{
- beep_set_frequency(m_beep, H19_BEEP_FRQ);
+ m_beep->set_frequency(H19_BEEP_FRQ);
}
void h19_state::video_start()
diff --git a/src/mess/drivers/h8.c b/src/mess/drivers/h8.c
index a000edd8be5..4d5b3673e02 100644
--- a/src/mess/drivers/h8.c
+++ b/src/mess/drivers/h8.c
@@ -102,7 +102,7 @@ WRITE8_MEMBER( h8_state::h8_f0_w )
if (m_digit) output_set_digit_value(m_digit, m_segment);
output_set_value("mon_led",(data & 0x20) ? 0 : 1);
- beep_set_state(m_beep, (data & 0x80) ? 0 : 1);
+ m_beep->set_state((data & 0x80) ? 0 : 1);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
m_irq_ctl &= 0xf0;
@@ -167,7 +167,7 @@ INPUT_PORTS_END
void h8_state::machine_reset()
{
- beep_set_frequency(m_beep, H8_BEEP_FRQ);
+ m_beep->set_frequency(H8_BEEP_FRQ);
output_set_value("pwr_led", 0);
m_irq_ctl = 1;
}
diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c
index 9c0c1af6845..bd8399d17c2 100644
--- a/src/mess/drivers/jr100.c
+++ b/src/mess/drivers/jr100.c
@@ -68,7 +68,7 @@ public:
protected:
required_device<via6522_device> m_via;
required_device<cassette_image_device> m_cassette;
- required_device<device_t> m_beeper;
+ required_device<beep_device> m_beeper;
required_device<device_t> m_speaker;
required_memory_region m_region_maincpu;
required_ioport m_line0;
@@ -94,7 +94,7 @@ WRITE8_MEMBER(jr100_state::jr100_via_w)
m_beep_en = ((data & 0xe0) == 0xe0);
if(!m_beep_en)
- beep_set_state(m_beeper,0);
+ m_beeper->set_state(0);
}
/* T1L-L */
@@ -113,8 +113,8 @@ WRITE8_MEMBER(jr100_state::jr100_via_w)
/* writing here actually enables the beeper, if above masking condition is satisfied */
if(m_beep_en)
{
- beep_set_state(m_beeper,1);
- beep_set_frequency(m_beeper,894886.25 / (double)(m_t1latch) / 2.0);
+ m_beeper->set_state(1);
+ m_beeper->set_frequency(894886.25 / (double)(m_t1latch) / 2.0);
}
}
m_via->write(space,offset,data);
@@ -198,8 +198,8 @@ INPUT_PORTS_END
void jr100_state::machine_start()
{
- beep_set_frequency(m_beeper,0);
- beep_set_state(m_beeper,0);
+ m_beeper->set_frequency(0);
+ m_beeper->set_state(0);
}
void jr100_state::machine_reset()
diff --git a/src/mess/drivers/jr200.c b/src/mess/drivers/jr200.c
index 3b2dc29fc48..8c24b090beb 100644
--- a/src/mess/drivers/jr200.c
+++ b/src/mess/drivers/jr200.c
@@ -73,7 +73,7 @@ public:
protected:
required_device<cpu_device> m_maincpu;
- required_device<device_t> m_beeper;
+ required_device<beep_device> m_beeper;
required_memory_region m_pcg;
required_memory_region m_gfx_rom;
required_memory_region m_gfx_ram;
@@ -297,7 +297,7 @@ READ8_MEMBER(jr200_state::mcu_keyb_r)
WRITE8_MEMBER(jr200_state::jr200_beep_w)
{
/* writing 0x0e enables the beeper, writing anything else disables it */
- beep_set_state(m_beeper,((data & 0xf) == 0x0e) ? 1 : 0);
+ m_beeper->set_state(((data & 0xf) == 0x0e) ? 1 : 0);
}
WRITE8_MEMBER(jr200_state::jr200_beep_freq_w)
@@ -308,7 +308,7 @@ WRITE8_MEMBER(jr200_state::jr200_beep_freq_w)
beep_freq = ((m_freq_reg[0]<<8) | (m_freq_reg[1] & 0xff)) + 1;
- beep_set_frequency(m_beeper,84000 / beep_freq);
+ m_beeper->set_frequency(84000 / beep_freq);
}
WRITE8_MEMBER(jr200_state::jr200_border_col_w)
@@ -516,8 +516,8 @@ GFXDECODE_END
void jr200_state::machine_start()
{
- beep_set_frequency(m_beeper,0);
- beep_set_state(m_beeper,0);
+ m_beeper->set_frequency(0);
+ m_beeper->set_state(0);
m_timer_d = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(jr200_state::timer_d_callback),this));
}
diff --git a/src/mess/drivers/lx800.c b/src/mess/drivers/lx800.c
index 7590e09246a..162f9d154d1 100644
--- a/src/mess/drivers/lx800.c
+++ b/src/mess/drivers/lx800.c
@@ -108,7 +108,7 @@ WRITE8_MEMBER( lx800_state::lx800_portc_w )
logerror("--> err: %d, ack: %d, fire: %d, buzzer: %d\n", BIT(data, 4), BIT(data, 5), BIT(data, 6), BIT(data, 7));
output_set_value("online_led", !BIT(data, 2));
- beep_set_state(m_beep, !BIT(data, 7));
+ m_beep->set_state(!BIT(data, 7));
}
@@ -146,8 +146,8 @@ WRITE_LINE_MEMBER( lx800_state::lx800_reset_w )
void lx800_state::machine_start()
{
- beep_set_state(m_beep, 0);
- beep_set_frequency(m_beep, 4000); /* ? */
+ m_beep->set_state(0);
+ m_beep->set_frequency(4000); /* ? */
}
diff --git a/src/mess/drivers/mephisto.c b/src/mess/drivers/mephisto.c
index ad320f82e3a..947bd9ef743 100644
--- a/src/mess/drivers/mephisto.c
+++ b/src/mess/drivers/mephisto.c
@@ -393,20 +393,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(mephisto_state::update_nmi)
m_allowNMI = 0;
m_maincpu->set_input_line(INPUT_LINE_NMI,PULSE_LINE);
}
- beep_set_state(m_beep, m_led_status&64?1:0);
+ m_beep->set_state(m_led_status&64?1:0);
}
TIMER_DEVICE_CALLBACK_MEMBER(mephisto_state::update_nmi_r5)
{
m_maincpu->set_input_line(INPUT_LINE_NMI,PULSE_LINE);
- beep_set_state(m_beep, m_led_status&64?1:0);
+ m_beep->set_state(m_led_status&64?1:0);
}
TIMER_DEVICE_CALLBACK_MEMBER(mephisto_state::update_irq)//only mm2
{
m_maincpu->set_input_line(M65C02_IRQ_LINE, HOLD_LINE);
- beep_set_state(m_beep, m_led_status&64?1:0);
+ m_beep->set_state(m_led_status&64?1:0);
}
void mephisto_state::machine_start()
diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c
index 2661acd67a1..7a0f11534b4 100644
--- a/src/mess/drivers/micronic.c
+++ b/src/mess/drivers/micronic.c
@@ -157,8 +157,8 @@ WRITE8_MEMBER( micronic_state::beep_w )
500, 444, 400, 364, 333, 308, 286, 267
};
- beep_set_frequency(m_beep, frequency[data & 0x0f]);
- beep_set_state(m_beep, (data & 0x0f) ? 1 : 0);
+ m_beep->set_frequency(frequency[data & 0x0f]);
+ m_beep->set_state((data & 0x0f) ? 1 : 0);
}
READ8_MEMBER( micronic_state::irq_flag_r )
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index ce5d9a94ffa..ef9650b9269 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -243,7 +243,10 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO)
m_lcdc->write(space, BIT(data,0), lcd_char);
}
- if (BIT(data,2) || BIT(data,3)) beep_set_state(machine().device("beep"),1); else beep_set_state(machine().device("beep"),0);
+ if (BIT(data,2) || BIT(data,3))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
if (BIT(data,7) && BIT(data, 4)) {
for (i = 0;i < 8;i++)
@@ -408,9 +411,12 @@ WRITE8_MEMBER(polgar_state::milano_write_LED)
WRITE8_MEMBER(polgar_state::megaiv_write_LED)
{
-if (BIT(data,7)) beep_set_state(machine().device("beep"),1); else beep_set_state(machine().device("beep"),0);
-output_set_led_value(102,BIT(data,1)?1:0);
-output_set_led_value(107,BIT(data,6)?1:0);
+ if (BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
+ output_set_led_value(102,BIT(data,1)?1:0);
+ output_set_led_value(107,BIT(data,6)?1:0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
logerror("LED mask %d\n",data);
@@ -468,8 +474,14 @@ if ((data & 0xa1) == 0xa1) {
found = 1;
}
-if (BIT(data,7)) beep_set_state(machine().device("beep"),1); else beep_set_state(machine().device("beep"),0);
-if (BIT(data,1)) beep_set_state(machine().device("beep"),1); else beep_set_state(machine().device("beep"),0);
+if (BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+else
+ machine().device<beep_device>("beep")->set_state(0);
+if (BIT(data,1))
+ machine().device<beep_device>("beep")->set_state(1);
+else
+ machine().device<beep_device>("beep")->set_state(0);
// logerror("LEDs FUNC = %02x found = %d\n",data,found);
if (!found) {
logerror("unknown LED mask %d\n",data);
@@ -711,7 +723,10 @@ READ32_MEMBER(polgar_state::read_keys_BPL32)
WRITE8_MEMBER(polgar_state::beep_academy)
{
- if (!BIT(data,7)) beep_set_state(machine().device("beep"),1); else beep_set_state(machine().device("beep"),0);
+ if (!BIT(data,7))
+ machine().device<beep_device>("beep")->set_state(1);
+ else
+ machine().device<beep_device>("beep")->set_state(0);
}
WRITE8_MEMBER(polgar_state::megaiv_IO)
@@ -863,7 +878,7 @@ 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");
- device_t *speaker = space.machine().device("beep");
+ beep_device *speaker = machine().device<beep_device>("beep");
if (BIT(data,5) && BIT(data,4)) {
if (BIT(data,1)) {
@@ -888,7 +903,10 @@ 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)) beep_set_state(speaker,1); else beep_set_state(speaker,0);
+ if (BIT(data,2) || BIT(data,3))
+ speaker->set_state(1);
+ else
+ speaker->set_state(0);
}
}
diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c
index 9279cea9931..fd747614b4e 100644
--- a/src/mess/drivers/multi8.c
+++ b/src/mess/drivers/multi8.c
@@ -629,7 +629,7 @@ static I8255_INTERFACE( ppi8255_intf_0 )
WRITE8_MEMBER( multi8_state::ym2203_porta_w )
{
- beep_set_state(m_beep, (data & 0x08));
+ m_beep->set_state((data & 0x08));
}
static const ym2203_interface ym2203_config =
@@ -655,8 +655,8 @@ void multi8_state::machine_start()
void multi8_state::machine_reset()
{
- beep_set_frequency(machine().device(BEEPER_TAG),1200); //guesswork
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200); //guesswork
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_mcu_init = 0;
}
diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c
index bd2dcfee203..c1f7edad992 100644
--- a/src/mess/drivers/mz2000.c
+++ b/src/mess/drivers/mz2000.c
@@ -120,7 +120,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<device_t> m_mb8877a;
required_device<device_t> m_pit8253;
- required_device<device_t> m_beeper;
+ required_device<beep_device> m_beeper;
required_memory_region m_region_tvram;
required_memory_region m_region_gvram;
required_memory_region m_region_chargen;
@@ -555,8 +555,8 @@ void mz2000_state::machine_reset()
m_tvram_enable = 0;
m_gvram_enable = 0;
- beep_set_frequency(m_beeper,4096);
- beep_set_state(m_beeper,0);
+ m_beeper->set_frequency(4096);
+ m_beeper->set_state(0);
m_color_mode = m_io_config->read() & 1;
m_has_fdc = (m_io_config->read() & 2) >> 1;
@@ -732,7 +732,7 @@ WRITE8_MEMBER(mz2000_state::mz2000_portc_w)
m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
}
- beep_set_state(m_beeper,data & 0x04);
+ m_beeper->set_state(data & 0x04);
m_old_portc = data;
}
diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c
index 1a45b1265f3..a457f3d0f7a 100644
--- a/src/mess/drivers/mz2500.c
+++ b/src/mess/drivers/mz2500.c
@@ -1806,8 +1806,8 @@ void mz2500_state::machine_reset()
m_cg_clear_flag = 0;
- beep_set_frequency(machine().device(BEEPER_TAG),4096);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(4096);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
// m_monitor_type = machine().root_device().ioport("DSW1")->read() & 0x40 ? 1 : 0;
}
@@ -1921,7 +1921,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_portc_w)
m_old_portc = data;
- beep_set_state(machine().device(BEEPER_TAG),data & 0x04);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x04);
m_screen_enable = data & 1;
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index e222e06132e..bd380977d39 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -672,15 +672,15 @@ static void nc_sound_update(running_machine &machine, int channel)
int on;
int frequency;
int period;
- const char *beep_device = NULL;
+ const char *beeper_device = NULL;
switch(channel)
{
case 0:
- beep_device = "beep.1";
+ beeper_device = "beep.1";
break;
case 1:
- beep_device = "beep.2";
+ beeper_device = "beep.2";
break;
}
@@ -693,9 +693,9 @@ static void nc_sound_update(running_machine &machine, int channel)
frequency = (int)(1000000.0f/((float)((period & 0x07fff)<<1) * 1.6276f));
/* set state */
- beep_set_state(machine.device(beep_device), on);
+ machine.device<beep_device>(beeper_device)->set_state(on);
/* set frequency */
- beep_set_frequency(machine.device(beep_device), frequency);
+ machine.device<beep_device>(beeper_device)->set_frequency(frequency);
}
WRITE8_MEMBER(nc_state::nc_sound_w)
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index 9de6d4cfa6e..9c9a177f931 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -339,12 +339,12 @@ WRITE8_MEMBER( c1p_state::osi630_ctrl_w )
*/
- beep_set_state(m_beep, BIT(data, 1));
+ m_beep->set_state(BIT(data, 1));
}
WRITE8_MEMBER( c1p_state::osi630_sound_w )
{
- if (data) beep_set_frequency(m_beep, 49152 / data);
+ if (data) m_beep->set_frequency(49152 / data);
}
/* Disk Drive */
@@ -933,9 +933,9 @@ ROM_END
TIMER_CALLBACK_MEMBER(sb2m600_state::setup_beep)
{
- device_t *speaker = machine().device(BEEPER_TAG);
- beep_set_state(speaker, 0);
- beep_set_frequency(speaker, 300);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
+ speaker->set_state(0);
+ speaker->set_frequency(300);
}
DRIVER_INIT_MEMBER(c1p_state,c1p)
diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c
index 64c7776a8c5..19abf0394c6 100644
--- a/src/mess/drivers/pb1000.c
+++ b/src/mess/drivers/pb1000.c
@@ -443,7 +443,7 @@ static UINT8 pb2000c_port_r(hd61700_cpu_device &device)
static void port_w(hd61700_cpu_device &device, UINT8 data)
{
- beep_set_state(device.machine().device(BEEPER_TAG), (BIT(data,7) ^ BIT(data,6)));
+ device.machine().device<beep_device>(BEEPER_TAG)->set_state((BIT(data,7) ^ BIT(data,6)));
//printf("%x\n", data);
}
diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c
index 5c1ac88d5e8..d72db317e1e 100644
--- a/src/mess/drivers/pc100.c
+++ b/src/mess/drivers/pc100.c
@@ -217,7 +217,7 @@ WRITE8_MEMBER( pc100_state::pc100_output_w )
if(offset == 0)
{
m_timer_mode = (data & 0x18) >> 3;
- beep_set_state(machine().device(BEEPER_TAG),((data & 0x40) >> 6) ^ 1);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(((data & 0x40) >> 6) ^ 1);
printf("%02x\n",data & 0xc0);
}
}
@@ -427,8 +427,8 @@ void pc100_state::machine_start()
void pc100_state::machine_reset()
{
- beep_set_frequency(machine().device(BEEPER_TAG),2400);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
}
INTERRUPT_GEN_MEMBER(pc100_state::pc100_vblank_irq)
diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c
index 617f99a0903..c57df8afded 100644
--- a/src/mess/drivers/pc2000.c
+++ b/src/mess/drivers/pc2000.c
@@ -122,7 +122,7 @@ READ8_MEMBER( pc2000_state::beep_r )
WRITE8_MEMBER( pc2000_state::beep_w )
{
- beep_set_state(m_beep, BIT(data, 3));
+ m_beep->set_state(BIT(data, 3));
m_beep_state = data;
}
diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c
index 78ce2fe295e..f6f8299f32b 100644
--- a/src/mess/drivers/pc4.c
+++ b/src/mess/drivers/pc4.c
@@ -52,7 +52,7 @@ WRITE8_MEMBER( pc4_state::bank_w )
WRITE8_MEMBER( pc4_state::beep_w )
{
- beep_set_state(m_beep, data&0x40);
+ m_beep->set_state(data&0x40);
}
static ADDRESS_MAP_START(pc4_mem, AS_PROGRAM, 8, pc4_state)
diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c
index 5795fec1bf9..3bc7ca4ee3e 100644
--- a/src/mess/drivers/pc8801.c
+++ b/src/mess/drivers/pc8801.c
@@ -1184,10 +1184,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))
- beep_set_state(machine().device(BEEPER_TAG),1);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(1);
if(((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00))
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
if((m_device_ctrl_data & 0x40) != (data & 0x40))
{
@@ -1214,7 +1214,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)
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_device_ctrl_data = data;
}
@@ -2475,8 +2475,8 @@ void pc8801_state::machine_reset()
m_crtc.status = 0;
}
- beep_set_frequency(machine().device(BEEPER_TAG),2400);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
#ifdef USE_PROPER_I8214
{
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index bd81ac89c85..9b7c8053807 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -3109,7 +3109,7 @@ READ8_MEMBER(pc9801_state::ppi_prn_portb_r){ return machine().root_device().iopo
WRITE8_MEMBER(pc9801_state::ppi_sys_portc_w)
{
- beep_set_state(machine().device(BEEPER_TAG),!(data & 0x08));
+ machine().device<beep_device>(BEEPER_TAG)->set_state(!(data & 0x08));
}
static I8255A_INTERFACE( ppi_system_intf )
@@ -3426,8 +3426,8 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801_common)
m_tvram[(0x3fe0)+i*2] = default_memsw_data[i];
}
- beep_set_frequency(machine().device(BEEPER_TAG),2400);
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
m_nmi_ff = 0;
m_mouse.control = 0xff;
diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c
index bfbd3204b21..c68034158da 100644
--- a/src/mess/drivers/pce220.c
+++ b/src/mess/drivers/pce220.c
@@ -376,7 +376,7 @@ READ8_MEMBER( pce220_state::port18_r )
WRITE8_MEMBER( pce220_state::port18_w )
{
- beep_set_state(m_beep, BIT(data, 7));
+ m_beep->set_state(BIT(data, 7));
m_serial->out_busy(BIT(data, 0));
m_serial->out_dout(BIT(data, 1));
diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c
index 545d1dcc983..c695de298b3 100644
--- a/src/mess/drivers/pcw.c
+++ b/src/mess/drivers/pcw.c
@@ -407,7 +407,7 @@ 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");
- device_t *speaker = machine().device(BEEPER_TAG);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
LOG(("SYSTEM CONTROL: %d\n",data));
switch (data)
@@ -545,14 +545,14 @@ WRITE8_MEMBER(pcw_state::pcw_system_control_w)
/* beep on */
case 11:
{
- beep_set_state(speaker,1);
+ speaker->set_state(1);
}
break;
/* beep off */
case 12:
{
- beep_set_state(speaker,0);
+ speaker->set_state(0);
}
break;
@@ -996,9 +996,9 @@ ADDRESS_MAP_END
TIMER_CALLBACK_MEMBER(pcw_state::setup_beep)
{
- device_t *speaker = machine().device(BEEPER_TAG);
- beep_set_state(speaker, 0);
- beep_set_frequency(speaker, 3750);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
+ speaker->set_state(0);
+ speaker->set_frequency(3750);
}
diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c
index 60441620df0..3b18e01c9ba 100644
--- a/src/mess/drivers/pcw16.c
+++ b/src/mess/drivers/pcw16.c
@@ -842,14 +842,14 @@ WRITE8_MEMBER(pcw16_state::pcw16_system_control_w)
/* bleeper on */
case 0x0b:
{
- beep_set_state(m_speaker,1);
+ m_speaker->set_state(1);
}
break;
/* bleeper off */
case 0x0c:
{
- beep_set_state(m_speaker,0);
+ m_speaker->set_state(0);
}
break;
@@ -1005,7 +1005,7 @@ void pcw16_state::machine_reset()
void pcw16_state::machine_start()
{
- device_t *speaker = machine().device(BEEPER_TAG);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
m_system_status = 0;
m_interrupt_counter = 0;
@@ -1015,8 +1015,8 @@ void pcw16_state::machine_start()
at_keyboard_init(machine(), AT_KEYBOARD_TYPE_AT);
at_keyboard_set_scan_code_set(3);
- beep_set_state(speaker,0);
- beep_set_frequency(speaker,3750);
+ speaker->set_state(0);
+ speaker->set_frequency(3750);
}
static INPUT_PORTS_START(pcw16)
diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c
index b93900265a7..9d05002f009 100644
--- a/src/mess/drivers/psion.c
+++ b/src/mess/drivers/psion.c
@@ -153,10 +153,10 @@ void psion_state::io_rw(address_space &space, UINT16 offset)
m_kb_counter = 0;
break;
case 0x180:
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
break;
case 0x1c0:
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
break;
case 0x240:
if (offset == 0x260 && (m_rom_bank_count || m_ram_bank_count))
diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c
index 78a46e33f72..ca80675a11a 100644
--- a/src/mess/drivers/rex6000.c
+++ b/src/mess/drivers/rex6000.c
@@ -233,16 +233,16 @@ WRITE8_MEMBER( rex6000_state::beep_w )
case 1: //tone mode control
if (m_beep_mode)
{
- beep_set_state(m_beep, BIT(data, 0));
+ m_beep->set_state(BIT(data, 0));
//the beeper frequency is update only if the bit 1 is set
if (BIT(data, 1))
- beep_set_frequency(m_beep, 16384 / (((m_beep_io[2] | (m_beep_io[3]<<8)) & 0x0fff) + 2));
+ m_beep->set_frequency(16384 / (((m_beep_io[2] | (m_beep_io[3]<<8)) & 0x0fff) + 2));
}
break;
case 4: //select alarm/tone mode
if (m_beep_mode != BIT(data, 0))
- beep_set_state(m_beep, 0); //turned off when mode changes
+ m_beep->set_state(0); //turned off when mode changes
m_beep_mode = BIT(data, 0);
break;
diff --git a/src/mess/drivers/sc2.c b/src/mess/drivers/sc2.c
index b27c2f7c8b9..338c780f639 100644
--- a/src/mess/drivers/sc2.c
+++ b/src/mess/drivers/sc2.c
@@ -45,7 +45,7 @@ READ8_MEMBER( sc2_state::sc2_beep )
{
m_beep_state = ~m_beep_state;
- beep_set_state(m_beep, m_beep_state);
+ m_beep->set_state(m_beep_state);
}
return 0xff;
diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c
index 56c3391f9b9..901ffb414f6 100644
--- a/src/mess/drivers/smc777.c
+++ b/src/mess/drivers/smc777.c
@@ -528,7 +528,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: beep_set_state(machine().device(BEEPER_TAG),data & 0x10); break;
+ case 0x05: machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10); break;
default: printf("System FF W %02x\n",data); break;
}
}
@@ -990,8 +990,8 @@ void smc777_state::machine_reset()
m_raminh_prefetch = 0xff;
m_pal_mode = 0x10;
- beep_set_frequency(machine().device(BEEPER_TAG),300); //TODO: correct frequency
- beep_set_state(machine().device(BEEPER_TAG),0);
+ machine().device<beep_device>(BEEPER_TAG)->set_frequency(300); //TODO: correct frequency
+ machine().device<beep_device>(BEEPER_TAG)->set_state(0);
}
diff --git a/src/mess/drivers/studio2.c b/src/mess/drivers/studio2.c
index a93344c2e54..5e74e6066ae 100644
--- a/src/mess/drivers/studio2.c
+++ b/src/mess/drivers/studio2.c
@@ -446,7 +446,7 @@ READ_LINE_MEMBER( studio2_state::ef4_r )
WRITE_LINE_MEMBER( studio2_state::q_w )
{
- beep_set_state(m_speaker, state);
+ m_speaker->set_state(state);
}
static COSMAC_INTERFACE( studio2_cosmac_intf )
@@ -629,9 +629,9 @@ ROM_END
TIMER_CALLBACK_MEMBER(studio2_state::setup_beep)
{
- device_t *speaker = machine().device(BEEPER_TAG);
- beep_set_state(speaker, 0);
- beep_set_frequency(speaker, 300);
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
+ speaker->set_state(0);
+ speaker->set_frequency(300);
}
DRIVER_INIT_MEMBER(studio2_state,studio2)
diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c
index 9a7914a46dd..ff3a722999a 100644
--- a/src/mess/drivers/supercon.c
+++ b/src/mess/drivers/supercon.c
@@ -566,11 +566,11 @@ WRITE8_MEMBER( supercon_state::supercon_port4_w )
if ( m_data_1F00 & 0x80 )
{
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
m_emu_started=TRUE;
}
else
- beep_set_state(m_beep ,0);
+ m_beep->set_state(0);
}
TIMER_CALLBACK_MEMBER(supercon_state::mouse_click)
diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c
index 6e0099b72a9..2fd39d88c4f 100644
--- a/src/mess/drivers/tmc1800.c
+++ b/src/mess/drivers/tmc1800.c
@@ -112,6 +112,7 @@ Notes:
*/
#include "includes/tmc1800.h"
+#include "sound/beep.h"
/* Read/Write Handlers */
@@ -907,9 +908,9 @@ ROM_END
TIMER_CALLBACK_MEMBER(tmc1800_state::setup_beep)
{
- device_t *speaker = machine().device(BEEPER_TAG);
- beep_set_state(speaker, 0);
- beep_set_frequency( speaker, 0 );
+ beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
+ speaker->set_state(0);
+ speaker->set_frequency(0);
}
DRIVER_INIT_MEMBER(tmc1800_state,tmc1800)
diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c
index af3c629a7e9..00eadb2381a 100644
--- a/src/mess/drivers/vk100.c
+++ b/src/mess/drivers/vk100.c
@@ -500,7 +500,7 @@ WRITE8_MEMBER(vk100_state::KBDW)
#ifdef LED_VERBOSE
if (BIT(data, 6)) logerror("kb keyclick bit 6 set: not emulated yet (multivibrator)!\n");
#endif
- beep_set_state( m_speaker, BIT(data, 7));
+ m_speaker->set_state(BIT(data, 7));
#ifdef LED_VERBOSE
logerror("LED state: %02X: %s %s %s %s %s %s\n", data&0xFF, (data&0x20)?"------- LOCAL ":"ON LINE ----- ", (data&0x10)?"--------- ":"NO SCROLL ", (data&0x8)?"----- ":"BASIC ", (data&0x4)?"--------- ":"HARD-COPY ", (data&0x2)?"-- ":"L1 ", (data&0x1)?"-- ":"L2 ");
#endif
@@ -865,7 +865,7 @@ INPUT_PORTS_END
void vk100_state::machine_start()
{
- beep_set_frequency( m_speaker, 116 ); //116 hz (page 172 of TM), but duty cycle is wrong here!
+ m_speaker->set_frequency(116); //116 hz (page 172 of TM), but duty cycle is wrong here!
output_set_value("online_led",1);
output_set_value("local_led", 0);
output_set_value("noscroll_led",1);
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index d3aa2e72060..25f70c63cba 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -145,7 +145,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(vt100_state::keyboard_callback)
WRITE8_MEMBER( vt100_state::vt100_keyboard_w )
{
- beep_set_frequency( m_speaker, 786 ); // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
+ m_speaker->set_frequency(786); // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
output_set_value("online_led",BIT(data, 5) ? 0 : 1);
output_set_value("local_led", BIT(data, 5));
output_set_value("locked_led",BIT(data, 4) ? 0 : 1);
@@ -154,7 +154,7 @@ WRITE8_MEMBER( vt100_state::vt100_keyboard_w )
output_set_value("l3_led", BIT(data, 1) ? 0 : 1);
output_set_value("l4_led", BIT(data, 0) ? 0 : 1);
m_key_scan = BIT(data, 6);
- beep_set_state( m_speaker, BIT(data, 7));
+ m_speaker->set_state(BIT(data, 7));
}
READ8_MEMBER( vt100_state::vt100_keyboard_r )
@@ -353,7 +353,7 @@ void vt100_state::machine_reset()
m_keyboard_int = 0;
m_receiver_int = 0;
m_vertical_int = 0;
- beep_set_frequency( m_speaker, 786 ); // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
+ m_speaker->set_frequency(786); // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
output_set_value("online_led",1);
output_set_value("local_led", 0);
output_set_value("locked_led",1);
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index 233fee70281..7ff4c40ae34 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1185,13 +1185,13 @@ WRITE8_MEMBER( x07_state::x07_io_w )
#if(1)
if((data & 0x0e) == 0x0e)
{
- beep_set_state(m_beep, 1);
- beep_set_frequency(m_beep, 192000 / ((m_regs_w[2] | (m_regs_w[3] << 8)) & 0x0fff));
+ m_beep->set_state(1);
+ m_beep->set_frequency(192000 / ((m_regs_w[2] | (m_regs_w[3] << 8)) & 0x0fff));
m_beep_stop->adjust(attotime::from_msec(m_ram->pointer()[0x450] * 0x20));
}
else
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
#endif
break;
@@ -1374,7 +1374,7 @@ TIMER_CALLBACK_MEMBER(x07_state::rstb_clear)
TIMER_CALLBACK_MEMBER(x07_state::beep_stop)
{
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
}
static const gfx_layout x07_charlayout =
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 111ee169fc8..d35b1ed758b 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -199,7 +199,7 @@ INPUT_PORTS_END
TIMER_CALLBACK_MEMBER( bigboard_state::bigboard_beepoff )
{
- beep_set_state(m_beeper, 0);
+ m_beeper->set_state(0);
}
/* Z80 PIO */
@@ -291,7 +291,7 @@ WRITE8_MEMBER( bigboard_state::kbpio_pa_w )
if (BIT(data, 5) & (!m_bit5))
{
machine().scheduler().timer_set(attotime::from_msec(40), timer_expired_delegate(FUNC(bigboard_state::bigboard_beepoff),this));
- beep_set_state(m_beeper, 1);
+ m_beeper->set_state(1);
}
m_bit5 = BIT(data, 5);
}
@@ -599,8 +599,8 @@ void bigboard_state::machine_reset()
bankswitch(1);
/* bigboard has a one-pulse output to drive a user-supplied beeper */
- beep_set_state(m_beeper, 0);
- beep_set_frequency(m_beeper, 950);
+ m_beeper->set_state(0);
+ m_beeper->set_frequency(950);
m_fdc->reset();
}
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index 97256692552..2984b7817d2 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -129,7 +129,7 @@ static Z80PIO_INTERFACE( pio2_intf ) // keyboard PIO
//Bits0,1 not connected; 2,3,4,5 go to a connector; 6 goes to 'graphics' LED; 7 goes to speaker.
WRITE8_MEMBER( z9001_state::port88_w )
{
- beep_set_state(m_beeper, BIT(data, 7));
+ m_beeper->set_state(BIT(data, 7));
}
WRITE_LINE_MEMBER( z9001_state::cass_w )
@@ -150,7 +150,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(z9001_state::timer_callback)
void z9001_state::machine_reset()
{
- beep_set_frequency(m_beeper, 800);
+ m_beeper->set_frequency(800);
m_maincpu->set_state_int(Z80_PC, 0xf000);
}
diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c
index 1d7bcbfe1dc..d990b78026a 100644
--- a/src/mess/drivers/zrt80.c
+++ b/src/mess/drivers/zrt80.c
@@ -58,19 +58,19 @@ READ8_MEMBER( zrt80_state::zrt80_10_r )
TIMER_CALLBACK_MEMBER(zrt80_state::zrt80_beepoff)
{
- beep_set_state(m_beep, 0);
+ m_beep->set_state(0);
}
WRITE8_MEMBER(zrt80_state::zrt80_30_w)
{
machine().scheduler().timer_set(attotime::from_msec(100), timer_expired_delegate(FUNC(zrt80_state::zrt80_beepoff),this));
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
}
WRITE8_MEMBER(zrt80_state::zrt80_38_w)
{
machine().scheduler().timer_set(attotime::from_msec(400), timer_expired_delegate(FUNC(zrt80_state::zrt80_beepoff),this));
- beep_set_state(m_beep, 1);
+ m_beep->set_state(1);
}
static ADDRESS_MAP_START(zrt80_mem, AS_PROGRAM, 8, zrt80_state)
@@ -181,7 +181,7 @@ INPUT_PORTS_END
void zrt80_state::machine_reset()
{
- beep_set_frequency(m_beep, 800);
+ m_beep->set_frequency(800);
m_term_data = 0;
}