-pc/tc_t1t.cpp: Fixed some (but not all) hard-coded assumptions:

* Made character generator ROM tag configurable, use an object finder to
  access it.
* Made PCjr vblank output a configurable callback rather than hardcoding
  connection to 8259.

-pc/tandy1t.cpp: Use a memory bank for BIOS banking rather than an
 address map bank device.

-capcom/cps1.cpp: Use three buttons per player for Final Fight
 (MT09294).  The third button connection is always wired on the CPS-1
 mainboard and does work in the game, even if it's an undocumented
 easter egg.  In many cases, the board sets were installed in generic
 JAMMA cabinets with standard stick plus three buttons control panels,
 allowing players to use the third button.

Author: cuavas

src/mame/capcom/cps1.cpp

@@ -1612,16 +1612,7 @@ INPUT_PORTS_END
    ('Ctrl') or "P1 Button 2" ('Alt') during the bootup test. Button 1 will load the Scroll (Background) test,
    and Button 2 will load an Obj (Sprite) viewer. */
 static INPUT_PORTS_START( ffight )
-	PORT_INCLUDE( cps1_2b )
-
-#if 0
-/* The button below is not officially documented and does not exist on the control panel, probably a leftover.
-   Pressing it will allow you to escape from grabs and choke holds instantly. */
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME ("P1 Button 3 (Cheat)")
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME ("P2 Button 3 (Cheat)")
-#endif
+	PORT_INCLUDE( cps1_3b )
 
 	PORT_START("DSWA")
 	CPS1_COINAGE_1( "SW(A)" )

src/mame/pc/ibmpcjr.cpp

@@ -2,6 +2,8 @@
 // copyright-holders:Wilbert Pol
 #include "emu.h"
 
+#include "pc_t1t.h"
+
 #include "cpu/i86/i86.h"
 #include "imagedev/cassette.h"
 #include "machine/i8255.h"
@@ -13,7 +15,6 @@
 #include "machine/ram.h"
 #include "sound/sn76496.h"
 #include "sound/spkrdev.h"
-#include "pc_t1t.h"
 
 #include "bus/generic/carts.h"
 #include "bus/generic/slot.h"
@@ -636,7 +637,10 @@ void pcjr_state::ibmpcjr(machine_config &config)
 	serport.cts_handler().set("ins8250", FUNC(ins8250_uart_device::cts_w));
 
 	/* video hardware */
-	PCVIDEO_PCJR(config, "pcvideo_pcjr", 0).set_screen("pcvideo_pcjr:screen");
+	auto &video(PCVIDEO_PCJR(config, "pcvideo_pcjr", 0));
+	video.set_screen("pcvideo_pcjr:screen");
+	video.set_chr_gen_tag("gfx1");
+	video.vsync_callback().set(m_pic8259, FUNC(pic8259_device::ir5_w));
 
 	GFXDECODE(config, "gfxdecode", "pcvideo_pcjr:palette", gfx_pcjr);
 

src/mame/pc/pc_t1t.cpp

@@ -36,45 +36,50 @@ DEFINE_DEVICE_TYPE(PCVIDEO_PCJR,  pcvideo_pcjr_device,  "pcjr_graphics",       "
 pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, type, tag, owner, clock),
 	device_video_interface(mconfig, *this),
-	m_mc6845(*this, T1000_MC6845_NAME),
+	m_chr_gen(*this, finder_base::DUMMY_TAG),
+	m_mc6845(*this, "mc6845_t1000"),
+	m_palette(*this,"palette"),
+	m_ram(*this, ":" RAM_TAG),
+	m_vram(*this, "vram"),
 	m_mode_control(0),
 	m_color_select(0),
 	m_status(0),
 	m_bank(0),
 	m_pc_framecnt(0),
 	m_displayram(nullptr),
-	m_chr_gen(nullptr),
 	m_chr_size(0),
 	m_ra_offset(0),
 	m_address_data_ff(0),
 	m_update_row_type(-1),
 	m_display_enable(0),
 	m_vsync(0),
-	m_palette_base(0),
-	m_palette(*this,"palette"),
-	m_ram(*this, ":" RAM_TAG),
-	m_vram(*this, "vram")
+	m_palette_base(0)
 {
 }
 
-pcvideo_t1000_device::pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: pc_t1t_device(mconfig, PCVIDEO_T1000, tag, owner, clock)
+pcvideo_t1000_device::pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	pc_t1t_device(mconfig, PCVIDEO_T1000, tag, owner, clock)
 {
 }
 
