Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix minor duplication (nw)

Browse Source
This commit is contained in:
Olivier Galibert 2018-02-15 09:03:12 +01:00
parent 5386ad7284
commit dfe4205d4b
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,13 +336,13 @@ WRITE8_MEMBER( c1p_state::osi630_ctrl_w )
*/
m_beep->set_state(BIT(data, 1));
m_beeper->set_state(BIT(data, 1));
}
WRITE8_MEMBER( c1p_state::osi630_sound_w )
{
if (data != 0)
m_beep->set_clock(49152 / data);
m_beeper->set_clock(49152 / data);
}
/* Disk Drive */
@ -868,7 +868,7 @@ ROM_END
/* Driver Initialization */
void sb2m600_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
void c1p_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (id)
{

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

@ -42,7 +42,6 @@ public:
, m_io_keyboard(*this, "ROW%u", 0)
, m_io_sound(*this, "Sound")
, m_io_reset(*this, "Reset")
, m_beeper(*this, "beeper")
{ }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -61,15 +60,9 @@ public:
void osi630_video(machine_config &config);
void osi600_mem(address_map &map);
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void machine_start() override;
virtual void video_start() override;
enum
{
TIMER_SETUP_BEEP
};
required_device<cpu_device> m_maincpu;
required_device<acia6850_device> m_acia_0;
required_device<cassette_image_device> m_cassette;
@ -81,7 +74,6 @@ protected:
required_ioport_array<8> m_io_keyboard;
required_ioport m_io_sound;
required_ioport m_io_reset;
optional_device<beep_device> m_beeper;
/* floppy state */
int m_fdc_index;
@ -97,14 +89,20 @@ protected:
class c1p_state : public sb2m600_state
{
public:
enum
{
TIMER_SETUP_BEEP
};
c1p_state(const machine_config &mconfig, device_type type, const char *tag)
: sb2m600_state(mconfig, type, tag)
, m_beep(*this, "beeper")
, m_beeper(*this, "beeper")
{ }
required_device<beep_device> m_beep;
virtual void machine_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
required_device<beep_device> m_beeper;
DECLARE_WRITE8_MEMBER( osi630_ctrl_w );
DECLARE_WRITE8_MEMBER( osi630_sound_w );