diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-04-02 08:49:57 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-04-02 08:49:57 -0400 |
commit | 5e6bd7ce0b66021b6ba088492a57cde81d53b202 (patch) | |
tree | 87b0193237f402c67277a4bf65ba19476a61f0d9 | |
parent | 15427027b35fc955b41ea49c6ec5a061f48ae7ef (diff) |
lockon.cpp, vertigo.cpp: Correct ADC clocks (nw)
Remove "P" from M58990 device name (just designates plastic DIP package)
-rw-r--r-- | src/devices/machine/adc0808.cpp | 8 | ||||
-rw-r--r-- | src/devices/machine/adc0808.h | 6 | ||||
-rw-r--r-- | src/mame/drivers/lockon.cpp | 12 | ||||
-rw-r--r-- | src/mame/drivers/vertigo.cpp | 3 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index a977c05ffb8..3c392c4cc39 100644 --- a/src/devices/machine/adc0808.cpp +++ b/src/devices/machine/adc0808.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ADC0808, adc0808_device, "adc0808", "ADC0808 A/D Converter") DEFINE_DEVICE_TYPE(ADC0809, adc0809_device, "adc0809", "ADC0809 A/D Converter") -DEFINE_DEVICE_TYPE(M58990P, m58990p_device, "m58990p", "M58990P A/D Converter") +DEFINE_DEVICE_TYPE(M58990, m58990_device, "m58990", "M58990 A/D Converter") //************************************************************************** @@ -64,11 +64,11 @@ adc0809_device::adc0809_device(const machine_config &mconfig, const char *tag, d } //------------------------------------------------- -// m58990p_device - constructor +// m58990_device - constructor //------------------------------------------------- -m58990p_device::m58990p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - adc0808_device(mconfig, M58990P, tag, owner, clock) +m58990_device::m58990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + adc0808_device(mconfig, M58990, tag, owner, clock) { } diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index 1e4811037e7..0ee8c60c90b 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -139,16 +139,16 @@ public: adc0809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; -class m58990p_device : public adc0808_device +class m58990_device : public adc0808_device { public: - m58990p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m58990_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; // device type definition DECLARE_DEVICE_TYPE(ADC0808, adc0808_device) DECLARE_DEVICE_TYPE(ADC0809, adc0809_device) -DECLARE_DEVICE_TYPE(M58990P, m58990p_device) +DECLARE_DEVICE_TYPE(M58990, m58990_device) #endif // MAME_DEVICES_MACHINE_ADC0808_H diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 598f0847375..d760af4afae 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -470,16 +470,16 @@ void lockon_state::machine_reset() MACHINE_CONFIG_START(lockon_state::lockon) - MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000) / 2) + MCFG_CPU_ADD("maincpu", V30, 16_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(main_v30) - MCFG_CPU_ADD("ground", V30, XTAL(16'000'000) / 2) + MCFG_CPU_ADD("ground", V30, 16_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(ground_v30) - MCFG_CPU_ADD("object", V30, XTAL(16'000'000) / 2) + MCFG_CPU_ADD("object", V30, 16_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(object_v30) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) + MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) MCFG_CPU_PROGRAM_MAP(sound_prg) MCFG_CPU_IO_MAP(sound_io) @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(lockon_state::lockon) MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(10000, 4700, 10000e-12) * 4096) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_DEVICE_ADD("adc", M58990P, 1000000) // unknown clock (needs to be faster than 640khz for the wait loop) + MCFG_DEVICE_ADD("adc", M58990, 16_MHz_XTAL / 16) MCFG_ADC0808_IN0_CB(IOPORT("ADC_BANK")) MCFG_ADC0808_IN1_CB(IOPORT("ADC_PITCH")) MCFG_ADC0808_IN2_CB(IOPORT("ADC_MISSILE")) @@ -506,7 +506,7 @@ MACHINE_CONFIG_START(lockon_state::lockon) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000) / 4) + MCFG_SOUND_ADD("ymsnd", YM2203, 16_MHz_XTAL / 4) MCFG_YM2203_IRQ_HANDLER(WRITELINE(lockon_state, ym2203_irq)) MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM2203")) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lockon_state, ym2203_out_b)) diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp index f879a290bbf..bac7f540e39 100644 --- a/src/mame/drivers/vertigo.cpp +++ b/src/mame/drivers/vertigo.cpp @@ -131,11 +131,12 @@ MACHINE_CONFIG_START(vertigo_state::vertigo) MCFG_CPU_PROGRAM_MAP(vertigo_map) MCFG_CPU_PERIODIC_INT_DRIVER(vertigo_state, vertigo_interrupt, 60) - MCFG_DEVICE_ADD("adc", ADC0808, 500000) // unknown clock + MCFG_DEVICE_ADD("adc", ADC0808, 24_MHz_XTAL / 30) // E clock from 68000 MCFG_ADC0808_EOC_FF_CB(WRITELINE(vertigo_state, adc_eoc_w)) MCFG_ADC0808_IN0_CB(IOPORT("P1X")) MCFG_ADC0808_IN1_CB(IOPORT("P1Y")) MCFG_ADC0808_IN2_CB(IOPORT("PADDLE")) + // IN3-IN7 tied to Vss exidy440_audio(config); |