-pcvideo_pcjr_device::pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: pc_t1t_device(mconfig, PCVIDEO_PCJR, tag, owner, clock),
-	m_pic8259(*this, ":pic8259"),
+pcvideo_pcjr_device::pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	pc_t1t_device(mconfig, PCVIDEO_PCJR, tag, owner, clock),
+	m_vsync_cb(*this),
 	m_jxkanji(nullptr)
 {
 }
 
 
-void pcvideo_t1000_device::device_start()
+void pc_t1t_device::device_start()
 {
-	if(!m_ram->started())
+	if (!m_ram->started())
 		throw device_missing_dependencies();
-	m_chr_gen = machine().root_device().memregion("gfx1")->base();
+}
+
+void pcvideo_t1000_device::device_start()
+{
+	pc_t1t_device::device_start();
+
 	m_bank = 0;
 	m_chr_size = 1;
 	m_ra_offset = 256;
@@ -84,9 +89,8 @@ void pcvideo_t1000_device::device_start()
 
 void pcvideo_pcjr_device::device_start()
 {
-	if(!m_ram->started())
-		throw device_missing_dependencies();
-	m_chr_gen = machine().root_device().memregion("gfx1")->base();
+	pc_t1t_device::device_start();
+
 	m_bank = 0;
 	m_mode_control = 0x08;
 	m_chr_size = 8;
@@ -120,7 +124,7 @@ void pcvideo_t1000_device::device_add_mconfig(machine_config &config)
 {
 	screen_device &screen(SCREEN(config, T1000_SCREEN_NAME, SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(14'318'181),912,0,640,262,0,200);
-	screen.set_screen_update(T1000_MC6845_NAME, FUNC(mc6845_device::screen_update));
+	screen.set_screen_update(m_mc6845, FUNC(mc6845_device::screen_update));
 
 	PALETTE(config, m_palette, FUNC(pcvideo_t1000_device::pcjr_palette), 32);
 
@@ -140,7 +144,7 @@ void pcvideo_pcjr_device::device_add_mconfig(machine_config &config)
 {
 	screen_device &screen(SCREEN(config, T1000_SCREEN_NAME, SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(14'318'181), 912, 0, 640, 262, 0, 200);
-	screen.set_screen_update(T1000_MC6845_NAME, FUNC(mc6845_device::screen_update));
+	screen.set_screen_update(m_mc6845, FUNC(mc6845_device::screen_update));
 
 	PALETTE(config, m_palette, FUNC(pcvideo_pcjr_device::pcjr_palette), 32);
 
@@ -194,7 +198,7 @@ MC6845_UPDATE_ROW( pc_t1t_device::t1000_text_inten_update_row )
 		uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
 		uint8_t chr = m_displayram[ offset ];
 		uint8_t attr = m_displayram[ offset +1 ];
-		uint8_t data = m_chr_gen[ chr * m_chr_size + ra * m_ra_offset ];
+		uint8_t data = m_chr_gen[chr * m_chr_size + ra * m_ra_offset];
 		uint16_t fg = m_palette_base + ( attr & 0x0F );
 		uint16_t bg = m_palette_base + ( ( attr >> 4 ) & 0x07 );
 
@@ -225,7 +229,7 @@ MC6845_UPDATE_ROW( pc_t1t_device::t1000_text_blink_update_row )
 		uint16_t offset = ( ( ma + i ) << 1 ) & 0x3fff;
 		uint8_t chr = m_displayram[ offset ];
 		uint8_t attr = m_displayram[ offset +1 ];
-		uint8_t data = m_chr_gen[ chr * m_chr_size + ra * m_ra_offset ];
+		uint8_t data = m_chr_gen[chr * m_chr_size + ra * m_ra_offset];
 		uint16_t fg = m_palette_base + ( attr & 0x0F );
 		uint16_t bg = m_palette_base + ( ( attr >> 4 ) & 0x07 );
 
@@ -929,7 +933,7 @@ void pcvideo_pcjr_device::write(offs_t offset, uint8_t data)
 		case 12:
 			break;
 		case 15:
-			if(m_jxkanji)
+			if (m_jxkanji)
 				pc_pcjx_bank_w(data);
 			else
 				pc_pcjr_bank_w(data);
@@ -943,9 +947,9 @@ void pcvideo_pcjr_device::write(offs_t offset, uint8_t data)
 
 uint8_t pc_t1t_device::read(offs_t offset)
 {
-	int             data = 0xff;
+	int data = 0xff;
 
-	switch( offset )
+	switch (offset)
 	{
 		case 0: case 2: case 4: case 6:
 			/* return last written mc6845 address value here? */
@@ -1002,15 +1006,15 @@ void pcvideo_pcjr_device::de_changed(int state)
 void pcvideo_t1000_device::t1000_vsync_changed(int state)
 {
 	m_vsync = state ? 8 : 0;
-	if ( state )
+	if (state)
 	{
 		m_pc_framecnt++;
 	}
 }
 
 void pcvideo_t1000_device::disable_w(int state)
 {
-	if(state)
+	if (state)
 		m_vram->set_bank(8);
 	else
 		bank_w(m_bank);
@@ -1020,9 +1024,9 @@ void pcvideo_t1000_device::disable_w(int state)
 void pcvideo_pcjr_device::pcjr_vsync_changed(int state)
 {
 	m_vsync = state ? 8 : 0;
-	if ( state )
+	if (state)
 	{
 		m_pc_framecnt++;
 	}
-	m_pic8259->ir5_w(state);
+	m_vsync_cb(state);
 }

src/mame/pc/pc_t1t.h

@@ -5,18 +5,21 @@
 
 #pragma once
 
-#include "video/mc6845.h"
-#include "machine/ram.h"
 #include "machine/bankdev.h"
 #include "machine/pic8259.h"
+#include "machine/ram.h"
+#include "video/mc6845.h"
+
 #include "emupal.h"
 
 #define T1000_SCREEN_NAME   "screen"
-#define T1000_MC6845_NAME   "mc6845_t1000"
 
 class pc_t1t_device :  public device_t, public device_video_interface
 {
 public:
+	// configuration
+	template <typename T> pc_t1t_device &set_chr_gen_tag(T &&tag) { m_chr_gen.set_tag(std::forward<T>(tag)); return *this; }
+
 	void t1000_de_changed(int state);
 	uint8_t read(offs_t offset);
 
@@ -55,28 +58,7 @@ class pc_t1t_device :  public device_t, public device_video_interface
 	// construction/destruction
 	pc_t1t_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-	required_device<mc6845_device> m_mc6845;
-	uint8_t m_mode_control, m_color_select;
-	uint8_t m_status;
-
-	struct reg m_reg;
-
-	uint16_t m_bank;
-
-	int m_pc_framecnt;
-
-	uint8_t *m_displayram;
-
-	uint8_t  *m_chr_gen;
-	uint8_t  m_chr_size;
-	uint16_t m_ra_offset;
-
-	uint8_t   m_address_data_ff;
-
-	int     m_update_row_type;
-	uint8_t   m_display_enable;
-	uint8_t   m_vsync;
-	uint8_t   m_palette_base;
+	virtual void device_start() override ATTR_COLD;
 
 	void pcjr_palette(palette_device &palette) const;
 
@@ -89,9 +71,32 @@ class pc_t1t_device :  public device_t, public device_video_interface
 	int vga_data_r();
 	int bank_r();
 
+	required_region_ptr<uint8_t> m_chr_gen;
+	required_device<mc6845_device> m_mc6845;
 	required_device<palette_device> m_palette;
 	required_device<ram_device> m_ram;
 	required_device<address_map_bank_device> m_vram;
+
+	uint8_t m_mode_control, m_color_select;
+	uint8_t m_status;
+
+	struct reg m_reg;
+
+	uint16_t m_bank;
+
+	int m_pc_framecnt;
+
+	uint8_t *m_displayram;
+
+	uint8_t m_chr_size;
+	uint16_t m_ra_offset;
+
+	uint8_t m_address_data_ff;
+
+	int m_update_row_type;
+	uint8_t m_display_enable;
+	uint8_t m_vsync;
+	uint8_t m_palette_base;
 };
 
 class pcvideo_t1000_device :  public pc_t1t_device
@@ -125,6 +130,9 @@ class pcvideo_pcjr_device :  public pc_t1t_device
 	// construction/destruction
 	pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+	// configuration
+	auto vsync_callback() { return m_vsync_cb.bind(); }
+
 	void write(offs_t offset, uint8_t data);
 
 	void de_changed(int state);
@@ -135,8 +143,8 @@ class pcvideo_pcjr_device :  public pc_t1t_device
 	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
 	virtual void device_start() override ATTR_COLD;
 
-	required_device<pic8259_device> m_pic8259;
-	uint8_t   *m_jxkanji;
+	devcb_write_line m_vsync_cb;
+	const uint8_t *m_jxkanji;
 
 private:
 	void pc_pcjr_mode_switch();