rm/rm380z.cpp: Split RM480Z out to its own driver with MQ2 floppy drive support (#12576)

Author: RobinSergeant

src/mame/mame.lst

@@ -38796,8 +38796,10 @@ rm380zf                         // 1978 RM380z with COS 4.0/F firmware
 rm380zfhrg                      // 1978 RM380z with COS 4.0/F and HRG
 rm380z34d                       // 1978 RM380z with COS 3.4/F firmware and casette
 rm380z34e                       // 1978 RM380z with COS 3.4/M firmware and casette
-rm480z                          // 1981 RM480z
-rm480za                         // 1981 RM480z
+
+@source:rm/rm480z.cpp
+rm480z                          // 1981 RM480z with ROS 2.2
+rm480za                         // 1981 RM480z with ROS 1.2
 
 @source:rm/rmnimbus.cpp
 nimbus                          // RM Nimbus 186

src/mame/rm/rm380z.cpp

@@ -11,6 +11,9 @@ Driver started on 22/12/2011
 Stefano Bodrato, 09/12/2016 - skeleton for cassette support
 True tape samples are needed to continue !
 
+Robin Sergeant, 2024 - h/w scrolling, HRG, sound, 8" disk support
+and various bug fixes.
+
 ===
 
 From the Firmware Manual:
@@ -37,54 +40,30 @@ COS 4.2 A
 /M = 5.25 inch single density floppy
 Ver 4.2 can have either floppy type
 
-*** RM480Z ***
-RML 40-Character LINK 480Z V1.0
-RML 80-Character LINK 480Z V1.0
-RML 40-Character LINK 480Z V1.1 A
-RML 40-Character LINK 480Z V1.1 B
-RML 80-Character LINK 480Z V1.1 A
-RML 80-Character LINK 480Z V1.1 B
-RML 80-Character LINK 480Z V1.2 A
-RML 80-Character LINK 480Z V1.2 B
-RML 80-Character LINK 480Z V1.2 C
-RML 80-Character LINK 480Z V1.2 D
-RML 80-Character LINK 480Z V2.2 B
-
-V1.0 refers to ROS 1.0
-V1.1 refers to ROS 1.1
-V1.2 refers to ROS 1.2
-V2.2 refers to ROS 2.2
-
 Monitor commands:
-B - Boot CP/M  (COS /F, COS /M, ROS 1.2, ROS 2.2)
+B - Boot CP/M  (COS /F, COS /M)
 X - Boot CP/M from another drive (as above)
-N - Boot network (ROS)
-T - Enter terminal mode (ROS)
-L - Load program from cassette (COS /C, ROS)
+L - Load program from cassette (COS /C)
 D - Dump memory to cassette (as above)
 C - Continue program at restart address (as above)
 J - Go to address
-O - Select printer option (and cassette speed for COS /C, ROS)
+O - Select printer option (and cassette speed for COS /C)
 M - Enable HRG board as memory (COS 3.4, COS 4.0)
 W - Select 40 or 80 characters per line (All 80-column machines)
-R - Start ROM BASIC (ROS 1.1, ROS 1.2, ROS 2.2)
-Ctrl+Shift+8 - Break and return to current OS (ROS)
-Ctrl+Shift+9 - Break and return to front panel (ROS)
 Ctrl+F - Enter Front Panel (=the debugger)
 Ctrl+T - Enter Typewriter mode
 Ctrl+S - Autopaging on
 Ctrl+Q - Autopaging off
 Ctrl+A - Toggle autopaging
 
 Graphics characters: These are low-res (2x3 TRS80-style) from 80-BF, repeated at C0-FF.
-80-BF will be low-intensity, except for a RM480Z if using a colour monitor.
+80-BF will be low-intensity.
 The characters 00-1F have one set for COS 3.4 and COS 4.0, and a different set for the others.
 COS 4.0 and 4.2 allow one to redefine the 80-FF character range, and to have attributes.
 ROS 2.2 allows an alternate character set.
 
 Sound:
 RM380Z has a connector for a speaker
-RM480Z has the speaker fitted
 
 ===
 
@@ -117,8 +96,8 @@ PAGE SEL bit in PORT0 set to 1:
   FB00-FBFF - Memory-mapped ports (FBFC-FBFF)
   FC00-FFFF - RAM
 
-Video resolution (not confirmed):
-80x24 - 6 pixels wide (5 + spacing), 10 pixels high (9 + spacing) = 480x240
+Video resolution:
+80x24 - 8 pixels wide, 10 pixels high = 640x240
 Video input clock is 16MHz
 
 According to the manuals, VDU-1 chargen is Texas 74LS262.
@@ -136,10 +115,7 @@ Notes on COS 4.0 disassembly:
 
 TODO:
 
-- Properly implement dimming and graphic chars (>0x80)
-- Understand why any write to disk command fails with "bad sector"
-- Understand why ctrl-U (blinking cursor) in COS 4.0 stops keyboard input from working
-- Get a reliable ROM dump and charset ROM dump
+- Make cassette interface work.
 
 
 Attempt to register save state entry after state registration is closed!
@@ -190,29 +166,6 @@ void rm380z_state::rm380z_io(address_map &map)
 	map(0xe8, 0xff).rw(FUNC(rm380z_state::rm380z_porthi_r), FUNC(rm380z_state::rm380z_porthi_w));
 }
 
