summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-01-08 13:49:17 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-01-08 13:49:17 -0500
commit33b9a9f6c6a3af28b0e24e803cf3b065bb5cfeee (patch)
tree9859fb967ca6e6718766eec4985e856d06279437
parent752f4cf13ef894df8b726edc290f412e31a99bbf (diff)
crbaloon: Add accurate video timings and watchdog; reduce CPU clock; clean up various things
-rw-r--r--src/mame/drivers/crbaloon.cpp27
-rw-r--r--src/mame/includes/crbaloon.h16
2 files changed, 23 insertions, 20 deletions
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index f2f5a45bde2..2e5fd0c5a26 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -5,10 +5,6 @@
Taito Crazy Balloon hardware
To-Do:
- * Video timing from schematics
- * Watchdog length from schematics
- * Interrupt timing from schematics
- * DIP switches
* Faithfully implement the custom chips
* Coin counter and lock-out
@@ -18,6 +14,7 @@
#include "includes/crbaloon.h"
#include "cpu/z80/z80.h"
+#include "machine/watchdog.h"
#include "screen.h"
@@ -160,6 +157,8 @@ void crbaloon_state::port_sound_w(uint8_t data)
// D0 - interrupt enable - also goes to PC3259 as /HTCTRL
m_irq_mask = data & 0x01;
crbaloon_set_clear_collision_address(BIT(data, 0));
+ if (!m_irq_mask)
+ m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
// D1 - SOUND STOP
machine().sound().system_mute(!BIT(data, 1));
@@ -219,7 +218,7 @@ void crbaloon_state::main_io_map(address_map &map)
map(0x03, 0x03).mirror(0x0c).portr("IN1");
map(0x00, 0x00).nopw(); /* not connected */
- map(0x01, 0x01).nopw(); /* watchdog */
+ map(0x01, 0x01).w("watchdog", FUNC(watchdog_timer_device::reset_w));
map(0x02, 0x04).writeonly().share("spriteram");
map(0x05, 0x05).w(FUNC(crbaloon_state::crbaloon_audio_set_music_freq));
map(0x06, 0x06).w(FUNC(crbaloon_state::port_sound_w));
@@ -352,20 +351,22 @@ void crbaloon_state::machine_reset()
*
*************************************/
-INTERRUPT_GEN_MEMBER(crbaloon_state::vblank_irq)
+WRITE_LINE_MEMBER(crbaloon_state::vbl_int_w)
{
- if(m_irq_mask)
- device.execute().set_input_line(0, HOLD_LINE);
+ if (state && m_irq_mask)
+ m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
}
void crbaloon_state::crbaloon(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, CRBALOON_MASTER_XTAL / 3);
+ Z80(config, m_maincpu, CRBALOON_MASTER_XTAL / 4); // CPU clock based on 1H?
m_maincpu->set_addrmap(AS_PROGRAM, &crbaloon_state::main_map);
m_maincpu->set_addrmap(AS_IO, &crbaloon_state::main_io_map);
- m_maincpu->set_vblank_int("screen", FUNC(crbaloon_state::vblank_irq));
+
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 256);
+ // Reset pulse comes from last stage of 74LS393 (8J) driven by 2VBL
/* video hardware */
GFXDECODE(config, m_gfxdecode, "palette", gfx_crbaloon);
@@ -373,12 +374,10 @@ void crbaloon_state::crbaloon(machine_config &config)
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_video_attributes(VIDEO_ALWAYS_UPDATE);
- screen.set_refresh_hz(60);
- screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
- screen.set_size(32*8, 32*8);
- screen.set_visarea(0*8, 32*8-1, 0*8, 28*8-1);
+ screen.set_raw(CRBALOON_MASTER_XTAL / 2, 320, 0, 256, 262, 0, 224);
screen.set_screen_update(FUNC(crbaloon_state::screen_update_crbaloon));
screen.set_palette("palette");
+ screen.screen_vblank().set(FUNC(crbaloon_state::vbl_int_w));
/* audio hardware */
crbaloon_audio(config);
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index d52a2229761..a3044c8fe5c 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -15,7 +15,7 @@ Crazy Ballooon
#include "emupal.h"
#include "tilemap.h"
-#define CRBALOON_MASTER_XTAL (XTAL(9'987'000))
+constexpr XTAL CRBALOON_MASTER_XTAL = 9.987_MHz_XTAL;
class crbaloon_state : public driver_device
@@ -33,6 +33,14 @@ public:
m_gfxdecode(*this, "gfxdecode")
{ }
+ void crbaloon(machine_config &config);
+ DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r);
+
+protected:
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
+private:
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
required_shared_ptr<uint8_t> m_spriteram;
@@ -51,13 +59,10 @@ public:
void port_sound_w(uint8_t data);
void crbaloon_videoram_w(offs_t offset, uint8_t data);
void crbaloon_colorram_w(offs_t offset, uint8_t data);
- DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- virtual void machine_reset() override;
- virtual void video_start() override;
void crbaloon_palette(palette_device &palette) const;
uint32_t screen_update_crbaloon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- INTERRUPT_GEN_MEMBER(vblank_irq);
+ DECLARE_WRITE_LINE_MEMBER(vbl_int_w);
void crbaloon_audio_set_music_freq(uint8_t data);
void crbaloon_audio_set_music_enable(uint8_t data);
void crbaloon_audio_set_laugh_enable(uint8_t data);
@@ -70,7 +75,6 @@ public:
void crbaloon_audio_set_explosion_enable(int enabled);
void crbaloon_audio_set_breath_enable(int enabled);
void crbaloon_audio_set_appear_enable(int enabled);
- void crbaloon(machine_config &config);
void crbaloon_audio(machine_config &config);
void main_io_map(address_map &map);
void main_map(address_map &map);