Added experimental support for neocd homebrew titles.

Author: Robbbert

scripts/target/hbmame/hbmame.lua

@@ -666,7 +666,7 @@ files {
 	MAME_DIR .. "src/hbmame/video/neogeo.cpp",
 	MAME_DIR .. "src/hbmame/drivers/neogeo_noslot.cpp",
 	MAME_DIR .. "src/hbmame/video/neogeo_spr.cpp",
-	MAME_DIR .. "src/hbmame/machine/ng_memcard.cpp",
+	MAME_DIR .. "src/hbmame/machine/hbng_memcard.cpp",
 	MAME_DIR .. "src/hbmame/bus/neogeo/prot.cpp",
 	MAME_DIR .. "src/hbmame/bus/neogeo/banked_cart.cpp",
 	MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/ctrl.cpp",
@@ -675,7 +675,6 @@ files {
 	MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/dial.cpp",
 	MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/irrmaze.cpp",
 	MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/kizuna4p.cpp",
---	MAME_DIR .. "src/mame/drivers/neogeocd.cpp",
 }
 
 createHBMAMEProjects(_target, _subtarget, "nichibutsu")
@@ -850,6 +849,13 @@ files {
 	MAME_DIR .. "src/hbmame/drivers/snk6502.cpp",
 	MAME_DIR .. "src/mame/snk/snk6502_a.cpp",
 	MAME_DIR .. "src/mame/snk/snk6502_v.cpp",
+	MAME_DIR .. "src/hbmame/drivers/neogeocd.cpp",
+	MAME_DIR .. "src/mame/shared/megacdcd.cpp",
+	MAME_DIR .. "src/mame/snk/neogeo_spr.cpp",
+	MAME_DIR .. "src/mame/snk/neogeo.cpp",
+	MAME_DIR .. "src/mame/snk/neogeo_v.cpp",
+	MAME_DIR .. "src/devices/bus/neogeo/slot.cpp",
+	MAME_DIR .. "src/mame/snk/ng_memcard.cpp",
 }
 
 createHBMAMEProjects(_target, _subtarget, "sony")

src/hbmame/drivers/neogeo.cpp

@@ -982,7 +982,7 @@ void neogeo_state::neogeo_arcade(machine_config &config)
 	WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_ticks(3244030, NEOGEO_MASTER_CLOCK));
 	UPD4990A(config, m_upd4990a);
 	NVRAM(config, "saveram", nvram_device::DEFAULT_ALL_0);
-	NG_MEMCARD(config, "memcard");
+	HBNG_MEMCARD(config, "memcard");
 }
 
 void neogeo_state::mvs(machine_config &config)

src/hbmame/drivers/neogeocd.cpp