-void rm480z_state::rm480z_mem(address_map &map)
-{
-	map(0x0000, 0xe7ff).ram();
-	map(0xe800, 0xf7ff).rom().region(RM380Z_MAINCPU_TAG, 0);
-	map(0xf800, 0xffff).ram();
-}
-
-void rm480z_state::rm480z_io(address_map &map)
-{
-	//map(0x00, 0x17).ram(); // videoram
-	//map(0x18, 0x18).mirror(0xff00); // control port 0
-	//map(0x19, 0x19).mirror(0xff00); // control port 1
-	//map(0x1a, 0x1a).mirror(0xff00); // control port 2
-	//map(0x1b, 0x1b).mirror(0xff00); // control port 3 (DAC) // option
-	//map(0x1d, 0x1d).mirror(0xff00); // control port 5 (USERIO) // option
-	//map(0x20, 0x23).mirror(0xff00); // system CTC - 0=SIO4&cassin, 1=SIO2&cassio, 2=keybd int, 3=50Hz int for repeat key
-	//map(0x24, 0x27).mirror(0xff00); // system SIO - 0=chA network data, 1=chB SIO4 data, 2=ChA control, 3=ChB control
-	//map(0x28, 0x29).mirror(0xff02); // am9511/am9512 maths chip // option
-	//map(0x2c, 0x2f).mirror(0xff00); // z80ctc IEEE int, Maths int, RTC, RTC // option
-	//map(0x30, 0x37).mirror(0xff00); // IEEE chip // option
-	//map(0x38, 0x3b).mirror(0xff00); // Hi-res graphics option
-}
-
 INPUT_PORTS_START( rm380z )
 
 //  PORT_START("additional_chars")
@@ -318,30 +271,6 @@ void rm380z_state_cos40_hrg::rm380zhrg(machine_config &config)
 	m_palette->set_init(FUNC(rm380z_state_cos40_hrg::palette_init)).set_entries(19);
 }
 
-void rm480z_state::rm480z(machine_config &config)
-{
-	/* basic machine hardware */
-	Z80(config, m_maincpu, 16_MHz_XTAL / 4);
-	m_maincpu->set_addrmap(AS_PROGRAM, &rm480z_state::rm480z_mem);
-	m_maincpu->set_addrmap(AS_IO, &rm480z_state::rm480z_io);
-
-	/* video hardware */
-//  screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-//  screen.set_refresh_hz(50);
-//  screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-//  screen.set_size((RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1)), (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1)));
-//  screen.set_visarea(0, (RM380Z_SCREENCOLS*(RM380Z_CHDIMX+1))-1, 0, (RM380Z_SCREENROWS*(RM380Z_CHDIMY+1))-1);
-//  screen.set_screen_update(FUNC(rm380z_state::screen_update_rm480z));
-//  screen.set_palette("palette");
-
-//  PALETTE(config, "palette", palette_device::MONOCHROME);
-
-	/* keyboard */
-//  generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
-//  keyboard.set_keyboard_callback(FUNC(rm380z_state::keyboard_put));
-}
-
-
 /* ROM definitions */
 
 ROM_START( rm380z34d ) // COS 3.4D/F
