bus/pc98_cbus: move slots as children of root

angelosa · angelosa · commit 5fc23d9896ae · 2025-12-03T11:07:14.000+01:00
* BREAKING CHANGE: mapping slots now uses the -cbus:N nomenclature rather than -cbusN
diff --git a/src/devices/bus/pc98_cbus/lha201.cpp b/src/devices/bus/pc98_cbus/lha201.cpp
@@ -17,9 +17,6 @@ Maximum -chs 13329,15,63 according to link above (for LHA-20B BIOS, TBD for LHA-
 - Need data throttle between here, wd33c9x and/or NSCSI harddisk, otherwise executing anything will
   fail (should be fixed with pc98_hd option?);
 - PIO mode (involves port $cc6 and a ready flag in port $37 bit 0)
-- Tends to miss BIOS ROM loading at first boot, need to refactor C-Bus to actually have slots
-  as children (and make remapping phase less arbitrary, can't read required input port at
-  device_start);
 - Remaining remap options;
 
 **************************************************************************************************/
@@ -186,6 +183,7 @@ void lha201_device::remap(int space_id, offs_t start, offs_t end)
 {
 	if (space_id == AS_PROGRAM)
 	{
+		// TODO: move base in device_reset
 		const u32 m_memory_base = 0x000d0000 + ((m_dsw2->read() & 7) * 0x2000);
 		m_bus->space(AS_PROGRAM).install_rom(
 			m_memory_base,
diff --git a/src/devices/bus/pc98_cbus/lha201.h b/src/devices/bus/pc98_cbus/lha201.h
@@ -16,11 +16,13 @@ class lha201_device : public pc9801_55_device
 {
 public:
 	lha201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	//lha201_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-	static constexpr feature_type unemulated_features() { return feature::DISK; }
+	static constexpr feature_type imperfect_features() { return feature::DISK; }
+	static constexpr feature_type unemulated_features() { return feature::NONE; }
 
 protected:
+	//lha201_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
 //  virtual void device_validity_check(validity_checker &valid) const override;
 	virtual void device_start() override ATTR_COLD;
 	virtual void device_reset() override ATTR_COLD;
diff --git a/src/devices/bus/pc98_cbus/pc9801_26.cpp b/src/devices/bus/pc98_cbus/pc9801_26.cpp
@@ -167,6 +167,7 @@ void pc9801_26_device::remap(int space_id, offs_t start, offs_t end)
 {
 	if (space_id == AS_PROGRAM)
 	{
+		// TODO: move base in device_reset
 		const u8 rom_setting = ioport("JP6A2")->read() & 7;
 		static const u32 rom_addresses[8] = { 0xc8000, 0xcc000, 0xd0000, 0xd4000, 0, 0, 0, 0 };
 		const u32 start_address = rom_addresses[rom_setting & 7];
diff --git a/src/devices/bus/pc98_cbus/pc9801_55.cpp b/src/devices/bus/pc98_cbus/pc9801_55.cpp
@@ -236,6 +236,7 @@ void pc9801_55_device::remap(int space_id, offs_t start, offs_t end)
 {
 	if (space_id == AS_PROGRAM)
 	{
+		// TODO: move base to device_reset
 		// incredibly verbose for LHA-201
 		// logerror("map ROM at 0x000dc000-0x000dcfff (bank %d)\n", m_rom_bank);
 		m_bus->space(AS_PROGRAM).install_rom(
diff --git a/src/devices/bus/pc98_cbus/pc9801_86.cpp b/src/devices/bus/pc98_cbus/pc9801_86.cpp
@@ -233,6 +233,7 @@ void pc9801_86_device::remap(int space_id, offs_t start, offs_t end)
 {
 	if (space_id == AS_PROGRAM)
 	{
+		// TODO: check against unmap ROM option
 		logerror("map ROM at 0x000cc000-0x000cffff\n");
 		m_bus->space(AS_PROGRAM).install_rom(
 			0xcc000,
diff --git a/src/devices/bus/pc98_cbus/speakboard.cpp b/src/devices/bus/pc98_cbus/speakboard.cpp
@@ -110,6 +110,7 @@ void speakboard_device::remap(int space_id, offs_t start, offs_t end)
 {
 	if (space_id == AS_PROGRAM)
 	{
+		// TODO: check against unmap ROM option
 		logerror("map ROM at 0x000cc000-0x000cffff\n");
 		m_bus->space(AS_PROGRAM).install_rom(
 			0xcc000,
diff --git a/src/mame/nec/pc88va.cpp b/src/mame/nec/pc88va.cpp
@@ -1299,9 +1299,9 @@ void pc88va_state::pc88va_cbus(machine_config &config)
 	m_maincpu->out_iow_cb<0>().set([this] (u8 data) { m_cbus_root->dack_w(0, data); });
 
 	// should be 3 slots for each iteration here
-	PC98_CBUS_SLOT(config, "cbus0", 0, "cbus_root", pc88va_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus1", 0, "cbus_root", pc88va_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus2", 0, "cbus_root", pc88va_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:0", 0, "cbus", pc88va_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:1", 0, "cbus", pc88va_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:2", 0, "cbus", pc88va_cbus_devices, nullptr);
 }
 
 void pc88va_state::pc88va(machine_config &config)
diff --git a/src/mame/nec/pc88va.h b/src/mame/nec/pc88va.h
@@ -49,7 +49,7 @@ class pc88va_state : public driver_device
 		, m_fdd(*this, "upd765:%u", 0U)
 		, m_pic2(*this, "pic8259_slave")
 		, m_rtc(*this, "rtc")
-		, m_cbus_root(*this, "cbus_root")
+		, m_cbus_root(*this, "cbus")
 		// labelled "マウス" (mouse) - can't use "mouse" because of core -mouse option
 		, m_mouse_port(*this, "mouseport")
 		, m_opna(*this, "opna")
diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp
@@ -190,10 +190,10 @@ void pc9801vm_state::ide_cs1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 void pc9801_state::pc9801_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x00000, 0x9ffff).rw("cbus_root", FUNC(pc98_cbus_root_device::mem_r), FUNC(pc98_cbus_root_device::mem_w));
+	map(0x00000, 0x9ffff).rw("cbus", FUNC(pc98_cbus_root_device::mem_r), FUNC(pc98_cbus_root_device::mem_w));
 	map(0xa0000, 0xa3fff).rw(FUNC(pc9801_state::tvram_r), FUNC(pc9801_state::tvram_w)); //TVRAM
 	map(0xa8000, 0xbffff).rw(FUNC(pc9801_state::gvram_r), FUNC(pc9801_state::gvram_w)); //bitmap VRAM
-	map(0xc0000, 0xdffff).rw("cbus_root", FUNC(pc98_cbus_root_device::mem_slot_r), FUNC(pc98_cbus_root_device::mem_slot_w));
+	map(0xc0000, 0xdffff).rw("cbus", FUNC(pc98_cbus_root_device::mem_slot_r), FUNC(pc98_cbus_root_device::mem_slot_w));
 //  map(0xcc000, 0xcffff).rom().region("sound_bios", 0); //sound BIOS
 //  map(0xd6000, 0xd6fff).rom().region("fdc_bios_2dd", 0); //floppy BIOS 2dd
 //  map(0xd7000, 0xd7fff).rom().region("fdc_bios_2hd", 0); //floppy BIOS 2hd
@@ -227,7 +227,7 @@ void pc9801_state::pc9801_common_io(address_map &map)
 void pc9801_state::pc9801_io(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0xffff).rw("cbus_root", FUNC(pc98_cbus_root_device::io_r), FUNC(pc98_cbus_root_device::io_w));
+	map(0x0000, 0xffff).rw("cbus", FUNC(pc98_cbus_root_device::io_r), FUNC(pc98_cbus_root_device::io_w));
 	pc9801_common_io(map);
 	map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg4_w)).umask16(0xff00);
 	map(0x0050, 0x0057).m("fdd_2d", FUNC(pc80s31k_device::host_map)).umask16(0xff00);
@@ -746,12 +746,12 @@ void pc9801_state::ipl_bank(address_map &map)
 
 void pc9801vm_state::pc9801vm_map(address_map &map)
 {
-	map(0x000000, 0x09ffff).rw("cbus_root", FUNC(pc98_cbus_root_device::mem_r), FUNC(pc98_cbus_root_device::mem_w));
+	map(0x000000, 0x09ffff).rw("cbus", FUNC(pc98_cbus_root_device::mem_r), FUNC(pc98_cbus_root_device::mem_w));
 
 	map(0x0a0000, 0x0a3fff).rw(FUNC(pc9801vm_state::tvram_r), FUNC(pc9801vm_state::tvram_w));
 	map(0x0a4000, 0x0a4fff).rw(FUNC(pc9801vm_state::pc9801rs_knjram_r), FUNC(pc9801vm_state::pc9801rs_knjram_w));
 	map(0x0a8000, 0x0bffff).rw(FUNC(pc9801vm_state::grcg_gvram_r), FUNC(pc9801vm_state::grcg_gvram_w));
-	map(0x0c0000, 0x0dffff).rw("cbus_root", FUNC(pc98_cbus_root_device::mem_slot_r), FUNC(pc98_cbus_root_device::mem_slot_w));
+	map(0x0c0000, 0x0dffff).rw("cbus", FUNC(pc98_cbus_root_device::mem_slot_r), FUNC(pc98_cbus_root_device::mem_slot_w));
 
 	map(0x0e0000, 0x0e7fff).rw(FUNC(pc9801vm_state::grcg_gvram0_r), FUNC(pc9801vm_state::grcg_gvram0_w));
 	map(0x0e8000, 0x0fffff).m(m_ipl, FUNC(address_map_bank_device::amap16));
@@ -2019,16 +2019,16 @@ void pc9801_state::pc9801(machine_config &config)
 	m_maincpu->set_irq_acknowledge_callback("pic8259_master", FUNC(pic8259_device::inta_cb));
 
 	pc9801_cbus(config);
-	PC98_CBUS_SLOT(config, "cbus0", 0, "cbus_root", pc98_cbus_devices, "pc9801_26");
-	PC98_CBUS_SLOT(config, "cbus1", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus2", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus3", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus4", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus5", 0, "cbus_root", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:0", 0, "cbus", pc98_cbus_devices, "pc9801_26");
+	PC98_CBUS_SLOT(config, "cbus:1", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:2", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:3", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:4", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:5", 0, "cbus", pc98_cbus_devices, nullptr);
 
 	// RAM 128KB (vanilla/F1/F2) ~ 256KB (F3/M2/M3) ~ 640KB (max)
 	// TODO: really dedicates this space in N slots above
-	PC98_CBUS_SLOT(config, "cbus_ram", 0, "cbus_root", pc98_cbus_ram_devices, "640kb");
+	PC98_CBUS_SLOT(config, "cbus:ram", 0, "cbus", pc98_cbus_ram_devices, "640kb");
 //  RAM(config, m_ram).set_default_size("640K").set_extra_options("128K,256K,384K,512K");
 
 	pc9801_common(config);
@@ -2050,13 +2050,13 @@ void pc9801_state::pc9801(machine_config &config)
 void pc9801_state::pc9801f(machine_config &config)
 {
 	pc9801(config);
-	PC98_CBUS_SLOT(config.replace(), "cbus1", 0, "cbus_root", pc98_cbus_devices, "fdd_2dd");
+	PC98_CBUS_SLOT(config.replace(), "cbus:1", 0, "cbus", pc98_cbus_devices, "fdd_2dd");
 }
 
 void pc9801_state::pc9801m(machine_config &config)
 {
 	pc9801(config);
-	PC98_CBUS_SLOT(config.replace(), "cbus1", 0, "cbus_root", pc98_cbus_devices, "fdd_2hd");
+	PC98_CBUS_SLOT(config.replace(), "cbus:1", 0, "cbus", pc98_cbus_devices, "fdd_2hd");
 }
 
 void pc9801vm_state::pc9801vm(machine_config &config)
@@ -2068,10 +2068,10 @@ void pc9801vm_state::pc9801vm(machine_config &config)
 
 	pc9801_common(config);
 	pc9801_cbus(config);
-	PC98_CBUS_SLOT(config, "cbus0", 0, "cbus_root", pc98_cbus_devices, "pc9801_26");
-	PC98_CBUS_SLOT(config, "cbus1", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus2", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "cbus3", 0, "cbus_root", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:0", 0, "cbus", pc98_cbus_devices, "pc9801_26");
+	PC98_CBUS_SLOT(config, "cbus:1", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:2", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:3", 0, "cbus", pc98_cbus_devices, nullptr);
 
 	m_ppi_sys->out_pc_callback().set(FUNC(pc9801vm_state::ppi_sys_dac_portc_w));
 	// TODO: verify if it needs invert();
@@ -2083,7 +2083,7 @@ void pc9801vm_state::pc9801vm(machine_config &config)
 	ADDRESS_MAP_BANK(config, m_ipl).set_map(&pc9801vm_state::ipl_bank).set_options(ENDIANNESS_LITTLE, 16, 18, 0x18000);
 
 	// RAM 384KB (VM0/VM2/VM4) ~ 640KB (VM21/VM11)
-	PC98_CBUS_SLOT(config, "cbus_ram", 0, "cbus_root", pc98_cbus_ram_devices, "640kb");
+	PC98_CBUS_SLOT(config, "cbus_ram", 0, "cbus", pc98_cbus_ram_devices, "640kb");
 //  RAM(config, m_ram).set_default_size("640K").set_extra_options("384K");
 
 	MCFG_MACHINE_START_OVERRIDE(pc9801vm_state, pc9801rs)
diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h
@@ -141,7 +141,7 @@ class pc9801_state : public pc98_base_state
 		, m_fdc_2hd(*this, "fdc_2hd")
 		, m_hgdc(*this, "hgdc%d", 1)
 		, m_video_ram(*this, "video_ram_%d", 1)
-		, m_cbus_root(*this, "cbus_root")
+		, m_cbus_root(*this, "cbus")
 		, m_pic1(*this, "pic8259_master")
 		, m_pic2(*this, "pic8259_slave")
 		, m_memsw(*this, "memsw")
diff --git a/src/mame/nec/pc9821.cpp b/src/mame/nec/pc9821.cpp
@@ -909,7 +909,7 @@ void pc9821_state::pc9821(machine_config &config)
 	m_pit->set_clk<1>(MAIN_CLOCK_X2);
 	m_pit->set_clk<2>(MAIN_CLOCK_X2);
 
-	PC98_CBUS_SLOT(config.replace(), "cbus0", 0, "cbus_root", pc98_cbus_devices, "pc9801_86");
+	PC98_CBUS_SLOT(config.replace(), "cbus:0", 0, "cbus", pc98_cbus_devices, "pc9801_86");
 
 	MCFG_MACHINE_START_OVERRIDE(pc9821_state, pc9821)
 	MCFG_MACHINE_RESET_OVERRIDE(pc9821_state, pc9821)
@@ -1002,8 +1002,8 @@ void pc9821_canbe_state::pc9821ce(machine_config &config)
 //  m_ram->set_extra_options("6M,8M,14M,15M");
 
 	// pc9801-86 (built-in)
-	PC98_CBUS_SLOT(config.replace(), "cbus0", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "board1", 0, "cbus_root", pc98_cbus_devices, "sound_pc9821ce", true);
+	PC98_CBUS_SLOT(config.replace(), "cbus:0", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:mb1", 0, "cbus", pc98_cbus_devices, "sound_pc9821ce", true);
 
 	// 3.5 x2
 	config_floppy_35hd(config);
@@ -1030,8 +1030,8 @@ void pc9821_canbe_state::pc9821cx3(machine_config &config)
 	//pit_clock_config(config, xtal / 4); // unknown, fixes timer error at POST
 
 //  m_cbus[0]->set_default_option(nullptr);
-	PC98_CBUS_SLOT(config.replace(), "cbus0", 0, "cbus_root", pc98_cbus_devices, nullptr);
-	PC98_CBUS_SLOT(config, "board1", 0, "cbus_root", pc98_cbus_devices, "sound_pc9821cx3", true);
+	PC98_CBUS_SLOT(config.replace(), "cbus:0", 0, "cbus", pc98_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:mb1", 0, "cbus", pc98_cbus_devices, "sound_pc9821cx3", true);
 
 	MCFG_MACHINE_START_OVERRIDE(pc9821_canbe_state, pc9821_canbe);
 	MCFG_MACHINE_RESET_OVERRIDE(pc9821_canbe_state, pc9821_canbe);
@@ -1424,7 +1424,7 @@ ROM_START( pc9821ce )
 	ROM_REGION( 0x80000, "chargen", 0 )
 	ROM_LOAD( "font_ce2.rom", 0x00000, 0x046800, BAD_DUMP CRC(d1c2702a) SHA1(e7781e9d35b6511d12631641d029ad2ba3f7daef) )
 
-	ROM_REGION( 0x4000, "board1:sound_pc9821ce:bios", ROMREGION_ERASE00 )
+	ROM_REGION( 0x4000, "cbus:mb1:sound_pc9821ce:bios", ROMREGION_ERASE00 )
 	ROM_COPY( "biosrom", 0x0c000, 0x00000, 0x04000 )
 
 	LOAD_KANJI_ROMS(ROMREGION_ERASEFF)
@@ -1509,7 +1509,7 @@ ROM_START( pc9821cx3 )
 	// cfr. $afe00 and $ad400 range
 	LOAD_KANJI_ROMS(ROMREGION_ERASE00)
 
-	ROM_REGION( 0x4000, "board1:sound_pc9821cx3:bios", 0)
+	ROM_REGION( 0x4000, "cbus:mb1:sound_pc9821cx3:bios", 0)
 	ROM_COPY( "biosrom", 0x54000, 0x00000, 0x04000 )
 
 	ROM_REGION( 0x4000, "ide", ROMREGION_ERASEVAL(0xcb) )
diff --git a/src/mame/omron/luna_88k.cpp b/src/mame/omron/luna_88k.cpp
@@ -179,7 +179,7 @@ class luna88k2_state : public luna_88k_state_base
 		, m_rtc(*this, "rtc")
 		, m_spc(*this, "scsi%u:7:spc", 0U)
 		, m_net(*this, "net%u", 0U)
-		, m_cbus_root(*this, "cbus_root")
+		, m_cbus_root(*this, "cbus")
 		, m_eprom(*this, "eprom")
 		, m_fzrom(*this, "fzrom")
 	{
@@ -600,7 +600,7 @@ void luna88k2_state::luna88k2(machine_config &config)
 	PC98_CBUS_ROOT(config, m_cbus_root, 0);
 	// TODO: interrupts
 
-	PC98_CBUS_SLOT(config, "cbus0", 0, m_cbus_root, luna88k2_cbus_devices, nullptr);
+	PC98_CBUS_SLOT(config, "cbus:0", 0, m_cbus_root, luna88k2_cbus_devices, nullptr);
 }
 
 u32 luna_88k_state_base::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect)

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ void pc9801_26_device::remap(int space_id, offs_t start, offs_t end)`
`167`	`167`	`{`
`168`	`168`	`if (space_id == AS_PROGRAM)`
`169`	`169`	`{`
	`170`	`+ // TODO: move base in device_reset`
`170`	`171`	`const u8 rom_setting = ioport("JP6A2")->read() & 7;`
`171`	`172`	`static const u32 rom_addresses[8] = { 0xc8000, 0xcc000, 0xd0000, 0xd4000, 0, 0, 0, 0 };`
`172`	`173`	`const u32 start_address = rom_addresses[rom_setting & 7];`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ void pc9801_55_device::remap(int space_id, offs_t start, offs_t end)`
`236`	`236`	`{`
`237`	`237`	`if (space_id == AS_PROGRAM)`
`238`	`238`	`{`
	`239`	`+ // TODO: move base to device_reset`
`239`	`240`	`// incredibly verbose for LHA-201`
`240`	`241`	`// logerror("map ROM at 0x000dc000-0x000dcfff (bank %d)\n", m_rom_bank);`
`241`	`242`	`m_bus->space(AS_PROGRAM).install_rom(`
Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ void pc9801_86_device::remap(int space_id, offs_t start, offs_t end)`
`233`	`233`	`{`
`234`	`234`	`if (space_id == AS_PROGRAM)`
`235`	`235`	`{`
	`236`	`+ // TODO: check against unmap ROM option`
`236`	`237`	`logerror("map ROM at 0x000cc000-0x000cffff\n");`
`237`	`238`	`m_bus->space(AS_PROGRAM).install_rom(`
`238`	`239`	`0xcc000,`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ void speakboard_device::remap(int space_id, offs_t start, offs_t end)`
`110`	`110`	`{`
`111`	`111`	`if (space_id == AS_PROGRAM)`
`112`	`112`	`{`
	`113`	`+ // TODO: check against unmap ROM option`
`113`	`114`	`logerror("map ROM at 0x000cc000-0x000cffff\n");`
`114`	`115`	`m_bus->space(AS_PROGRAM).install_rom(`
`115`	`116`	`0xcc000,`