@@ -0,0 +1,118 @@
+// license:GPL_2.0
+// copyright-holders:Robbbert
+#include "../mame/snk/neogeocd.cpp"
+
+namespace {
+
+class ngcd_hb : public ngcd_state
+{
+public:
+	ngcd_hb(const machine_config &mconfig, device_type type, const char *tag)
+		: ngcd_state(mconfig, type, tag)
+		, m_cdrom(*this, "cdrom")
+	{ }
+
+	void neocd_hb(machine_config &config);
+
+private:
+	required_device<cdrom_image_device> m_cdrom;
+};
+
+
+void ngcd_hb::neocd_hb(machine_config &config)
+{
+	neogeo_base(config);
+	neogeo_stereo(config);
+
+	m_maincpu->set_addrmap(AS_PROGRAM, &ngcd_hb::neocd_main_map);
+	m_maincpu->set_addrmap(m68000_base_device::AS_CPU_SPACE, &ngcd_hb::neocd_vector_map);
+
+	m_audiocpu->set_addrmap(AS_PROGRAM, &ngcd_hb::neocd_audio_map);
+	m_audiocpu->set_addrmap(AS_IO, &ngcd_hb::neocd_audio_io_map);
+
+	m_screen->set_screen_update(FUNC(ngcd_hb::screen_update));
+
+	// temporary until things are cleaned up
+	LC89510_TEMP(config, m_tempcdc); // cd controller
+	m_tempcdc->set_cdrom_tag("cdrom");
+	m_tempcdc->set_is_neoCD(true);
+	m_tempcdc->set_type1_interrupt_callback(FUNC(ngcd_hb::interrupt_callback_type1));
+	m_tempcdc->set_type2_interrupt_callback(FUNC(ngcd_hb::interrupt_callback_type2));
+	m_tempcdc->set_type3_interrupt_callback(FUNC(ngcd_hb::interrupt_callback_type3));
+
+	NVRAM(config, "saveram", nvram_device::DEFAULT_ALL_0);
+
+	NEOGEO_CONTROL_PORT(config, m_ctrl1, neogeo_controls, "joy", false);
+	NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_controls, "joy", false);
+
+	CDROM(config, m_cdrom).set_interface("cdrom");
+	m_cdrom->add_region("cdrom");
+
+	m_ym->set_addrmap(0, &ngcd_hb::neocd_ym_map);
+}
+
+
+#define NEOCDZ_BIOS \
+	ROM_REGION16_BE( 0x80000, "mainbios", 0 ) \
+	ROM_SYSTEM_BIOS( 0, "official",   "Official BIOS" ) \
+	ROMX_LOAD("neocd.bin",    0x00000, 0x80000, CRC(df9de490) SHA1(7bb26d1e5d1e930515219cb18bcde5b7b23e2eda), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0)) \
+	ROM_SYSTEM_BIOS( 1, "unibios32", "Universe BIOS (Hack, Ver. 3.2)" ) \
+	ROMX_LOAD("uni-bioscd32.rom",    0x00000, 0x80000, CRC(0ffb3127) SHA1(5158b728e62b391fb69493743dcf7abbc62abc82), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1)) \
+	ROM_SYSTEM_BIOS( 2, "unibios33", "Universe BIOS (Hack, Ver. 3.3)" ) \
+	ROMX_LOAD("uni-bioscd33.rom",    0x00000, 0x80000, CRC(ff3abc59) SHA1(5142f205912869b673a71480c5828b1eaed782a8), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2)) \
+	ROM_REGION( 0x20000, "spritegen:zoomy", 0 ) \
+	ROM_LOAD( "000-lo.lo", 0x00000, 0x20000, CRC(5a86cff2) SHA1(5992277debadeb64d1c1c64b0a92d9293eaf7e4a) )
+
+ROM_START( cd_blueandr )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "blueandr", 0, SHA1(1e3ea5255c8df92dfdebe060b9a72d8d3fd140dd) )
+ROM_END
+
+ROM_START( cd_galx )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "galaxian", 0, SHA1(00edb916464653c14dba6920d2b96867dbb486d1) )
+ROM_END
+
+ROM_START( cd_galx2 )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "galaxian2", 0, SHA1(ecaf39c082393ab3274661c7b2386067cf297c01) )
+ROM_END
+
+ROM_START( cd_midnight )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "midnight", 0, SHA1(209a3717709d82a5e4fdab30457e0e1894bc24e6) )
+ROM_END
+
+ROM_START( cd_pong )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "pong", 0, SHA1(5f2a993bce41f18e6562e0c113cc08fd7bc8060f) )
+ROM_END
+
+ROM_START( cd_rickdx )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "rickdx", 0, SHA1(e55a576b7bfabe1b71aff8f0febd8a4963d3104f) )
+ROM_END
+
+ROM_START( cd_ssrpg )
+	NEOCDZ_BIOS
+	DISK_REGION( "cdrom" )
+	DISK_IMAGE_READONLY( "ssrpg", 0, SHA1(2bc6a30d305c52e9189efe9840d34370ed260300) )
+ROM_END
+
+} // anonymous namespace
+
+GAME( 2026, cd_blueandr, neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "Kaiju Wasp", "Blue and Red Fight the Robots v1.7 (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2023, cd_galx,     neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "tcdev", "Galaxians (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2023, cd_galx2,    neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "tcdev", "Galaxians 2 (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2026, cd_midnight, neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "Z-team", "Midnight Wanderers (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2023, cd_pong,     neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "unk", "Pong (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2026, cd_rickdx,   neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "Z-team", "Rick Dangerous DX (CD)", MACHINE_SUPPORTS_SAVE )
+GAME( 2016, cd_ssrpg,    neocdz, neocd_hb, neocd,  ngcd_hb,  init_neocdz,  ROT0, "Apocalypse", "Samurai Spirits RPG (English) (CD)", MACHINE_SUPPORTS_SAVE )
+
+

src/hbmame/hbmame.lst

@@ -6657,6 +6657,16 @@ wakuwk7e
 whpe
 wjammere
 
+@source:neogeocd.cpp
+neocdz
+cd_blueandr
+cd_galx
+cd_galx2
+cd_midnight
+cd_pong
+cd_rickdx
+cd_ssrpg
+
 @source:ngdoubledr.cpp
 doubledr01
 doubledr02

src/hbmame/includes/neogeo.h

@@ -9,7 +9,7 @@
 #include "machine/watchdog.h"
 #include "sound/ymopn.h"
 #include "machine/upd1990a.h"
-#include "machine/ng_memcard.h"
+#include "machine/hbng_memcard.h"
 #include "machine/gen_latch.h"
 #include "video/neogeo_spr.h"
 #include "imagedev/snapquik.h"
@@ -335,7 +335,7 @@ class neogeo_state : public driver_device
 	optional_shared_ptr<u16 > m_save_ram;
 	required_device<screen_device> m_screen;
 	optional_device<palette_device> m_palette;
-	optional_device<ng_memcard_device> m_memcard;
+	optional_device<hbng_memcard_device> m_memcard;
 	optional_ioport m_dsw;
 	optional_ioport m_trackx;
 	optional_ioport m_tracky;

src/hbmame/machine/ng_memcard.cpp src/hbmame/machine/hbng_memcard.cppsrc/hbmame/machine/ng_memcard.cpp renamed to src/hbmame/machine/hbng_memcard.cpp

@@ -10,17 +10,17 @@
 
 #include "emu.h"
 #include "emuopts.h"
-#include "ng_memcard.h"
+#include "hbng_memcard.h"
 
 // device type definition
-DEFINE_DEVICE_TYPE(NG_MEMCARD, ng_memcard_device, "ng_memcard", "NeoGeo Memory Card")
+DEFINE_DEVICE_TYPE(HBNG_MEMCARD, hbng_memcard_device, "hbng_memcard", "HB NeoGeo Memory Card")
 
 //-------------------------------------------------
 //  ng_memcard_device - constructor
 //-------------------------------------------------
 
-ng_memcard_device::ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: device_t(mconfig, NG_MEMCARD, tag, owner, clock),
+hbng_memcard_device::hbng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, HBNG_MEMCARD, tag, owner, clock),
 		device_memcard_image_interface(mconfig, *this)
 {
 }
@@ -31,7 +31,7 @@ ng_memcard_device::ng_memcard_device(const machine_config &mconfig, const char *
 //  device_start - device-specific startup
 //-------------------------------------------------
 
-void ng_memcard_device::device_start()
+void hbng_memcard_device::device_start()
 {
 	save_item(NAME(m_memcard_data));
 }
@@ -41,7 +41,7 @@ void ng_memcard_device::device_start()
     with the given index
 -------------------------------------------------*/
 
-std::pair<std::error_condition, std::string> ng_memcard_device::call_load()
+std::pair<std::error_condition, std::string> hbng_memcard_device::call_load()
 {
 	if(length() != 0x800)
 		return std::make_pair(image_error::INVALIDLENGTH, "Unsupported memory card size (only 2K cards are supported)");
@@ -54,13 +54,13 @@ std::pair<std::error_condition, std::string> ng_memcard_device::call_load()
 	return std::make_pair(std::error_condition(), std::string());
 }
 
-void ng_memcard_device::call_unload()
+void hbng_memcard_device::call_unload()
 {
 	fseek(0, SEEK_SET);
 	fwrite(m_memcard_data, 0x800);
 }
 
-std::pair<std::error_condition, std::string> ng_memcard_device::call_create(int format_type, util::option_resolution *format_options)
+std::pair<std::error_condition, std::string> hbng_memcard_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	memset(m_memcard_data, 0, 0x800);
 
@@ -72,12 +72,12 @@ std::pair<std::error_condition, std::string> ng_memcard_device::call_create(int
 }
 
 
-u8 ng_memcard_device::read(offs_t offset)
+u8 hbng_memcard_device::read(offs_t offset)
 {
 	return m_memcard_data[offset];
 }
 
-void ng_memcard_device::write(offs_t offset, u8 data)
+void hbng_memcard_device::write(offs_t offset, u8 data)
 {
 	m_memcard_data[offset] = data;
 }

src/hbmame/machine/ng_memcard.h src/hbmame/machine/hbng_memcard.hsrc/hbmame/machine/ng_memcard.h renamed to src/hbmame/machine/hbng_memcard.h

@@ -10,15 +10,8 @@
 
 #pragma once
 
-#ifndef __NG_MEMCARD_H__
-#define __NG_MEMCARD_H__
-
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_NEOGEO_MEMCARD_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, NG_MEMCARD, 0)
+#ifndef __HBNG_MEMCARD_H__
+#define __HBNG_MEMCARD_H__
 
 /***************************************************************************
     FUNCTION PROTOTYPES
@@ -27,11 +20,11 @@
 
 // ======================> ng_memcard_device
 
-class ng_memcard_device :  public device_t, public device_memcard_image_interface
+class hbng_memcard_device :  public device_t, public device_memcard_image_interface
 {
 public:
 	// construction/destruction
-	ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+	hbng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
 
 	virtual bool is_reset_on_load() const noexcept override { return false; }
 	virtual const char *file_extensions() const noexcept override { return "neo"; }
@@ -54,7 +47,7 @@ class ng_memcard_device :  public device_t, public device_memcard_image_interfac
 
 
 // device type definition
-DECLARE_DEVICE_TYPE(NG_MEMCARD, ng_memcard_device)
+DECLARE_DEVICE_TYPE(HBNG_MEMCARD, hbng_memcard_device)
 
 
 #endif  /* __NG_MEMCARD_H__ */

src/mame/snk/neogeo.cpp

@@ -557,7 +557,7 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
-#include "irrmaze.lh"
+//#include "irrmaze.lh"
 #include "neogeo.lh"
 
 #define LOG_VIDEO_SYSTEM         (1U << 1)
@@ -1801,7 +1801,7 @@ void neogeo_base_state::audio_io_map(address_map &map)
 	map(0x0c, 0x0c).mirror(0xff00).w(m_soundlatch2, FUNC(generic_latch_8_device::write));
 }
 
-
+#if 0
 
 /*************************************
  *
@@ -1882,7 +1882,7 @@ static INPUT_PORTS_START( neogeo_mvs6 )
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_CUSTOM ) // sense: 6-slot
 INPUT_PORTS_END
 
-
+#endif
 
 INPUT_PORTS_START( aes )
 	PORT_START("IN2")
@@ -1972,7 +1972,7 @@ void neogeo_base_state::neogeo_stereo(machine_config &config)
 	m_ym->add_route(2, "speaker", 0.98, 1);
 }
 
-
+#if 0
 void neogeo_base_state::neogeo_memcard(machine_config &config)
 {
 	NG_MEMCARD(config, m_memcard);
@@ -2119,7 +2119,7 @@ void mvs_led_state::mv1_fixed(machine_config &config)
 	NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_arc_pin15, nullptr, true);
 }
 
-
+#endif
 
 void aes_base_state::machine_start()
 {
@@ -2146,7 +2146,7 @@ void aes_state::device_post_load()
 	if (m_slots[m_curr_slot] && m_slots[m_curr_slot]->get_rom_size() > 0)
 		m_bank_cartridge->set_base((uint8_t *)m_slots[m_curr_slot]->get_rom_base() + m_bank_base);
 }
-
+#if 0
 // NTSC region
 void aes_state::aes_ntsc(machine_config &config)
 {
@@ -2487,7 +2487,7 @@ void mvs_state::irrmaze(machine_config &config)
 
 	NEOGEO_CTRL_EDGE_CONNECTOR(config, m_edge, neogeo_arc_edge_irrmaze, "irrmaze", false);
 
-	config.set_default_layout(layout_irrmaze);
+	//config.set_default_layout(layout_irrmaze);
 
 	cartslot_fixed(config, "rom");
 }
@@ -12253,3 +12253,5 @@ GAME( 2005, lasthope,   neogeo,   neobase,   neogeo,    mvs_led_state, empty_ini
 
 // NEOBITZ
 // Knight's Chance (c)2014 - MVS/AES
+#endif
+

src/mame/snk/neogeocd.cpp

@@ -77,7 +77,7 @@ class ngcd_state : public aes_base_state
 	virtual void machine_start() override ATTR_COLD;
 	virtual void machine_reset() override ATTR_COLD;
 
-private:
+//private:
 	optional_device<lc89510_temp_device> m_tempcdc;
 	required_shared_ptr<uint8_t> m_z80_ram;
 	required_shared_ptr<uint8_t> m_adpcm_ram;
@@ -331,7 +331,7 @@ void ngcd_state::control_w(address_space &space, offs_t offset, uint16_t data, u
 				// is there some way to enable write protection on the RAM vector area or is it some IRQ masking issue?
 				// the games still write to the normal address for this too?
 				// writes 00 / 01 / ff
-				printf("MapVectorTable? %04x %04x\n",data,mem_mask);
+				//printf("MapVectorTable? %04x %04x\n",data,mem_mask);
 
 				//m_bank_vectors->set_entry(data == 0 ? 0 : 1);
 				m_use_cart_vectors = (data == 0 ? 0 : 1);