@@ -390,28 +319,6 @@ ROM_START( rm380zfhrg ) // COS 4.0B/F
 	ROM_LOAD( "c-gen-22.bin",           0x0000, 0x0800, CRC(1b67127f) SHA1(289a919871d30c5e832d22244bcac1dcfd544baa) )
 ROM_END
 
-// RM480Z is quite different, might be better off in its own driver
-ROM_START( rm480z )
-	ROM_REGION( 0x10000, RM380Z_MAINCPU_TAG, 0 )
-	ROM_LOAD( "fv2.0_0_12099_19.2.86.ic83", 0x0000, 0x4000, CRC(a0f02d8a) SHA1(1c063b842699dc0ad85a5a5f337f2864497f9c0f) )
-	ROM_LOAD( "fv2.0_1_12100_27.2.86.ic93", 0x4000, 0x4000, CRC(2a93ca6e) SHA1(7fdd772d4251dbf951a687d184ed787cfe21212b) )
-	ROM_REGION( 0x2000, "chargen", 0 )
-	ROM_LOAD( "cg06_12098_28.2.86.ic98",    0x0000, 0x2000, CRC(15d40f7e) SHA1(a7266357eb9be849f77a97ff3013b236c0af8289) )
-ROM_END
-
-ROM_START( rm480za )
-	ROM_REGION( 0x10000, RM380Z_MAINCPU_TAG, 0 )
-	ROM_LOAD( "ros_1.2b.ls",   0x0000, 0x2000, CRC(37e93287) SHA1(c96d4b7eedadb0fb8e3732b6ba3e898e123c393f) )
-	ROM_LOAD( "bir_5.4b_0.lt", 0x2000, 0x4000, CRC(64759792) SHA1(ffce5e59788cd492937e85b368b71e8a5a2aaa9c) )
-	ROM_LOAD( "bir_5.4b_1.lu", 0x6000, 0x4000, CRC(adce35df) SHA1(dc20df0fcfefc5e2682b47e7ce454043dc593cd8) )
-	ROM_LOAD( "bir_5.4b_2.lv", 0xa000, 0x4000, CRC(5a455fc8) SHA1(04c5f17120ee085c013e600b77ca63cbb138aa4d) )
-	ROM_REGION( 0x10000, "user1", 0 ) // bioses for fdc board versions
-	ROM_LOAD( "idc3-1i.rom",   0x0000, 0x2000, CRC(39e2cdf0) SHA1(ba523af357b61bbe6192727139850f36597d79f1) )
-	ROM_LOAD( "idc5-1j.rom",   0x2000, 0x2000, CRC(d2ac27e2) SHA1(12d3966e0096c9bfb98135e15c3ddb37920cce15) )
-	ROM_REGION( 0x2000, "chargen", 0 )
-	ROM_LOAD( "cg06.lq",       0x0000, 0x2000, BAD_DUMP CRC(15d40f7e) SHA1(a7266357eb9be849f77a97ff3013b236c0af8289) ) // chip is marked CG05, might not be the same, so marked as bad
-ROM_END
-
 
 /* Driver */
 //   YEAR  NAME        PARENT   COMPAT  MACHINE     INPUT      CLASS                   INIT                       COMPANY              FULLNAME                        FLAGS
