summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/mame/drivers/pc8001.cpp18
-rw-r--r--src/mame/includes/pc8001.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 5f913fa1401..031bbf388b4 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -158,7 +158,7 @@ WRITE8_MEMBER( pc8001_state::port40_w )
m_rtc->clk_w(BIT(data, 2));
m_rtc->stb_w(BIT(data, 1));
- m_speaker->level_w(BIT(data, 5));
+ m_beep->set_state(BIT(data, 5));
}
/* Memory Maps */
@@ -475,7 +475,7 @@ void pc8001_state::machine_start()
static MACHINE_CONFIG_START( pc8001, pc8001_state )
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pc8001_mem)
MCFG_CPU_IO_MAP(pc8001_io)
@@ -488,7 +488,7 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -496,14 +496,14 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state )
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_DEVICE_ADD(I8257_TAG, I8257, 4000000)
+ MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL_4MHz)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
- MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, 14318180)
+ MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL_14_31818MHz)
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
@@ -525,7 +525,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state )
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pc8001mk2_mem)
MCFG_CPU_IO_MAP(pc8001mk2_io)
@@ -538,7 +538,7 @@ static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -546,14 +546,14 @@ static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state )
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_DEVICE_ADD(I8257_TAG, I8257, 4000000)
+ MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL_4MHz)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL_32_768kHz, NOOP, NOOP)
- MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, 14318180)
+ MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL_14_31818MHz)
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
MCFG_UPD3301_VRTC_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 76d3bafb529..72a353381bf 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -16,7 +16,7 @@
#include "machine/i8251.h"
#include "machine/ram.h"
#include "machine/upd1990a.h"
-#include "sound/speaker.h"
+#include "sound/beep.h"
#include "video/upd3301.h"
#define Z80_TAG "z80"
@@ -40,7 +40,7 @@ public:
m_cassette(*this, "cassette"),
m_centronics(*this, CENTRONICS_TAG),
m_cent_data_out(*this, "cent_data_out"),
- m_speaker(*this, "speaker"),
+ m_beep(*this, "beeper"),
m_ram(*this, RAM_TAG),
m_rom(*this, Z80_TAG),
m_char_rom(*this, UPD3301_TAG)
@@ -53,7 +53,7 @@ public:
required_device<cassette_image_device> m_cassette;
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
- required_device<speaker_sound_device> m_speaker;
+ required_device<beep_device> m_beep;
required_device<ram_device> m_ram;
required_memory_region m_rom;
required_memory_region m_char_rom;