From 34d70fd00bcbe1f44f0f4444eccb600810e0de20 Mon Sep 17 00:00:00 2001 From: hap Date: Sat, 24 Dec 2022 18:57:08 +0100 Subject: [PATCH] tceptor: correct audiocpu type --- src/mame/namco/tceptor.cpp | 15 ++++++++------- src/mame/namco/tceptor.h | 34 +++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/mame/namco/tceptor.cpp b/src/mame/namco/tceptor.cpp index e08c062ee8e..cdbc4b9dced 100644 --- a/src/mame/namco/tceptor.cpp +++ b/src/mame/namco/tceptor.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "tceptor.h" +#include "cpu/m6502/r65c02.h" #include "cpu/m6809/m6809.h" #include "cpu/m6800/m6801.h" #include "cpu/m68000/m68000.h" @@ -317,10 +318,10 @@ void tceptor_state::tceptor(machine_config &config) MC6809E(config, m_maincpu, XTAL(49'152'000)/32); m_maincpu->set_addrmap(AS_PROGRAM, &tceptor_state::m6809_map); - M65C02(config, m_audiocpu[0], XTAL(49'152'000)/24); + R65C02(config, m_audiocpu[0], XTAL(49'152'000)/24); m_audiocpu[0]->set_addrmap(AS_PROGRAM, &tceptor_state::m6502_a_map); - M65C02(config, m_audiocpu[1], XTAL(49'152'000)/24); + R65C02(config, m_audiocpu[1], XTAL(49'152'000)/24); m_audiocpu[1]->set_addrmap(AS_PROGRAM, &tceptor_state::m6502_b_map); M68000(config, m_subcpu, XTAL(49'152'000)/4); @@ -333,7 +334,7 @@ void tceptor_state::tceptor(machine_config &config) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - adc0809_device &adc(ADC0809(config, "adc", 1000000)); // unknown clock (needs to >640khz or the wait loop is too fast) + adc0809_device &adc(ADC0809(config, "adc", 768000)); // unknown clock adc.in_callback<0>().set_constant(0); // unknown adc.in_callback<1>().set_ioport("PEDAL"); adc.in_callback<2>().set_ioport("STICKX"); @@ -384,10 +385,10 @@ ROM_START( tceptor ) ROM_REGION( 0x10000, "maincpu", 0 ) // 68A09EP ROM_LOAD( "tc1-1.10f", 0x08000, 0x08000, CRC(4c6b063e) SHA1(d9701657186f8051391084f51a720037f9f418b1) ) - ROM_REGION( 0x10000, "audiocpu1", 0 ) // RC65C02 + ROM_REGION( 0x10000, "audiocpu1", 0 ) // RP65C02 ROM_LOAD( "tc1-21.1m", 0x08000, 0x08000, CRC(2d0b2fa8) SHA1(16ecd70954e52a8661642b15a5cf1db51783e444) ) - ROM_REGION( 0x10000, "audiocpu2", 0 ) // RC65C02 + ROM_REGION( 0x10000, "audiocpu2", 0 ) // RP65C02 ROM_LOAD( "tc1-22.3m", 0x08000, 0x08000, CRC(9f5a3e98) SHA1(2b2ffe39fe647a3039b92721817bddc9e9a92d82) ) ROM_REGION( 0x110000, "sub", 0 ) // MC68000-12 @@ -440,10 +441,10 @@ ROM_START( tceptor2 ) ROM_REGION( 0x10000, "maincpu", 0 ) // 68A09EP ROM_LOAD( "tc2-1.10f", 0x08000, 0x08000, CRC(f953f153) SHA1(f4cd0a133d23b4bf3c24c70c28c4ecf8ad4daf6f) ) - ROM_REGION( 0x10000, "audiocpu1", 0 ) // RC65C02 + ROM_REGION( 0x10000, "audiocpu1", 0 ) // RP65C02 ROM_LOAD( "tc1-21.1m", 0x08000, 0x08000, CRC(2d0b2fa8) SHA1(16ecd70954e52a8661642b15a5cf1db51783e444) ) - ROM_REGION( 0x10000, "audiocpu2", 0 ) // RC65C02 + ROM_REGION( 0x10000, "audiocpu2", 0 ) // RP65C02 ROM_LOAD( "tc1-22.3m", 0x08000, 0x08000, CRC(9f5a3e98) SHA1(2b2ffe39fe647a3039b92721817bddc9e9a92d82) ) ROM_REGION( 0x110000, "sub", 0 ) // MC68000-12 diff --git a/src/mame/namco/tceptor.h b/src/mame/namco/tceptor.h index 744a0e16463..ab56639bd03 100644 --- a/src/mame/namco/tceptor.h +++ b/src/mame/namco/tceptor.h @@ -5,7 +5,6 @@ #pragma once -#include "cpu/m6502/m65c02.h" #include "sound/namco.h" #include "namco_c45road.h" #include "emupal.h" @@ -36,20 +35,34 @@ public: void tceptor(machine_config &config); +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + private: - uint8_t m_m6809_irq_enable = 0; - uint8_t m_m68k_irq_enable = 0; - uint8_t m_mcu_irq_enable = 0; required_device m_maincpu; - required_device_array m_audiocpu; + required_device_array m_audiocpu; required_device m_subcpu; required_device m_mcu; required_device m_cus30; + required_shared_ptr m_tile_ram; required_shared_ptr m_tile_attr; required_shared_ptr m_bg_ram; required_shared_ptr m_m68k_shared_ram; required_shared_ptr m_sprite_ram; + + required_device m_c45_road; + required_device m_screen; + required_device m_gfxdecode; + required_device m_palette; + + output_finder<> m_shutter; + + uint8_t m_m6809_irq_enable = 0; + uint8_t m_m68k_irq_enable = 0; + uint8_t m_mcu_irq_enable = 0; int m_sprite16 = 0; int m_sprite32 = 0; int m_bg = 0; @@ -62,6 +75,7 @@ private: std::unique_ptr m_decoded_16; std::unique_ptr m_decoded_32; int m_is_mask_spr[1024/16]{}; + uint8_t m68k_shared_r(offs_t offset); void m68k_shared_w(offs_t offset, uint8_t data); void m6809_irq_enable_w(uint8_t data); @@ -80,19 +94,9 @@ private: void tceptor2_shutter_w(uint8_t data); void tile_mark_dirty(int offset); - required_device m_c45_road; - required_device m_screen; - required_device m_gfxdecode; - required_device m_palette; - - output_finder<> m_shutter; - TILE_GET_INFO_MEMBER(get_tx_tile_info); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; void tceptor_palette(palette_device &palette); uint32_t screen_update_tceptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_tceptor);