@@ -421,5 +328,3 @@ COMP(1978, rm380zf,    0,       0,      rm380zf,    rm380z,    rm380z_state_cos4
 COMP(1978, rm380zfhrg, rm380zf, 0,      rm380zfhrg, rm380zhrg, rm380z_state_cos40_hrg, driver_device::empty_init, "Research Machines", "RM-380Z, COS 4.0B/F with HRG", 0)
 COMP(1978, rm380z34d,  rm380z,  0,      rm380z34d,  rm380z,    rm380z_state_cos34,     driver_device::empty_init, "Research Machines", "RM-380Z, COS 3.4D/F",          MACHINE_NO_SOUND_HW)
 COMP(1978, rm380z34e,  rm380z,  0,      rm380z34e,  rm380z,    rm380z_state_cos34,     driver_device::empty_init, "Research Machines", "RM-380Z, COS 3.4E/M",          MACHINE_NO_SOUND_HW)
-COMP(1981, rm480z,     rm380z,  0,      rm480z,     rm380z,    rm480z_state,           driver_device::empty_init, "Research Machines", "LINK RM-480Z (set 1)",         MACHINE_IS_SKELETON)
-COMP(1981, rm480za,    rm380z,  0,      rm480za,    rm380z,    rm480z_state,           driver_device::empty_init, "Research Machines", "LINK RM-480Z (set 2)",         MACHINE_IS_SKELETON)

src/mame/rm/rm380z.h

@@ -93,12 +93,12 @@ class rm380z_state : public driver_device
 	uint8_t m_fbfe = 0;
 
 	required_device<cpu_device> m_maincpu;
-	optional_device<screen_device> m_screen;
-	optional_device<palette_device> m_palette;
-	optional_device<ram_device> m_messram;
-	optional_device<fd1771_device> m_fdc;
-	optional_device<floppy_connector> m_floppy0;
-	optional_device<floppy_connector> m_floppy1;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	required_device<ram_device> m_messram;
+	required_device<fd1771_device> m_fdc;
+	required_device<floppy_connector> m_floppy0;
+	required_device<floppy_connector> m_floppy1;
 };
 
 // COS 3.4 machine with cassette and VDU-40 display
@@ -199,7 +199,7 @@ class rm380z_state_cos40 : public rm380z_state
 	uint8_t m_fbfd = 0;
 
 	required_region_ptr<u8> m_chargen;
-	optional_device<speaker_sound_device> m_speaker;
+	required_device<speaker_sound_device> m_speaker;
 
 private:
 	void config_videomode();
@@ -265,26 +265,4 @@ class rm380z_state_cos40_hrg : public rm380z_state_cos40
 	required_ioport m_io_display_type;
 };
 
-// partially implemented non working RM480z
-class rm480z_state : public rm380z_state_cos40
-{
-public:
-	rm480z_state(const machine_config &mconfig, device_type type, const char *tag) :
-		rm380z_state_cos40(mconfig, type, tag)
-	{
-	}
-
-	void rm480z(machine_config &config);
-	void rm480za(machine_config &config) { rm480z(config); }
-
-protected:
-	void machine_reset() override ATTR_COLD;
-
-	void update_screen(bitmap_ind16 &bitmap) const override;
-
-private:
-	void rm480z_io(address_map &map) ATTR_COLD;
-	void rm480z_mem(address_map &map) ATTR_COLD;
-};
-
 #endif // MAME_RM_RM380Z_H

src/mame/rm/rm380z_m.cpp

@@ -371,10 +371,6 @@ void rm380z_state_cos40_hrg::machine_reset()
 	memset(m_hrg_scratchpad, 0, sizeof(m_hrg_scratchpad));
 }
 
-void rm480z_state::machine_reset()
-{
-}
-
 void rm380z_state::config_memory_map()
 {
 	address_space &program = m_maincpu->space(AS_PROGRAM);

src/mame/rm/rm380z_v.cpp

@@ -428,37 +428,3 @@ void rm380z_state_cos34::update_screen(bitmap_ind16 &bitmap) const
 		}
 	}
 }
-
-// only partially implemented and non working
-void rm480z_state::update_screen(bitmap_ind16 &bitmap) const
-{
-	uint16_t sy = 0, ma = 0;
-
-	for (uint8_t y = 0; y < RM380Z_SCREENROWS; y++)
-	{
-		for (uint8_t ra = 0; ra < 11; ra++)
-		{
-			uint16_t *p = &bitmap.pix(sy++);
-
-			for (uint16_t x = ma; x < ma + 64; x++)
-			{
-				uint8_t gfx = 0;
-				if (ra < 10)
-				{
-					const uint8_t chr = m_vram.get_char(y, x);
-					gfx = m_chargen[(chr << 4) | ra];
-				}
-
-				// Display a scanline of a character
-				*p++ = BIT(gfx, 7);
-				*p++ = BIT(gfx, 6);
-				*p++ = BIT(gfx, 5);
-				*p++ = BIT(gfx, 4);
-				*p++ = BIT(gfx, 3);
-				*p++ = BIT(gfx, 2);
-				*p++ = BIT(gfx, 1);
-				*p++ = BIT(gfx, 0);
-			}
-		}
-	}
-}