stronger private: use (N, O, P, Q, R) (#3717)

* private N,O (nw)

* P + Q (nw)

* R (nt)

src/mame/drivers/n64.cpp

@@ -30,6 +30,10 @@ public:
 		: n64_state(mconfig, type, tag)
 		{ }
 
+	void n64(machine_config &config);
+	void n64dd(machine_config &config);
+
+private:
 	DECLARE_READ32_MEMBER(dd_null_r);
 	DECLARE_MACHINE_START(n64dd);
 	INTERRUPT_GEN_MEMBER(n64_reset_poll);
@@ -39,8 +43,6 @@ public:
 	void disk_unload(device_image_interface &image);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER( n64dd );
 	DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( n64dd );
-	void n64(machine_config &config);
-	void n64dd(machine_config &config);
 	void n64_map(address_map &map);
 	void n64dd_map(address_map &map);
 	void rsp_map(address_map &map);

src/mame/drivers/nakajies.cpp

@@ -293,6 +293,14 @@ public:
 			m_maincpu(*this, "v20hl")
 		{}
 
+	void nakajies210(machine_config &config);
+	void nakajies220(machine_config &config);
+	void nakajies250(machine_config &config);
+	void dator3k(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(trigger_irq);
+
+private:
 	required_device<cpu_device> m_maincpu;
 
 	virtual void machine_start() override;
@@ -340,12 +348,7 @@ public:
 	uint8_t   m_bank[8];
 	uint8_t   *m_bank_base[8];
 	DECLARE_PALETTE_INIT(nakajies);
-	DECLARE_INPUT_CHANGED_MEMBER(trigger_irq);
 	TIMER_DEVICE_CALLBACK_MEMBER(kb_timer);
-	void nakajies210(machine_config &config);
-	void nakajies220(machine_config &config);
-	void nakajies250(machine_config &config);
-	void dator3k(machine_config &config);
 	void nakajies_io_map(address_map &map);
 	void nakajies_map(address_map &map);
 };

src/mame/drivers/namcops2.cpp

@@ -885,12 +885,13 @@ public:
 			m_maincpu(*this, "maincpu")
 	{ }
 
-	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
 	void system246(machine_config &config);
 	void system256(machine_config &config);
+
+private:
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
 	void ps2_map(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/namcos10.cpp

@@ -408,6 +408,30 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu") { }
 
+	void ns10_konotako(machine_config &config);
+	void ns10_mrdrilr2(machine_config &config);
+	void ns10_knpuzzle(machine_config &config);
+	void ns10_chocovdr(machine_config &config);
+	void ns10_startrgn(machine_config &config);
+	void namcos10_memm(machine_config &config);
+	void namcos10_memn(machine_config &config);
+	void ns10_gjspace(machine_config &config);
+	void ns10_nflclsfb(machine_config &config);
+	void ns10_gamshara(machine_config &config);
+
+	void init_knpuzzle();
+	void init_panikuru();
+	void init_mrdrilr2();
+	void init_startrgn();
+	void init_gunbalna();
+	void init_nflclsfb();
+	void init_gjspace();
+	void init_gamshara();
+	void init_mrdrilrg();
+	void init_chocovdr();
+	void init_konotako();
+
+private:
 	// memm variant interface
 	DECLARE_WRITE16_MEMBER(crypto_switch_w);
 	DECLARE_READ16_MEMBER(range_r);
@@ -437,20 +461,10 @@ public:
 	uint8_t *nand_base;
 	void nand_copy( uint32_t *dst, uint32_t address, int len );
 
-	void ns10_konotako(machine_config &config);
-	void ns10_mrdrilr2(machine_config &config);
-	void ns10_knpuzzle(machine_config &config);
-	void ns10_chocovdr(machine_config &config);
-	void ns10_startrgn(machine_config &config);
-	void namcos10_memm(machine_config &config);
-	void namcos10_memn(machine_config &config);
-	void ns10_gjspace(machine_config &config);
-	void ns10_nflclsfb(machine_config &config);
-	void ns10_gamshara(machine_config &config);
 	void namcos10_map(address_map &map);
 	void namcos10_memm_map(address_map &map);
 	void namcos10_memn_map(address_map &map);
-private:
+
 	enum {
 		I2CP_IDLE,
 		I2CP_RECIEVE_BYTE,
@@ -473,18 +487,7 @@ private:
 	uint16_t nand_read2( uint32_t address );
 
 	void i2c_update();
-public:
+
-	void init_knpuzzle();
-	void init_panikuru();
-	void init_mrdrilr2();
-	void init_startrgn();
-	void init_gunbalna();
-	void init_nflclsfb();
-	void init_gjspace();
-	void init_gamshara();
-	void init_mrdrilrg();
-	void init_chocovdr();
-	void init_konotako();
 	DECLARE_MACHINE_RESET(namcos10);
 	void memn_driver_init(  );
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/namcos11.cpp

@@ -323,19 +323,6 @@ public:
 	{
 	}
 
-	DECLARE_WRITE16_MEMBER(rom8_w);
-	DECLARE_WRITE16_MEMBER(rom8_64_upper_w);
-	DECLARE_WRITE16_MEMBER(rom8_64_w);
-	DECLARE_WRITE16_MEMBER(lightgun_w);
-	DECLARE_READ16_MEMBER(lightgun_r);
-	DECLARE_READ16_MEMBER(c76_shared_r);
-	DECLARE_WRITE16_MEMBER(c76_shared_w);
-	DECLARE_READ16_MEMBER(c76_speedup_r);
-	DECLARE_WRITE16_MEMBER(c76_speedup_w);
-	TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq0_cb);
-	TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq2_cb);
-	TIMER_DEVICE_CALLBACK_MEMBER(mcu_adc_cb);
-
 	void coh110(machine_config &config);
 	void coh100(machine_config &config);
 	void myangel3(machine_config &config);
@@ -350,16 +337,30 @@ public:
 	void souledge(machine_config &config);
 	void tekken(machine_config &config);
 	void tekken2(machine_config &config);
+
+private:
+	DECLARE_WRITE16_MEMBER(rom8_w);
+	DECLARE_WRITE16_MEMBER(rom8_64_upper_w);
+	DECLARE_WRITE16_MEMBER(rom8_64_w);
+	DECLARE_WRITE16_MEMBER(lightgun_w);
+	DECLARE_READ16_MEMBER(lightgun_r);
+	DECLARE_READ16_MEMBER(c76_shared_r);
+	DECLARE_WRITE16_MEMBER(c76_shared_w);
+	DECLARE_READ16_MEMBER(c76_speedup_r);
+	DECLARE_WRITE16_MEMBER(c76_speedup_w);
+	TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq0_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(mcu_irq2_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(mcu_adc_cb);
+
 	void c76_io_map(address_map &map);
 	void c76_map(address_map &map);
 	void namcos11_map(address_map &map);
 	void ptblank2ua_map(address_map &map);
 	void rom8_64_map(address_map &map);
 	void rom8_map(address_map &map);
-protected:
+
 	virtual void driver_start() override;
 
-private:
 	required_shared_ptr<uint16_t> m_sharedram;
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_mcu;

src/mame/drivers/namcos12.cpp

@@ -1106,8 +1106,8 @@ class namcos12_state : public driver_device
 public:
 	namcos12_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_maincpu(*this, "maincpu")
 		, m_ram(*this, "maincpu:ram")
+		, m_maincpu(*this, "maincpu")
 		, m_sub(*this, "sub")
 		, m_adc(*this, "sub:adc")
 		, m_rtc(*this, "rtc")
@@ -1121,8 +1121,38 @@ public:
 	{
 	}
 
-	required_device<psxcpu_device> m_maincpu;
+	void coh700(machine_config &config);
+	void coh716(machine_config &config);
+	void namcos12_mobo(machine_config &config);
+
+	void init_namcos12();
+	void init_ptblank2();
+	void init_technodr();
+	void init_golgo13();
+
+protected:
+	virtual void machine_reset() override;
+
+	void golgo13_h8iomap(address_map &map);
+	void jvsiomap(address_map &map);
+	void jvsmap(address_map &map);
+	void namcos12_map(address_map &map);
+	void plarailjvsiomap(address_map &map);
+	void plarailjvsmap(address_map &map);
+	void ptblank2_map(address_map &map);
+	void s12h8iomap(address_map &map);
+	void s12h8jvsiomap(address_map &map);
+	void s12h8railiomap(address_map &map);
+	void s12h8rwjvsmap(address_map &map);
+	void s12h8rwmap(address_map &map);
+	void tdjvsiomap(address_map &map);
+	void tdjvsmap(address_map &map);
+	void tektagt_map(address_map &map);
+
 	required_device<ram_device> m_ram;
+
+private:
+	required_device<psxcpu_device> m_maincpu;
 	required_device<h83002_device> m_sub;
 	required_device<h8_adc_device> m_adc;
 	required_device<rtc4543_device> m_rtc;
@@ -1175,34 +1205,9 @@ public:
 	DECLARE_READ16_MEMBER(s12_mcu_gun_h_r);
 	DECLARE_READ16_MEMBER(s12_mcu_gun_v_r);
 
-	void init_namcos12();
-	void init_ptblank2();
-	void init_technodr();
-	void init_golgo13();
 	inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... );
 	void namcos12_rom_read( uint32_t *p_n_psxram, uint32_t n_address, int32_t n_size );
 	void namcos12_sub_irq( screen_device &screen, bool vblank_state );
-
-	void coh700(machine_config &config);
-	void coh716(machine_config &config);
-	void namcos12_mobo(machine_config &config);
-	void golgo13_h8iomap(address_map &map);
-	void jvsiomap(address_map &map);
-	void jvsmap(address_map &map);
-	void namcos12_map(address_map &map);
-	void plarailjvsiomap(address_map &map);
-	void plarailjvsmap(address_map &map);
-	void ptblank2_map(address_map &map);
-	void s12h8iomap(address_map &map);
-	void s12h8jvsiomap(address_map &map);
-	void s12h8railiomap(address_map &map);
-	void s12h8rwjvsmap(address_map &map);
-	void s12h8rwmap(address_map &map);
-	void tdjvsiomap(address_map &map);
-	void tdjvsmap(address_map &map);
-	void tektagt_map(address_map &map);
-protected:
-	virtual void machine_reset() override;
 };
 
 
@@ -1217,7 +1222,7 @@ public:
 	void truckk(machine_config &config);
 	void tektagt(machine_config &config);
 	void ptblank2(machine_config &config);
-protected:
+private:
 	virtual void machine_reset() override;
 };
 

src/mame/drivers/namcos23.cpp

@@ -1435,6 +1435,16 @@ public:
 		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
+	void timecrs2v4a(machine_config &config);
+	void ss23e2(machine_config &config);
+	void gorgon(machine_config &config);
+	void ss23(machine_config &config);
+	void s23(machine_config &config);
+	void gmen(machine_config &config);
+	void timecrs2(machine_config &config);
+
+	void init_s23();
+	
 	render_t m_render;
 	const uint16_t *m_tmlrom;
 	const uint8_t *m_tmhrom;
@@ -1442,6 +1452,7 @@ public:
 	uint32_t m_tileid_mask;
 	uint32_t m_tile_mask;
 
+private:
 	void update_main_interrupts(uint32_t cause);
 	void update_mixer();
 
@@ -1491,7 +1502,7 @@ public:
 	DECLARE_READ16_MEMBER(iob_analog_r);
 	DECLARE_WRITE16_MEMBER(c435_state_pio_w);
 	DECLARE_WRITE16_MEMBER(c435_state_reset_w);
-	void init_s23();
+
 	TILE_GET_INFO_MEMBER(TextTilemapGetInfo);
 	DECLARE_VIDEO_START(s23);
 	DECLARE_MACHINE_RESET(gmen);
@@ -1530,13 +1541,7 @@ public:
 	void render_project(poly_vertex &pv);
 	void render_one_model(const namcos23_render_entry *re);
 	void render_run(bitmap_rgb32 &bitmap);
-	void timecrs2v4a(machine_config &config);
+
-	void ss23e2(machine_config &config);
-	void gorgon(machine_config &config);
-	void ss23(machine_config &config);
-	void s23(machine_config &config);
-	void gmen(machine_config &config);
-	void timecrs2(machine_config &config);
 	void gmen_mips_map(address_map &map);
 	void gmen_sh2_map(address_map &map);
 	void gorgon_map(address_map &map);
@@ -1547,7 +1552,6 @@ public:
 	void s23iobrdmap(address_map &map);
 	void timecrs2iobrdmap(address_map &map);
 
-protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 

src/mame/drivers/nanos.cpp

@@ -50,6 +50,9 @@ public:
 		, m_linec(*this, "LINEC")
 	{ }
 
+	void nanos(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER( nanos_tc_w );
 	DECLARE_WRITE_LINE_MEMBER( ctc_z0_w );
 	DECLARE_WRITE_LINE_MEMBER( ctc_z1_w );
@@ -62,10 +65,9 @@ public:
 	DECLARE_FLOPPY_FORMATS( floppy_formats );
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void nanos(machine_config &config);
 	void nanos_io(address_map &map);
 	void nanos_mem(address_map &map);
-private:
+
 	uint8_t m_key_command;
 	uint8_t m_last_code;
 	uint8_t m_key_pressed;

src/mame/drivers/nascom1.cpp

@@ -50,19 +50,36 @@ public:
 	nascom_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG),
 		m_hd6402(*this, "hd6402"),
 		m_cassette(*this, "cassette"),
-		m_ram(*this, RAM_TAG),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
 		m_videoram(*this, "videoram"),
 		m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
+	void nascom(machine_config &config);
+
+	void init_nascom();
+
+protected:
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
+
+	virtual void machine_reset() override;
+
+	DECLARE_READ8_MEMBER(nascom1_port_00_r);
+	DECLARE_WRITE8_MEMBER(nascom1_port_00_w);
+	DECLARE_READ8_MEMBER(nascom1_port_01_r);
+	DECLARE_WRITE8_MEMBER(nascom1_port_01_w);
+	DECLARE_READ8_MEMBER(nascom1_port_02_r);
+
+	void screen_update(bitmap_ind16 &bitmap, const rectangle &cliprect, int char_height);
+
+private:
 	required_device<ay31015_device> m_hd6402;
 	required_device<cassette_image_device> m_cassette;
-	required_device<ram_device> m_ram;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 	required_shared_ptr<uint8_t> m_videoram;
@@ -73,25 +90,12 @@ public:
 	int m_tape_index;
 	nascom1_portstat_t m_portstat;
 
-	DECLARE_READ8_MEMBER(nascom1_port_00_r);
-	DECLARE_WRITE8_MEMBER(nascom1_port_00_w);
-	DECLARE_READ8_MEMBER(nascom1_port_01_r);
-	DECLARE_WRITE8_MEMBER(nascom1_port_01_w);
-	DECLARE_READ8_MEMBER(nascom1_port_02_r);
-	void init_nascom();
-	void screen_update(bitmap_ind16 &bitmap, const rectangle &cliprect, int char_height);
 	DECLARE_READ_LINE_MEMBER(nascom1_hd6402_si);
 	DECLARE_WRITE_LINE_MEMBER(nascom1_hd6402_so);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER( nascom1_cassette );
 	DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette );
 	DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 );
 
-	void nascom(machine_config &config);
-protected:
-	virtual void machine_reset() override;
-
-private:
-
 };
 
 class nascom1_state : public nascom_state
@@ -101,12 +105,13 @@ public:
 		nascom_state(mconfig, type, tag)
 	{ }
 
+	void nascom1(machine_config &config);
+
 	uint32_t screen_update_nascom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void nascom1(machine_config &config);
+private:
 	void nascom1_io(address_map &map);
 	void nascom1_mem(address_map &map);
-private:
 };
 
 class nascom2_state : public nascom_state
@@ -120,25 +125,27 @@ public:
 		m_lsw1(*this, "lsw1")
 	{ }
 
-	DECLARE_WRITE_LINE_MEMBER(ram_disable_w);
+	void nascom2(machine_config &config);
-	DECLARE_WRITE_LINE_MEMBER(ram_disable_cpm_w);
+	void nascom2c(machine_config &config);
+
 	void init_nascom2();
 	void init_nascom2c();
+
+private:
+	DECLARE_WRITE_LINE_MEMBER(ram_disable_w);
+	DECLARE_WRITE_LINE_MEMBER(ram_disable_cpm_w);
 	uint32_t screen_update_nascom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, int slot_id);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket1_load) { return load_cart(image, m_socket1, 1); }
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(socket2_load) { return load_cart(image, m_socket2, 2); }
 
-	void nascom2(machine_config &config);
-	void nascom2c(machine_config &config);
 	void nascom2_io(address_map &map);
 	void nascom2_mem(address_map &map);
 	void nascom2c_mem(address_map &map);
-protected:
+
 	virtual void machine_reset() override;
 
-private:
 	required_device<nasbus_device> m_nasbus;
 	required_device<generic_slot_device> m_socket1;
 	required_device<generic_slot_device> m_socket2;

src/mame/drivers/nc.cpp

@@ -101,7 +101,6 @@
 #include "cpu/z80/z80.h"
 #include "machine/mc146818.h"   // for NC200 real time clock
 #include "machine/rp5c01.h"     // for NC100 real time clock
-#include "machine/upd765.h"     // for NC200 disk drive interface
 #include "formats/pc_dsk.h"     // for NC200 disk image
 #include "rendlay.h"
 #include "screen.h"
@@ -677,7 +676,7 @@ WRITE8_MEMBER(nc_state::nc_uart_control_w)
 		/* changed uart from off to on */
 		if ((data & (1<<3))==0)
 		{
-			machine().device("uart")->reset();
+			m_uart->reset();
 		}
 	}
 
@@ -1228,13 +1227,12 @@ WRITE8_MEMBER(nc200_state::nc200_uart_control_w)
 
 WRITE8_MEMBER(nc200_state::nc200_memory_card_wait_state_w)
 {
-	upd765a_device *fdc = machine().device<upd765a_device>("upd765");
 	LOGDEBUG("nc200 memory card wait state: PC: %04x %02x\n", m_maincpu->pc(), data);
 #if 0
 	floppy_drive_set_motor_state(0, 1);
 	floppy_drive_set_ready_state(0, 1, 1);
 #endif
-	fdc->tc_w(data & 0x01);
+	m_fdc->tc_w(data & 0x01);
 }
 
 /* bit 2: backlight: 1=off, 0=on */

src/mame/drivers/neoprint.cpp

@@ -49,8 +49,18 @@ public:
 		m_generic_paletteram_16(*this, "paletteram")
 	{ }
 
+	void neoprint(machine_config &config);
+	void nprsp(machine_config &config);
+
+	void init_98best44();
+	void init_npcartv1();
+	void init_nprsp();
+	void init_unkneo();
+
 	static constexpr feature_type unemulated_features() { return feature::CAMERA | feature::PRINTER; }
 
+private:
+
 	DECLARE_READ8_MEMBER(neoprint_calendar_r);
 	DECLARE_WRITE8_MEMBER(neoprint_calendar_w);
 	DECLARE_READ8_MEMBER(neoprint_unk_r);
@@ -62,25 +72,18 @@ public:
 	DECLARE_WRITE16_MEMBER(nprsp_palette_w);
 	DECLARE_WRITE8_MEMBER(nprsp_bank_w);
 	DECLARE_READ16_MEMBER(rom_window_r);
-	void init_98best44();
-	void init_npcartv1();
-	void init_nprsp();
-	void init_unkneo();
 	DECLARE_MACHINE_RESET(nprsp);
 	uint32_t screen_update_neoprint(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_nprsp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void neoprint(machine_config &config);
-	void nprsp(machine_config &config);
 	void neoprint_audio_io_map(address_map &map);
 	void neoprint_audio_map(address_map &map);
 	void neoprint_map(address_map &map);
 	void nprsp_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 	virtual void video_start() override;
 
-private:
 	required_shared_ptr<uint16_t> m_npvidram;
 	required_shared_ptr<uint16_t> m_npvidregs;
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/neptunp2.cpp

@@ -24,14 +24,15 @@ public:
 			m_maincpu(*this, "maincpu")
 	{ }
 
+	void neptunp2(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(test_r);
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void neptunp2(machine_config &config);
 	void neptunp2_io(address_map &map);
 	void neptunp2_map(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/nes_vt.cpp

@@ -101,9 +101,24 @@ public:
 		, m_prgbank3(*this, "prg_bank3")
 		, m_prgrom(*this, "mainrom")
 		, m_csel(*this, "CARTSEL")
-
 		{ }
 
+	void nes_vt(machine_config &config);
+
+	void nes_vt_hum(machine_config &config);
+	void nes_vt_pjoy(machine_config &config);
+	void nes_vt_sp69(machine_config &config);
+
+	void nes_vt_xx(machine_config &config);
+	void nes_vt_hh(machine_config &config);
+	void nes_vt_cy(machine_config &config);
+	void nes_vt_dg(machine_config &config);
+	void nes_vt_bt(machine_config &config);
+	void nes_vt_vg(machine_config &config);
+	void nes_vt_fp(machine_config &config);
+	void nes_vt_fa(machine_config &config);
+
+private:
 	/* APU handling */
 	DECLARE_WRITE_LINE_MEMBER(apu_irq);
 	DECLARE_READ8_MEMBER(apu_read_mem);
@@ -164,22 +179,6 @@ public:
 
 	DECLARE_WRITE8_MEMBER(chr_w);
 
-	void nes_vt(machine_config &config);
-
-	void nes_vt_hum(machine_config &config);
-	void nes_vt_pjoy(machine_config &config);
-	void nes_vt_sp69(machine_config &config);
-
-
-	void nes_vt_xx(machine_config &config);
-	void nes_vt_hh(machine_config &config);
-	void nes_vt_cy(machine_config &config);
-	void nes_vt_dg(machine_config &config);
-	void nes_vt_bt(machine_config &config);
-	void nes_vt_vg(machine_config &config);
-	void nes_vt_fp(machine_config &config);
-	void nes_vt_fa(machine_config &config);
-
 	void nes_vt_hum_map(address_map &map);
 	void nes_vt_pjoy_map(address_map &map);
 	void nes_vt_sp69_map(address_map &map);
@@ -192,7 +191,6 @@ public:
 	void nes_vt_fa_map(address_map &map);
 	void nes_vt_fp_map(address_map &map);
 	void prg_map(address_map &map);
-private:
 
 	/* expansion nametable - todo, see if we can refactor NES code to be reusable without having to add full NES bus etc. */
 	std::unique_ptr<uint8_t[]> m_ntram;

src/mame/drivers/nexus3d.cpp

@@ -34,6 +34,11 @@ public:
 		m_serflash(*this, "flash")
 	{ }
 
+	void nexus3d(machine_config &config);
+
+	void init_nexus3d();
+
+private:
 	required_shared_ptr<uint32_t> m_mainram;
 	required_device<cpu_device> m_maincpu;
 	required_device<serflash_device> m_serflash;
@@ -44,11 +49,9 @@ public:
 //  DECLARE_WRITE32_MEMBER(nexus3d_unk2_w);
 //  DECLARE_WRITE32_MEMBER(nexus3d_unk3_w);
 
-	void init_nexus3d();
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	uint32_t screen_update_nexus3d(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void nexus3d(machine_config &config);
 	void nexus3d_map(address_map &map);
 };
 

src/mame/drivers/ngen.cpp

@@ -101,16 +101,15 @@ public:
 		m_hd_buffer(*this,"hd_buffer_ram")
 	{}
 
+	void ngen(machine_config &config);
+
+	DECLARE_READ8_MEMBER(hd_buffer_r);
+	DECLARE_WRITE8_MEMBER(hd_buffer_w);
+
 	DECLARE_WRITE_LINE_MEMBER(pit_out0_w);
 	DECLARE_WRITE_LINE_MEMBER(pit_out1_w);
 	DECLARE_WRITE_LINE_MEMBER(pit_out2_w);
-	DECLARE_WRITE_LINE_MEMBER(cpu_timer_w);
+
-	DECLARE_WRITE_LINE_MEMBER(timer_clk_out);
-	DECLARE_WRITE16_MEMBER(cpu_peripheral_cb);
-	DECLARE_WRITE16_MEMBER(peripheral_w);
-	DECLARE_READ16_MEMBER(peripheral_r);
-	DECLARE_WRITE16_MEMBER(xbus_w);
-	DECLARE_READ16_MEMBER(xbus_r);
 	DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed);
 	DECLARE_WRITE_LINE_MEMBER(dma_eop_changed);
 	DECLARE_WRITE_LINE_MEMBER(dack0_w);
@@ -119,7 +118,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(dack3_w);
 	DECLARE_READ8_MEMBER(dma_read_word);
 	DECLARE_WRITE8_MEMBER(dma_write_word);
-	MC6845_UPDATE_ROW(crtc_update_row);
 	// TODO: sort out what devices use which channels
 	DECLARE_READ8_MEMBER( dma_0_dack_r ) { uint16_t ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
 	DECLARE_READ8_MEMBER( dma_1_dack_r ) { uint16_t ret = 0xffff; m_dma_high_byte = ret & 0xff00; return ret; }
@@ -129,33 +127,46 @@ public:
 	DECLARE_WRITE8_MEMBER( dma_1_dack_w ){  }
 	DECLARE_WRITE8_MEMBER( dma_2_dack_w ){  }
 	DECLARE_WRITE8_MEMBER( dma_3_dack_w ){ popmessage("IOW3: data %02x",data); }
+	
+	MC6845_UPDATE_ROW(crtc_update_row);
+
+	DECLARE_WRITE_LINE_MEMBER(timer_clk_out);
+	
+	DECLARE_WRITE_LINE_MEMBER(fdc_irq_w);
+
+protected:
+	void ngen386_io(address_map &map);
+	void ngen386_mem(address_map &map);
+	void ngen386i_mem(address_map &map);
+	
+
+private:
+	DECLARE_WRITE16_MEMBER(cpu_peripheral_cb);
+	DECLARE_WRITE16_MEMBER(peripheral_w);
+	DECLARE_READ16_MEMBER(peripheral_r);
+	DECLARE_WRITE16_MEMBER(xbus_w);
+	DECLARE_READ16_MEMBER(xbus_r);
+
+	DECLARE_WRITE_LINE_MEMBER(cpu_timer_w);
 
 	DECLARE_WRITE16_MEMBER(hfd_w);
 	DECLARE_READ16_MEMBER(hfd_r);
-	DECLARE_WRITE_LINE_MEMBER(fdc_irq_w);
 	DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
 	DECLARE_WRITE8_MEMBER(fdc_control_w);
 	DECLARE_READ8_MEMBER(irq_cb);
 	DECLARE_WRITE8_MEMBER(hdc_control_w);
 	DECLARE_WRITE8_MEMBER(disk_addr_ext);
-	DECLARE_READ8_MEMBER(hd_buffer_r);
-	DECLARE_WRITE8_MEMBER(hd_buffer_w);
 
 	DECLARE_READ16_MEMBER(b38_keyboard_r);
 	DECLARE_WRITE16_MEMBER(b38_keyboard_w);
 	DECLARE_READ16_MEMBER(b38_crtc_r);
 	DECLARE_WRITE16_MEMBER(b38_crtc_w);
-	void ngen(machine_config &config);
-	void ngen386_io(address_map &map);
-	void ngen386_mem(address_map &map);
-	void ngen386i_mem(address_map &map);
 	void ngen_io(address_map &map);
 	void ngen_mem(address_map &map);
-protected:
+
 	virtual void machine_reset() override;
 	virtual void machine_start() override;
 
-private:
 	optional_device<i80186_cpu_device> m_maincpu;
 	optional_device<i386_device> m_i386cpu;
 	required_device<mc6845_device> m_crtc;

src/mame/drivers/ngp.cpp

@@ -153,6 +153,14 @@ public:
 			m_nvram_loaded = false;
 		}
 
+	void ngp_common(machine_config &config);
+	void ngp(machine_config &config);
+	void ngpc(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(power_callback);
+
+private:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
@@ -196,19 +204,15 @@ public:
 	DECLARE_WRITE_LINE_MEMBER( ngp_hblank_pin_w );
 	DECLARE_WRITE8_MEMBER( ngp_tlcs900_porta );
 	uint32_t screen_update_ngp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	DECLARE_INPUT_CHANGED_MEMBER(power_callback);
 	TIMER_CALLBACK_MEMBER(ngp_seconds_callback);
 
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER( ngp_cart);
 	DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( ngp_cart );
 
-	void ngp_common(machine_config &config);
-	void ngp(machine_config &config);
-	void ngpc(machine_config &config);
 	void ngp_mem(address_map &map);
 	void z80_io(address_map &map);
 	void z80_mem(address_map &map);
-protected:
+
 	bool m_nvram_loaded;
 	required_ioport m_io_controls;
 	required_ioport m_io_power;

src/mame/drivers/nibble.cpp

@@ -67,6 +67,9 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_gfxdecode(*this, "gfxdecode") { }
 
+	void nibble(machine_config &config);
+
+private:
 	required_shared_ptr<uint16_t> m_videoram;
 	tilemap_t *m_bg_tilemap;
 	DECLARE_WRITE16_MEMBER(nibble_videoram_w);
@@ -80,7 +83,6 @@ public:
 	INTERRUPT_GEN_MEMBER(nibble_interrupt);
 	required_device<cpu_device> m_maincpu;
 	required_device<gfxdecode_device> m_gfxdecode;
-	void nibble(machine_config &config);
 	void nibble_cru_map(address_map &map);
 	void nibble_map(address_map &map);
 };

src/mame/drivers/nichild.cpp

@@ -49,6 +49,9 @@ public:
 	{
 	}
 
+	void nichild(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(gfx_r);
 	DECLARE_READ8_MEMBER(mux_r);
 	DECLARE_WRITE8_MEMBER(mux_w);
@@ -59,16 +62,13 @@ public:
 	DECLARE_WRITE8_MEMBER(gfxbank_w);
 	INTERRUPT_GEN_MEMBER(vdp_irq);
 
-	void nichild(machine_config &config);
-
 	void nichild_io(address_map &map);
 	void nichild_map(address_map &map);
-protected:
+
 	// driver_device overrides
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<v9938_device> m_v9938;
 	required_region_ptr<uint8_t> m_gfxrom;

src/mame/drivers/nightgal.cpp

@@ -72,7 +72,16 @@ public:
 		m_palette(*this, "palette"),
 		m_blitter(*this, "blitter") { }
 
+	void ngalsumr(machine_config &config);
+	void sexygal(machine_config &config);
+	void sweetgal(machine_config &config);
+	void sgaltrop(machine_config &config);
+	void royalqn(machine_config &config);
 
+	void init_ngalsumr();
+	void init_royalqn();
+
+private:
 	emu_timer *m_z80_wait_ack_timer;
 
 	required_shared_ptr<uint8_t> m_comms_ram;
@@ -100,8 +109,6 @@ public:
 	DECLARE_WRITE8_MEMBER(sexygal_audioff_w);
 	DECLARE_WRITE8_MEMBER(sexygal_audionmi_w);
 
-	void init_ngalsumr();
-	void init_royalqn();
 	DECLARE_WRITE8_MEMBER(ngalsumr_prot_latch_w);
 	DECLARE_READ8_MEMBER(ngalsumr_prot_value_r);
 	virtual void machine_start() override;
@@ -110,11 +117,6 @@ public:
 	DECLARE_PALETTE_INIT(nightgal);
 	uint32_t screen_update_nightgal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void ngalsumr(machine_config &config);
-	void sexygal(machine_config &config);
-	void sweetgal(machine_config &config);
-	void sgaltrop(machine_config &config);
-	void royalqn(machine_config &config);
 	void common_nsc_map(address_map &map);
 	void common_sexygal_io(address_map &map);
 	void royalqn_io(address_map &map);
@@ -127,7 +129,7 @@ public:
 	void sgaltrop_io(address_map &map);
 	void sgaltrop_nsc_map(address_map &map);
 	void sweetgal_map(address_map &map);
-protected:
+
 	required_ioport m_io_cr_clear;
 	required_ioport m_io_coins;
 	required_ioport m_io_pl1_1;
@@ -153,7 +155,6 @@ protected:
 
 	std::unique_ptr<bitmap_ind16> m_tmp_bitmap;
 
-private:
 	/* video-related */
 	uint8_t m_blit_raw_data[3];
 

src/mame/drivers/nmg5.cpp

@@ -251,6 +251,18 @@ public:
 		m_soundlatch(*this, "soundlatch")
 	{ }
 
+	void nmg5(machine_config &config);
+	void pclubys(machine_config &config);
+	void garogun(machine_config &config);
+	void searchp2(machine_config &config);
+	void _7ordi(machine_config &config);
+
+	void init_prot_val_00();
+	void init_prot_val_10();
+	void init_prot_val_20();
+	void init_prot_val_40();
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint16_t> m_spriteram;
 	required_shared_ptr<uint16_t> m_scroll_ram;
@@ -284,10 +296,6 @@ public:
 	DECLARE_WRITE16_MEMBER(gfx_bank_w);
 	DECLARE_WRITE16_MEMBER(priority_reg_w);
 	DECLARE_WRITE8_MEMBER(oki_banking_w);
-	void init_prot_val_00();
-	void init_prot_val_10();
-	void init_prot_val_20();
-	void init_prot_val_40();
 	TILE_GET_INFO_MEMBER(fg_get_tile_info);
 	TILE_GET_INFO_MEMBER(bg_get_tile_info);
 	virtual void machine_start() override;
@@ -295,11 +303,6 @@ public:
 	virtual void video_start() override;
 	uint32_t screen_update_nmg5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_bitmap( bitmap_ind16 &bitmap );
-	void nmg5(machine_config &config);
-	void pclubys(machine_config &config);
-	void garogun(machine_config &config);
-	void searchp2(machine_config &config);
-	void _7ordi(machine_config &config);
 	void nmg5_map(address_map &map);
 	void nmg5_sound_map(address_map &map);
 	void pclubys_map(address_map &map);

src/mame/drivers/nokia_3310.cpp

@@ -38,15 +38,15 @@ public:
 		m_pwr(*this, "PWR")
 	{ }
 
-	DECLARE_INPUT_CHANGED_MEMBER(key_irq);
-
 	void noki3330(machine_config &config);
 	void noki3410(machine_config &config);
 	void noki7110(machine_config &config);
 	void noki6210(machine_config &config);
 	void noki3310(machine_config &config);
 
-protected:
+	DECLARE_INPUT_CHANGED_MEMBER(key_irq);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
@@ -71,7 +71,6 @@ protected:
 
 	void noki3310_map(address_map &map);
 
-private:
 	void assert_fiq(int num);
 	void assert_irq(int num);
 	void ack_fiq(uint16_t mask);

src/mame/drivers/notechan.cpp

@@ -309,18 +309,18 @@ public:
 		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
+	void notechan(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(out_f8_w);
 	DECLARE_WRITE8_MEMBER(out_f9_w);
 	DECLARE_WRITE8_MEMBER(out_fa_w);
 	DECLARE_WRITE8_MEMBER(out_ff_w);
-	void notechan(machine_config &config);
 	void notechan_map(address_map &map);
 	void notechan_port_map(address_map &map);
 
-protected:
 	virtual void machine_start() override { m_lamps.resolve(); }
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<okim6295_device> m_oki;
 	output_finder<32> m_lamps;

src/mame/drivers/notetaker.cpp

@@ -116,11 +116,6 @@ DONE:
 class notetaker_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_FIFOCLK,
-	};
-
 	notetaker_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag) ,
 		m_iop_cpu(*this, "iop_cpu"),
@@ -136,6 +131,17 @@ public:
 		m_floppy(nullptr)
 	{
 	}
+
+	void notetakr(machine_config &config);
+
+	void init_notetakr();
+
+private:
+	enum
+	{
+		TIMER_FIFOCLK,
+	};
+
 // devices
 	required_device<cpu_device> m_iop_cpu;
 	required_device<pic8259_device> m_iop_pic;
@@ -172,7 +178,6 @@ public:
 	// mem map stuff
 	DECLARE_READ16_MEMBER(iop_r);
 	DECLARE_WRITE16_MEMBER(iop_w);
-	void init_notetakr();
 	//variables
 	//  IPConReg
 	uint8_t m_BootSeqDone;
@@ -228,12 +233,11 @@ public:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
-	void notetakr(machine_config &config);
 	void iop_io(address_map &map);
 	void iop_mem(address_map &map);
 	void ep_io(address_map &map);
 	void ep_mem(address_map &map);
-protected:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 

src/mame/drivers/novag6502.cpp

@@ -83,6 +83,17 @@ public:
 		m_rombank(*this, "rombank")
 	{ }
 
+	void supercon(machine_config &config);
+	void cforte(machine_config &config);
+	void sforte_map(address_map &map);
+	void sexpert(machine_config &config);
+	void sforte(machine_config &config);
+
+	void init_sexpert();
+
+	DECLARE_INPUT_CHANGED_MEMBER(sexpert_cpu_freq);
+
+private:
 	optional_device<hlcd0538_device> m_hlcd0538;
 	optional_memory_bank m_rombank;
 
@@ -95,7 +106,6 @@ public:
 	DECLARE_READ8_MEMBER(supercon_input1_r);
 	DECLARE_READ8_MEMBER(supercon_input2_r);
 	void supercon_map(address_map &map);
-	void supercon(machine_config &config);
 
 	// Constellation Forte
 	void cforte_prepare_display();
@@ -103,7 +113,6 @@ public:
 	DECLARE_WRITE8_MEMBER(cforte_mux_w);
 	DECLARE_WRITE8_MEMBER(cforte_control_w);
 	void cforte_map(address_map &map);
-	void cforte(machine_config &config);
 
 	// Super Expert
 	DECLARE_WRITE8_MEMBER(sexpert_leds_w);
@@ -113,17 +122,12 @@ public:
 	DECLARE_READ8_MEMBER(sexpert_input1_r);
 	DECLARE_READ8_MEMBER(sexpert_input2_r);
 	DECLARE_MACHINE_RESET(sexpert);
-	void init_sexpert();
-	DECLARE_INPUT_CHANGED_MEMBER(sexpert_cpu_freq);
 	void sexpert_map(address_map &map);
 	void sexpert_set_cpu_freq();
-	void sexpert(machine_config &config);
 
 	// Super Forte
 	DECLARE_WRITE8_MEMBER(sforte_lcd_control_w);
 	DECLARE_WRITE8_MEMBER(sforte_lcd_data_w);
-	void sforte_map(address_map &map);
-	void sforte(machine_config &config);
 };
 
 

src/mame/drivers/novag68k.cpp

@@ -47,6 +47,10 @@ public:
 		: novagbase_state(mconfig, type, tag)
 	{ }
 
+	void diablo68k(machine_config &config);
+	void scorpio68k(machine_config &config);
+
+private:
 	TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M68K_IRQ_2, ASSERT_LINE); }
 	TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); }
 
@@ -57,12 +61,10 @@ public:
 	DECLARE_READ8_MEMBER(diablo68k_input1_r);
 	DECLARE_READ8_MEMBER(diablo68k_input2_r);
 	void diablo68k_map(address_map &map);
-	void diablo68k(machine_config &config);
 
 	// Scorpio 68000
 	DECLARE_WRITE8_MEMBER(scorpio68k_control_w);
 	void scorpio68k_map(address_map &map);
-	void scorpio68k(machine_config &config);
 };
 
 

src/mame/drivers/novagf8.cpp

@@ -36,20 +36,22 @@ public:
 		: novagbase_state(mconfig, type, tag)
 	{ }
 
+	void delta1(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(reset_button);
+
+private:
 	u8 m_io[2]; // F8 CPU I/O ports
 	F3853_INTERRUPT_REQ_CB(f3853_interrupt);
 
 	// Delta-1
-	DECLARE_INPUT_CHANGED_MEMBER(reset_button);
 	DECLARE_WRITE8_MEMBER(delta1_io0_w);
 	DECLARE_WRITE8_MEMBER(delta1_io1_w);
 	DECLARE_READ8_MEMBER(delta1_io0_r);
 	DECLARE_READ8_MEMBER(delta1_io1_r);
 	void delta1_io(address_map &map);
 	void delta1_map(address_map &map);
-	void delta1(machine_config &config);
 
-protected:
 	virtual void machine_start() override;
 };
 

src/mame/drivers/novagmcs48.cpp

@@ -45,15 +45,18 @@ public:
 		: novagbase_state(mconfig, type, tag)
 	{ }
 
+	void presto(machine_config &config);
+	void octo(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(octo_cpu_freq);
+
+private:
 	// Presto/Octo
 	DECLARE_WRITE8_MEMBER(presto_mux_w);
 	DECLARE_WRITE8_MEMBER(presto_control_w);
 	DECLARE_READ8_MEMBER(presto_input_r);
 	DECLARE_MACHINE_RESET(octo);
-	DECLARE_INPUT_CHANGED_MEMBER(octo_cpu_freq);
 	void octo_set_cpu_freq();
-	void presto(machine_config &config);
-	void octo(machine_config &config);
 };
 
 

src/mame/drivers/nsg6809.cpp

@@ -52,10 +52,9 @@ public:
 
 	void pitchhit(machine_config &config);
 
-protected:
+private:
 	void main_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/nss.cpp

@@ -318,6 +318,13 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void nss(machine_config &config);
+
+	void init_nss();
+
+	DECLARE_CUSTOM_INPUT_MEMBER(game_over_flag_r);
+
+private:
 	required_device<cpu_device> m_bioscpu;
 	required_device<m50458_device> m_m50458;
 	required_device<s3520cf_device> m_s3520cf;
@@ -343,15 +350,11 @@ public:
 	DECLARE_WRITE8_MEMBER(port_04_w);
 	DECLARE_WRITE8_MEMBER(port_07_w);
 
-	void init_nss();
-
-	DECLARE_CUSTOM_INPUT_MEMBER(game_over_flag_r);
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	DECLARE_WRITE_LINE_MEMBER(nss_vblank_irq);
 	DECLARE_READ8_MEMBER(spc_ram_100_r);
 	DECLARE_WRITE8_MEMBER(spc_ram_100_w);
-	void nss(machine_config &config);
 	void bios_io_map(address_map &map);
 	void bios_map(address_map &map);
 	void snes_map(address_map &map);

src/mame/drivers/nwk-tr.cpp

@@ -291,6 +291,12 @@ public:
 		m_palette(*this, "palette"),
 		m_generic_paletteram_32(*this, "paletteram") { }
 
+	void thrilld(machine_config &config);
+	void nwktr(machine_config &config);
+
+	void init_nwktr();
+
+private:
 	// TODO: Needs verification on real hardware
 	static const int m_sound_timer_usec = 2400;
 
@@ -335,15 +341,13 @@ public:
 	ADC12138_IPT_CONVERT_CB(adc12138_input_callback);
 
 	TIMER_CALLBACK_MEMBER(sound_irq);
-	void init_nwktr();
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	uint32_t screen_update_lscreen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_rscreen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	void lanc2_init();
-	void thrilld(machine_config &config);
+
-	void nwktr(machine_config &config);
 	void nwktr_map(address_map &map);
 	void sharc0_map(address_map &map);
 	void sharc1_map(address_map &map);

src/mame/drivers/nyny.cpp

@@ -114,6 +114,9 @@ public:
 		m_soundlatch2(*this, "soundlatch2"),
 		m_soundlatch3(*this, "soundlatch3") { }
 
+	void nyny(machine_config &config);
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_videoram1;
 	required_shared_ptr<uint8_t> m_colorram1;
@@ -158,7 +161,6 @@ public:
 
 	MC6845_UPDATE_ROW(crtc_update_row);
 	MC6845_END_UPDATE(crtc_end_update);
-	void nyny(machine_config &config);
 	void nyny_audio_1_map(address_map &map);
 	void nyny_audio_2_map(address_map &map);
 	void nyny_main_map(address_map &map);

src/mame/drivers/octopus.cpp

@@ -170,6 +170,9 @@ public:
 		m_z80_active(false)
 		{ }
 
+	void octopus(machine_config &config);
+
+private:
 	virtual void machine_reset() override;
 	virtual void machine_start() override;
 	virtual void video_start() override;
@@ -224,16 +227,14 @@ public:
 		BEEP_TIMER = 100
 	};
 
-	void octopus(machine_config &config);
 	void octopus_io(address_map &map);
 	void octopus_mem(address_map &map);
 	void octopus_sub_io(address_map &map);
 	void octopus_sub_mem(address_map &map);
 	void octopus_vram(address_map &map);
-protected:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_subcpu;
 	required_device<scn2674_device> m_crtc;

src/mame/drivers/odyssey.cpp

@@ -77,13 +77,15 @@ public:
 		m_maincpu(*this, "maincpu")
 	{ }
 
+	void odyssey(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void odyssey(machine_config &config);
 	void odyssey_map(address_map &map);
 };
 

src/mame/drivers/odyssey2.cpp

@@ -37,6 +37,16 @@ public:
 		m_keyboard(*this, "KEY.%u", 0),
 		m_joysticks(*this, "JOY.%u", 0) { }
 
+	void odyssey2_cartslot(machine_config &config);
+	void videopac(machine_config &config);
+	void odyssey2(machine_config &config);
+
+	void init_odyssey2();
+
+	uint32_t screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+protected:
+
 	required_device<cpu_device> m_maincpu;
 	required_device<i8244_device> m_i8244;
 	required_device<o2_cart_slot_device> m_cart;
@@ -45,29 +55,19 @@ public:
 	uint8_t m_p1;
 	uint8_t m_p2;
 	uint8_t m_lum;
-	DECLARE_READ8_MEMBER(io_read);
+
-	DECLARE_WRITE8_MEMBER(io_write);
+
-	DECLARE_READ8_MEMBER(bus_read);
-	DECLARE_WRITE8_MEMBER(bus_write);
-	DECLARE_READ8_MEMBER(p1_read);
-	DECLARE_WRITE8_MEMBER(p1_write);
-	DECLARE_READ8_MEMBER(p2_read);
-	DECLARE_WRITE8_MEMBER(p2_write);
 	DECLARE_READ_LINE_MEMBER(t1_read);
-	void init_odyssey2();
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
 	DECLARE_PALETTE_INIT(odyssey2);
-	uint32_t screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	DECLARE_WRITE16_MEMBER(scanline_postprocess);
 
-	void odyssey2_cartslot(machine_config &config);
-	void videopac(machine_config &config);
-	void odyssey2(machine_config &config);
 	void odyssey2_io(address_map &map);
 	void odyssey2_mem(address_map &map);
-protected:
+
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
 	/* constants */
 	static const uint8_t P1_BANK_LO_BIT          = 0x01;
 	static const uint8_t P1_BANK_HI_BIT          = 0x02;
@@ -80,6 +80,15 @@ protected:
 
 	required_ioport_array<6> m_keyboard;
 	required_ioport_array<2> m_joysticks;
+
+	DECLARE_READ8_MEMBER(io_read);
+	DECLARE_WRITE8_MEMBER(io_write);
+	DECLARE_READ8_MEMBER(bus_read);
+	DECLARE_WRITE8_MEMBER(bus_write);
+	DECLARE_READ8_MEMBER(p1_read);
+	DECLARE_WRITE8_MEMBER(p1_write);
+	DECLARE_READ8_MEMBER(p2_read);
+	DECLARE_WRITE8_MEMBER(p2_write);
 };
 
 class g7400_state : public odyssey2_state
@@ -91,6 +100,10 @@ public:
 		, m_ef9340_1(*this, "ef9340_1")
 	{ }
 
+	void g7400(machine_config &config);
+	void odyssey3(machine_config &config);
+
+private:
 	required_device<i8243_device> m_i8243;
 	required_device<ef9340_1_device> m_ef9340_1;
 
@@ -103,10 +116,8 @@ public:
 	DECLARE_WRITE8_MEMBER(i8243_port_w);
 	DECLARE_WRITE16_MEMBER(scanline_postprocess);
 
-	void g7400(machine_config &config);
-	void odyssey3(machine_config &config);
 	void g7400_io(address_map &map);
-protected:
+
 	uint8_t m_ic674_decode[8];
 	uint8_t m_ic678_decode[8];
 };

src/mame/drivers/okean240.cpp

@@ -64,11 +64,6 @@ Usage of terminal:
 class okean240_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_OKEAN_BOOT
-	};
-
 	okean240_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_term_data(0)
@@ -80,6 +75,18 @@ public:
 		, m_maincpu(*this, "maincpu")
 	{ }
 
+	void okean240a(machine_config &config);
+	void okean240t(machine_config &config);
+	void okean240(machine_config &config);
+
+	void init_okean240();
+
+private:
+	enum
+	{
+		TIMER_OKEAN_BOOT
+	};
+
 	DECLARE_READ8_MEMBER(okean240_kbd_status_r);
 	DECLARE_READ8_MEMBER(okean240a_kbd_status_r);
 	DECLARE_READ8_MEMBER(term_status_r);
@@ -92,17 +99,13 @@ public:
 	DECLARE_READ8_MEMBER(okean240a_port42_r);
 	void kbd_put(u8 data);
 	DECLARE_WRITE8_MEMBER(scroll_w);
-	void init_okean240();
 	uint32_t screen_update_okean240(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void okean240a(machine_config &config);
-	void okean240t(machine_config &config);
-	void okean240(machine_config &config);
 	void okean240_io(address_map &map);
 	void okean240_mem(address_map &map);
 	void okean240a_io(address_map &map);
 	void okean240t_io(address_map &map);
-private:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;

src/mame/drivers/olibochu.cpp

@@ -76,6 +76,9 @@ public:
 		m_palette(*this, "palette"),
 		m_soundlatch(*this, "soundlatch") { }
 
+	void olibochu(machine_config &config);
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_videoram;
 	required_shared_ptr<uint8_t> m_colorram;
@@ -105,7 +108,6 @@ public:
 	uint32_t screen_update_olibochu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(olibochu_scanline);
 	void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
-	void olibochu(machine_config &config);
 	void olibochu_map(address_map &map);
 	void olibochu_sound_map(address_map &map);
 };

src/mame/drivers/omegrace.cpp

@@ -241,18 +241,20 @@ public:
 		, m_leds(*this, "led%u", 0U)
 	{ }
 
+	void omegrace(machine_config &config);
+
+	void init_omegrace();
+
+private:
 	DECLARE_READ8_MEMBER(omegrace_vg_go_r);
 	DECLARE_READ8_MEMBER(omegrace_spinner1_r);
 	DECLARE_WRITE8_MEMBER(omegrace_leds_w);
 	DECLARE_WRITE8_MEMBER(omegrace_soundlatch_w);
-	void init_omegrace();
-	void omegrace(machine_config &config);
 	void main_map(address_map &map);
 	void port_map(address_map &map);
 	void sound_map(address_map &map);
 	void sound_port(address_map &map);
 
-protected:
 	virtual void machine_start() override { m_leds.resolve(); }
 	virtual void machine_reset() override;
 

src/mame/drivers/onetwo.cpp

@@ -68,6 +68,9 @@ public:
 		m_palette(*this, "palette"),
 		m_soundlatch(*this, "soundlatch") { }
 
+	void onetwo(machine_config &config);
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_paletteram;
 	required_shared_ptr<uint8_t> m_paletteram2;
@@ -94,7 +97,6 @@ public:
 	virtual void video_start() override;
 	uint32_t screen_update_onetwo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void set_color(int offset);
-	void onetwo(machine_config &config);
 	void main_cpu(address_map &map);
 	void main_cpu_io(address_map &map);
 	void sound_cpu(address_map &map);

src/mame/drivers/onyx.cpp

@@ -63,8 +63,6 @@ public:
 		, m_pio2(*this, "pio2")
 	{ }
 
-	DECLARE_MACHINE_RESET(c8002);
-
 	void c8002(machine_config &config);
 	void c5000(machine_config &config);
 	void c5000_io(address_map &map);
@@ -74,6 +72,8 @@ public:
 	void subio(address_map &map);
 	void submem(address_map &map);
 private:
+	DECLARE_MACHINE_RESET(c8002);
+
 	required_device<cpu_device> m_maincpu;
 	optional_device<z80sio_device> m_sio1, m_sio2, m_sio3, m_sio4, m_sio5;
 	optional_device<z80ctc_device> m_ctc1, m_ctc2, m_ctc3;

src/mame/drivers/osbexec.cpp

@@ -48,6 +48,11 @@ public:
 		, m_floppy1(*this, "mb8877:1:525ssdd")
 	{ }
 
+	void osbexec(machine_config &config);
+
+	void init_osbexec();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<screen_device> m_screen;
 	required_device<mb8877_device>  m_mb8877;
@@ -115,7 +120,6 @@ public:
 	DECLARE_WRITE8_MEMBER(osbexec_c000_w);
 	DECLARE_READ8_MEMBER(osbexec_kbd_r);
 	DECLARE_READ8_MEMBER(osbexec_rtc_r);
-	void init_osbexec();
 	virtual void machine_reset() override;
 	TIMER_CALLBACK_MEMBER(osbexec_video_callback);
 	DECLARE_READ8_MEMBER(osbexec_pia0_a_r);
@@ -129,7 +133,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(modem_dsr_w);
 	DECLARE_WRITE_LINE_MEMBER(modem_ri_w);
 	DECLARE_WRITE_LINE_MEMBER(comm_clk_a_w);
-	void osbexec(machine_config &config);
 	void osbexec_io(address_map &map);
 	void osbexec_mem(address_map &map);
 };

src/mame/drivers/otomedius.cpp

@@ -27,13 +27,15 @@ public:
 		m_maincpu(*this, "maincpu")
 	{ }
 
+	void konami_pc(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	uint32_t screen_update_konami_pc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void konami_pc(machine_config &config);
 	void konami_pc_map(address_map &map);
 };
 

src/mame/drivers/p112.cpp

@@ -46,11 +46,13 @@ public:
 		: driver_device(mconfig, type, tag) ,
 		m_maincpu(*this, "maincpu") { }
 
+	void p112(machine_config &config);
+
+private:
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	uint32_t screen_update_p112(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
-	void p112(machine_config &config);
 	void p112_io(address_map &map);
 	void p112_mem(address_map &map);
 };

src/mame/drivers/p8k.cpp

@@ -91,9 +91,14 @@ public:
 		, m_i8272(*this, "i8272")
 	{ }
 
+	void p8k(machine_config &config);
+	void p8k_16(machine_config &config);
+
+	void init_p8k();
+
+private:
 	DECLARE_READ8_MEMBER(p8k_port0_r);
 	DECLARE_WRITE8_MEMBER(p8k_port0_w);
-	void init_p8k();
 	DECLARE_MACHINE_RESET(p8k);
 
 	DECLARE_WRITE_LINE_MEMBER(fdc_irq);
@@ -105,14 +110,12 @@ public:
 	DECLARE_READ8_MEMBER(io_read_byte);
 	DECLARE_WRITE8_MEMBER(io_write_byte);
 
-	void p8k(machine_config &config);
-	void p8k_16(machine_config &config);
 	void p8k_16_datamap(address_map &map);
 	void p8k_16_iomap(address_map &map);
 	void p8k_16_memmap(address_map &map);
 	void p8k_iomap(address_map &map);
 	void p8k_memmap(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 	optional_device<p8k_16_daisy_device> m_daisy;
 	optional_device<z80pio_device> m_pio2;

src/mame/drivers/palm.cpp

@@ -37,6 +37,18 @@ public:
 		m_io_penb(*this, "PENB"),
 		m_io_portd(*this, "PORTD") { }
 
+	void palmiii(machine_config &config);
+	void pilot1k(machine_config &config);
+	void palmvx(machine_config &config);
+	void palmv(machine_config &config);
+	void palm(machine_config &config);
+	void palmpro(machine_config &config);
+	void pilot5k(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(pen_check);
+	DECLARE_INPUT_CHANGED_MEMBER(button_check);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<mc68328_device> m_lsi;
 	required_device<ram_device> m_ram;
@@ -44,8 +56,6 @@ public:
 	uint16_t m_spim_data;
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	DECLARE_INPUT_CHANGED_MEMBER(pen_check);
-	DECLARE_INPUT_CHANGED_MEMBER(button_check);
 	DECLARE_WRITE8_MEMBER(palm_port_f_out);
 	DECLARE_READ8_MEMBER(palm_port_c_in);
 	DECLARE_READ8_MEMBER(palm_port_f_in);
@@ -60,13 +70,6 @@ public:
 	required_ioport m_io_portd;
 
 	offs_t palm_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer &params);
-	void palmiii(machine_config &config);
-	void pilot1k(machine_config &config);
-	void palmvx(machine_config &config);
-	void palmv(machine_config &config);
-	void palm(machine_config &config);
-	void palmpro(machine_config &config);
-	void pilot5k(machine_config &config);
 	void palm_map(address_map &map);
 };
 

src/mame/drivers/pangofun.cpp

@@ -107,9 +107,12 @@ public:
 	pangofun_state(const machine_config &mconfig, device_type type, const char *tag)
 		: pcat_base_state(mconfig, type, tag) { }
 
-	void init_pangofun();
-	virtual void machine_start() override;
 	void pangofun(machine_config &config);
+
+	void init_pangofun();
+
+private:
+	virtual void machine_start() override;
 	void pcat_io(address_map &map);
 	void pcat_map(address_map &map);
 };

src/mame/drivers/panicr.cpp

@@ -86,6 +86,11 @@ public:
 		m_textram(*this, "textram"),
 		m_spritebank(*this, "spritebank") { }
 
+	void panicr(machine_config &config);
+
+	void init_panicr();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<t5182_device> m_t5182;
 	required_device<gfxdecode_device> m_gfxdecode;
@@ -117,7 +122,6 @@ public:
 	TILE_GET_INFO_MEMBER(get_infotile_info_2);
 	TILE_GET_INFO_MEMBER(get_txttile_info);
 
-	void init_panicr();
 	virtual void video_start() override;
 	DECLARE_PALETTE_INIT(panicr);
 
@@ -125,7 +129,6 @@ public:
 	void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect );
 
 	TIMER_DEVICE_CALLBACK_MEMBER(scanline);
-	void panicr(machine_config &config);
 	void panicr_map(address_map &map);
 };
 

src/mame/drivers/paranoia.cpp

@@ -55,6 +55,9 @@ public:
 	paranoia_state(const machine_config &mconfig, device_type type, const char *tag)
 		: pce_common_state(mconfig, type, tag) { }
 
+	void paranoia(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(i8085_d000_w);
 	DECLARE_READ8_MEMBER(z80_io_01_r);
 	DECLARE_READ8_MEMBER(z80_io_02_r);
@@ -64,7 +67,6 @@ public:
 	DECLARE_WRITE8_MEMBER(i8155_b_w);
 	DECLARE_WRITE8_MEMBER(i8155_c_w);
 	DECLARE_WRITE_LINE_MEMBER(i8155_timer_out);
-	void paranoia(machine_config &config);
 	void paranoia_8085_io_map(address_map &map);
 	void paranoia_8085_map(address_map &map);
 	void paranoia_z80_io_map(address_map &map);

src/mame/drivers/pasha2.cpp

@@ -102,6 +102,11 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void pasha2(machine_config &config);
+
+	void init_pasha2();
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint16_t> m_wram;
 	required_shared_ptr<uint16_t> m_paletteram;
@@ -127,7 +132,6 @@ public:
 	DECLARE_WRITE16_MEMBER(pasha2_lamps_w);
 	DECLARE_READ16_MEMBER(pasha2_speedup_r);
 	template<int Chip> DECLARE_WRITE16_MEMBER(oki_bank_w);
-	void init_pasha2();
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -136,7 +140,6 @@ public:
 	required_device<at89c52_device> m_audiocpu;
 	required_device_array<okim6295_device, 2> m_oki;
 	required_device<palette_device> m_palette;
-	void pasha2(machine_config &config);
 	void pasha2_io(address_map &map);
 	void pasha2_map(address_map &map);
 };

src/mame/drivers/paso1600.cpp

@@ -37,6 +37,9 @@ public:
 	{
 	}
 
+	void paso1600(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(paso1600_pcg_r);
 	DECLARE_WRITE8_MEMBER(paso1600_pcg_w);
 	DECLARE_WRITE8_MEMBER(paso1600_6845_address_w);
@@ -50,14 +53,13 @@ public:
 	DECLARE_WRITE8_MEMBER(pc_dma_write_byte);
 	uint32_t screen_update_paso1600(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void paso1600(machine_config &config);
 	void paso1600_io(address_map &map);
 	void paso1600_map(address_map &map);
-private:
+
-	uint8_t m_crtc_vreg[0x100],m_crtc_index;
+	uint8_t m_crtc_vreg[0x100], m_crtc_index;
-	struct{
+	struct {
 		uint8_t portb;
-	}m_keyb;
+	} m_keyb;
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/pasogo.cpp

@@ -130,6 +130,11 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void pasogo(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(contrast);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<generic_slot_device> m_cart;
 	required_device<address_map_bank_device> m_ems;
@@ -170,12 +175,10 @@ public:
 	uint32_t screen_update_pasogo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(pasogo_interrupt);
 	TIMER_DEVICE_CALLBACK_MEMBER(vg230_timer);
-	DECLARE_INPUT_CHANGED_MEMBER(contrast);
 
 	memory_region *m_cart_rom;
 	uint8_t m_ems_index;
 	uint16_t m_ems_bank[28];
-	void pasogo(machine_config &config);
 	void emsbank_map(address_map &map);
 	void pasogo_io(address_map &map);
 	void pasogo_mem(address_map &map);

src/mame/drivers/pasopia.cpp

@@ -40,6 +40,11 @@ public:
 		, m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
+	void pasopia(machine_config &config);
+
+	void init_pasopia();
+
+private:
 	DECLARE_WRITE8_MEMBER(pasopia_ctrl_w);
 	DECLARE_WRITE8_MEMBER(vram_addr_lo_w);
 	DECLARE_WRITE8_MEMBER(vram_latch_w);
@@ -51,13 +56,11 @@ public:
 	DECLARE_READ8_MEMBER(keyb_r);
 	DECLARE_WRITE8_MEMBER(mux_w);
 	MC6845_UPDATE_ROW(crtc_update_row);
-	void init_pasopia();
 	TIMER_CALLBACK_MEMBER(pio_timer);
 
-	void pasopia(machine_config &config);
 	void pasopia_io(address_map &map);
 	void pasopia_map(address_map &map);
-private:
+
 	uint8_t m_hblank;
 	uint16_t m_vram_addr;
 	uint8_t m_vram_latch;

src/mame/drivers/pasopia7.cpp

@@ -59,6 +59,14 @@ public:
 		, m_keyboard(*this, "KEY.%u", 0)
 	{ }
 
+	void p7_base(machine_config &config);
+	void p7_lcd(machine_config &config);
+	void p7_raster(machine_config &config);
+
+	void init_p7_lcd();
+	void init_p7_raster();
+
+private:
 	DECLARE_READ8_MEMBER(vram_r);
 	DECLARE_WRITE8_MEMBER(vram_w);
 	DECLARE_WRITE8_MEMBER(pasopia7_memory_ctrl_w);
@@ -84,18 +92,13 @@ public:
 	DECLARE_READ8_MEMBER(nmi_porta_r);
 	DECLARE_READ8_MEMBER(nmi_portb_r);
 	TIMER_CALLBACK_MEMBER(pio_timer);
-	void init_p7_lcd();
-	void init_p7_raster();
 	DECLARE_VIDEO_START(pasopia7);
 	DECLARE_PALETTE_INIT(p7_lcd);
 	uint32_t screen_update_pasopia7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void p7_base(machine_config &config);
-	void p7_lcd(machine_config &config);
-	void p7_raster(machine_config &config);
 	void pasopia7_io(address_map &map);
 	void pasopia7_mem(address_map &map);
-private:
+
 	uint8_t m_vram_sel;
 	uint8_t m_mio_sel;
 	std::unique_ptr<uint8_t[]> m_p7_pal;

src/mame/drivers/patapata.cpp

@@ -43,7 +43,7 @@ public:
 
 	void patapata(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE16_MEMBER(bg_videoram_w);
 	DECLARE_WRITE16_MEMBER(fg_videoram_w);
 	DECLARE_WRITE8_MEMBER(flipscreen_w);
@@ -55,7 +55,6 @@ protected:
 	void main_map(address_map &map);
 	virtual void video_start() override;
 
-private:
 	/* memory pointers */
 	required_shared_ptr<uint16_t> m_bg_videoram;
 	required_shared_ptr<uint16_t> m_fg_videoram;

src/mame/drivers/pb1000.cpp

@@ -47,6 +47,10 @@ public:
 			m_card2(*this, "cardslot2")
 		{ }
 
+	void pb2000c(machine_config &config);
+	void pb1000(machine_config &config);
+
+private:
 	required_device<hd61700_cpu_device> m_maincpu;
 	required_device<beep_device> m_beeper;
 	required_device<hd44352_device> m_hd44352;
@@ -75,8 +79,6 @@ public:
 	uint16_t read_touchscreen(uint8_t line);
 	DECLARE_PALETTE_INIT(pb1000);
 	TIMER_CALLBACK_MEMBER(keyboard_timer);
-	void pb2000c(machine_config &config);
-	void pb1000(machine_config &config);
 	void pb1000_mem(address_map &map);
 	void pb2000c_mem(address_map &map);
 };

src/mame/drivers/pc.cpp

@@ -362,20 +362,6 @@ public:
 		m_maincpu(*this, "maincpu")
 	{ }
 
-	required_device<cpu_device> m_maincpu;
-
-	DECLARE_READ8_MEMBER(unk_r);
-
-	void init_bondwell();
-
-	DECLARE_INPUT_CHANGED_MEMBER(pc_turbo_callback);
-
-	double m_turbo_off_speed;
-
-	static void cfg_dual_720K(device_t *device);
-	static void cfg_single_360K(device_t *device);
-	static void cfg_single_720K(device_t *device);
-
 	void ataripc1(machine_config &config);
 	void ncrpc4i(machine_config &config);
 	void kaypro16(machine_config &config);
@@ -395,6 +381,22 @@ public:
 	void eagle1600(machine_config &config);
 	void laser_turbo_xt(machine_config &config);
 	void ibm5550(machine_config &config);
+
+	void init_bondwell();
+
+	DECLARE_INPUT_CHANGED_MEMBER(pc_turbo_callback);
+
+private:
+	required_device<cpu_device> m_maincpu;
+
+	DECLARE_READ8_MEMBER(unk_r);
+
+	double m_turbo_off_speed;
+
+	static void cfg_dual_720K(device_t *device);
+	static void cfg_single_360K(device_t *device);
+	static void cfg_single_720K(device_t *device);
+
 	void epc_io(address_map &map);
 	void ibm5550_io(address_map &map);
 	void pc16_io(address_map &map);

src/mame/drivers/pc1500.cpp

@@ -35,6 +35,9 @@ public:
 	{
 	}
 
+	void pc1500(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<upd1990a_device> m_rtc;
 
@@ -54,7 +57,6 @@ public:
 
 	DECLARE_READ8_MEMBER( pc1500_kb_r );
 	DECLARE_PALETTE_INIT(pc1500);
-	void pc1500(machine_config &config);
 	void pc1500_mem(address_map &map);
 	void pc1500_mem_io(address_map &map);
 };

src/mame/drivers/pcat_dyn.cpp

@@ -49,6 +49,9 @@ public:
 		, m_nvram_bank(*this, "nvram_bank")
 		, m_nvram_mem(0x2000){ }
 
+	void pcat_dyn(machine_config &config);
+
+private:
 	required_device<isa8_device> m_isabus;
 	required_memory_bank m_prgbank;
 	required_memory_bank m_nvram_bank;
@@ -60,7 +63,6 @@ public:
 	virtual void machine_start() override;
 	void nvram_init(nvram_device &nvram, void *base, size_t size);
 	static void pcat_dyn_sb_conf(device_t *device);
-	void pcat_dyn(machine_config &config);
 	void pcat_io(address_map &map);
 	void pcat_map(address_map &map);
 };

src/mame/drivers/pcat_nit.cpp

@@ -99,16 +99,19 @@ public:
 			m_uart(*this, "ns16450_0"),
 			m_microtouch(*this, "microtouch") { }
 
+	void bonanza(machine_config &config);
+	void pcat_nit(machine_config &config);
+
+	void init_pcat_nit();
+
+private:
 	std::unique_ptr<uint8_t[]> m_banked_nvram;
 	required_device<ns16450_device> m_uart;
 	required_device<microtouch_device> m_microtouch;
 
 	DECLARE_WRITE8_MEMBER(pcat_nit_rombank_w);
 	DECLARE_READ8_MEMBER(pcat_nit_io_r);
-	void init_pcat_nit();
 	virtual void machine_start() override;
-	void bonanza(machine_config &config);
-	void pcat_nit(machine_config &config);
 	void bonanza_io_map(address_map &map);
 	void bonanza_map(address_map &map);
 	void pcat_map(address_map &map);

src/mame/drivers/pcd.cpp

@@ -51,6 +51,10 @@ public:
 		, m_req_hack(nullptr)
 	{ }
 
+	void pcx(machine_config &config);
+	void pcd(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER( irq_callback );
 	TIMER_DEVICE_CALLBACK_MEMBER( timer0_tick );
 	DECLARE_WRITE_LINE_MEMBER( i186_timer1_w );
@@ -80,18 +84,15 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(write_scsi_msg);
 	DECLARE_WRITE_LINE_MEMBER(write_scsi_req);
 
-	void pcx(machine_config &config);
-	void pcd(machine_config &config);
 	void pcd_io(address_map &map);
 	void pcd_map(address_map &map);
 	void pcx_io(address_map &map);
-protected:
+
 	// driver_device overrides
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-private:
 	required_device<i80186_cpu_device> m_maincpu;
 	required_device<pic8259_device> m_pic1;
 	required_device<pic8259_device> m_pic2;

src/mame/drivers/pce220.cpp

@@ -55,6 +55,16 @@ public:
 			m_serial(*this, PCE220SERIAL_TAG)
 		{ }
 
+	void pce220(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(kb_irq);
+	DECLARE_INPUT_CHANGED_MEMBER(on_irq);
+
+	TIMER_DEVICE_CALLBACK_MEMBER(pce220_timer_callback);
+
+	DECLARE_PALETTE_INIT(pce220);
+
+protected:
 	required_device<cpu_device> m_maincpu;
 	required_device<ram_device> m_ram;
 	required_device<beep_device> m_beep;
@@ -100,11 +110,7 @@ public:
 	DECLARE_READ8_MEMBER( irq_status_r );
 	DECLARE_WRITE8_MEMBER( irq_ack_w );
 	DECLARE_WRITE8_MEMBER( irq_mask_w );
-	DECLARE_PALETTE_INIT(pce220);
+
-	DECLARE_INPUT_CHANGED_MEMBER(kb_irq);
-	DECLARE_INPUT_CHANGED_MEMBER(on_irq);
-	TIMER_DEVICE_CALLBACK_MEMBER(pce220_timer_callback);
-	void pce220(machine_config &config);
 	void pce220_io(address_map &map);
 	void pce220_mem(address_map &map);
 };
@@ -116,6 +122,10 @@ public:
 		: pce220_state(mconfig, type, tag)
 		{ }
 
+	void pcg850v(machine_config &config);
+	void pcg815(machine_config &config);
+
+private:
 	uint8_t m_g850v_bank_num;
 	uint8_t m_lcd_effects;
 	uint8_t m_lcd_contrast;
@@ -130,8 +140,6 @@ public:
 	DECLARE_WRITE8_MEMBER( g850v_lcd_control_w );
 	DECLARE_READ8_MEMBER( g850v_lcd_data_r );
 	DECLARE_WRITE8_MEMBER( g850v_lcd_data_w );
-	void pcg850v(machine_config &config);
-	void pcg815(machine_config &config);
 	void pcg850v_io(address_map &map);
 };
 

src/mame/drivers/pcfx.cpp

@@ -20,16 +20,18 @@
 class pcfx_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_PAD_FUNC
-	};
-
 	pcfx_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_huc6261(*this, "huc6261") { }
 
+	void pcfx(machine_config &config);
+
+private:
+	enum
+	{
+		TIMER_PAD_FUNC
+	};
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	DECLARE_READ16_MEMBER( irq_read );
@@ -49,15 +51,13 @@ public:
 	DECLARE_WRITE_LINE_MEMBER( irq15_w );
 	TIMER_CALLBACK_MEMBER(pad_func);
 
-	void pcfx(machine_config &config);
 	void pcfx_io(address_map &map);
 	void pcfx_mem(address_map &map);
-protected:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	virtual void machine_reset() override;
 
-private:
 	// Interrupt controller (component unknown)
 	uint16_t m_irq_mask;
 	uint16_t m_irq_pending;

src/mame/drivers/pcipc.cpp

@@ -40,19 +40,19 @@ public:
 	static const boot_state_info boot_state_infos_phoenix_ver40_rev6[];
 	static const boot_state_info boot_state_infos_award[];
 
+	void pcipc(machine_config &config);
+	void pcipctx(machine_config &config);
+
+	pcipc_state(const machine_config &mconfig, device_type type, const char *tag);
+
+private:
 	DECLARE_WRITE8_MEMBER(boot_state_phoenix_w);
 	DECLARE_WRITE8_MEMBER(boot_state_phoenix_ver40_rev6_w);
 	DECLARE_WRITE8_MEMBER(boot_state_award_w);
 
-	pcipc_state(const machine_config &mconfig, device_type type, const char *tag);
-
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
-
-	void pcipc(machine_config &config);
-	void pcipctx(machine_config &config);
-
 	static void superio_config(device_t *device);
 };
 

src/mame/drivers/pcm.cpp

@@ -84,15 +84,17 @@ public:
 	{
 	}
 
+	void pcm(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER( pcm_85_r );
 	DECLARE_WRITE_LINE_MEMBER( pcm_82_w );
 	DECLARE_WRITE8_MEMBER( pcm_85_w );
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void pcm(machine_config &config);
 	void pcm_io(address_map &map);
 	void pcm_mem(address_map &map);
-private:
+
 	bool m_cone;
 	uint8_t m_85;
 	virtual void machine_reset() override;

src/mame/drivers/pcxt.cpp

@@ -72,6 +72,10 @@ public:
 		m_mb(*this, "mb"),
 		m_bank(*this, "bank"){ }
 
+	void tetriskr(machine_config &config);
+	void filetto(machine_config &config);
+
+private:
 	int m_lastvalue;
 	uint8_t m_disk_data[2];
 	uint8_t m_port_b_data;
@@ -93,8 +97,6 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<pc_noppi_mb_device> m_mb;
 	optional_device<address_map_bank_device> m_bank;
-	void tetriskr(machine_config &config);
-	void filetto(machine_config &config);
 	void bank_map(address_map &map);
 	void filetto_io(address_map &map);
 	void filetto_map(address_map &map);

src/mame/drivers/pda600.cpp

@@ -72,6 +72,9 @@ public:
 			m_maincpu(*this, "maincpu")
 		{}
 
+	void pda600(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 
 	virtual void video_start() override;
@@ -79,7 +82,6 @@ public:
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	uint8_t *     m_video_ram;
-	void pda600(machine_config &config);
 	void pda600_io(address_map &map);
 	void pda600_mem(address_map &map);
 };

src/mame/drivers/pdp11.cpp

@@ -105,6 +105,11 @@ public:
 	{
 	}
 
+	void pdp11ub2(machine_config &config);
+	void pdp11(machine_config &config);
+	void pdp11qb(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<generic_terminal_device> m_terminal;
 	DECLARE_READ16_MEMBER( teletype_ctrl_r );
@@ -116,9 +121,6 @@ public:
 	DECLARE_MACHINE_RESET(pdp11ub2);
 	DECLARE_MACHINE_RESET(pdp11qb);
 	void load9312prom(uint8_t *desc, uint8_t *src, int size);
-	void pdp11ub2(machine_config &config);
-	void pdp11(machine_config &config);
-	void pdp11qb(machine_config &config);
 	void pdp11_mem(address_map &map);
 	void pdp11qb_mem(address_map &map);
 };

src/mame/drivers/pegasus.cpp

@@ -71,6 +71,12 @@ public:
 		, m_io_keyboard(*this, "KEY.%u", 0)
 	{ }
 
+	void pegasusm(machine_config &config);
+	void pegasus(machine_config &config);
+
+	void init_pegasus();
+
+private:
 	DECLARE_READ8_MEMBER(pegasus_keyboard_r);
 	DECLARE_READ8_MEMBER(pegasus_protection_r);
 	DECLARE_READ8_MEMBER(pegasus_pcg_r);
@@ -82,7 +88,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(pegasus_cassette_w);
 	DECLARE_WRITE_LINE_MEMBER(pegasus_firq_clr);
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void init_pegasus();
 	TIMER_DEVICE_CALLBACK_MEMBER(pegasus_firq);
 	image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp00_load) { return load_cart(image, m_exp_00, "0000"); }
@@ -91,11 +96,9 @@ public:
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0c_load) { return load_cart(image, m_exp_0c, "c000"); }
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp0d_load) { return load_cart(image, m_exp_0d, "d000"); }
 
-	void pegasusm(machine_config &config);
-	void pegasus(machine_config &config);
 	void pegasus_mem(address_map &map);
 	void pegasusm_mem(address_map &map);
-private:
+
 	uint8_t m_kbd_row;
 	bool m_kbd_irq;
 	uint8_t m_control_bits;

src/mame/drivers/pencil2.cpp

@@ -106,6 +106,12 @@ public:
 		, m_cart(*this, "cartslot")
 	{}
 
+	void pencil2(machine_config &config);
+
+	DECLARE_CUSTOM_INPUT_MEMBER(printer_ready_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(printer_ack_r);
+
+private:
 	DECLARE_WRITE8_MEMBER(port10_w);
 	DECLARE_WRITE8_MEMBER(port30_w);
 	DECLARE_WRITE8_MEMBER(port80_w);
@@ -113,12 +119,9 @@ public:
 	DECLARE_READ8_MEMBER(porte2_r);
 	DECLARE_WRITE_LINE_MEMBER(write_centronics_ack);
 	DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
-	DECLARE_CUSTOM_INPUT_MEMBER(printer_ready_r);
-	DECLARE_CUSTOM_INPUT_MEMBER(printer_ack_r);
-	void pencil2(machine_config &config);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-private:
+
 	virtual void machine_start() override;
 	int m_centronics_busy;
 	int m_centronics_ack;

src/mame/drivers/pengadvb.cpp

@@ -49,10 +49,11 @@ public:
 		, m_bank(*this, "bank%u", 0U)
 	{ }
 
-	void init_pengadvb();
 	void pengadvb(machine_config &config);
 
-protected:
+	void init_pengadvb();
+
+private:
 	DECLARE_READ8_MEMBER(mem_r);
 	DECLARE_WRITE8_MEMBER(mem_w);
 	DECLARE_WRITE8_MEMBER(megarom_bank_w);
@@ -70,7 +71,6 @@ protected:
 	void io_mem(address_map &map);
 	void program_mem(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device_array<address_map_bank_device, 4> m_page;
 	required_memory_bank_array<4> m_bank;

src/mame/drivers/pengo.cpp

@@ -77,18 +77,23 @@ class pengo_state : public pacman_state
 {
 public:
 	pengo_state(const machine_config &mconfig, device_type type, const char *tag)
-		: pacman_state(mconfig, type, tag), m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+		: pacman_state(mconfig, type, tag), m_decrypted_opcodes(*this, "decrypted_opcodes")
-	DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
+	{ }
-	DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
-	DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
-	void init_penta();
-	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
 
-	optional_shared_ptr<uint8_t> m_decrypted_opcodes;
 	void jrpacmbl(machine_config &config);
 	void pengoe(machine_config &config);
 	void pengou(machine_config &config);
 	void pengo(machine_config &config);
+
+	void init_penta();
+
+private:
+	DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
+	DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
+	DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
+	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
+
+	optional_shared_ptr<uint8_t> m_decrypted_opcodes;
 	void decrypted_opcodes_map(address_map &map);
 	void jrpacmbl_map(address_map &map);
 	void pengo_map(address_map &map);

src/mame/drivers/pentagon.cpp

@@ -17,11 +17,6 @@
 class pentagon_state : public spectrum_state
 {
 public:
-	enum
-	{
-		TIMER_IRQ_ON,
-		TIMER_IRQ_OFF
-	};
 	pentagon_state(const machine_config &mconfig, device_type type, const char *tag)
 		: spectrum_state(mconfig, type, tag)
 		, m_bank1(*this, "bank1")
@@ -31,6 +26,16 @@ public:
 		, m_beta(*this, BETA_DISK_TAG)
 	{ }
 
+	void pent1024(machine_config &config);
+	void pentagon(machine_config &config);
+
+private:
+	enum
+	{
+		TIMER_IRQ_ON,
+		TIMER_IRQ_OFF
+	};
+
 	DECLARE_WRITE8_MEMBER(pentagon_port_7ffd_w);
 	DECLARE_WRITE8_MEMBER(pentagon_scr_w);
 	DECLARE_WRITE8_MEMBER(pentagon_scr2_w);
@@ -42,19 +47,17 @@ public:
 	INTERRUPT_GEN_MEMBER(pentagon_interrupt);
 	TIMER_CALLBACK_MEMBER(irq_on);
 	TIMER_CALLBACK_MEMBER(irq_off);
-	void pent1024(machine_config &config);
-	void pentagon(machine_config &config);
 	void pentagon_io(address_map &map);
 	void pentagon_mem(address_map &map);
 	void pentagon_switch(address_map &map);
-protected:
+
 	required_memory_bank m_bank1;
 	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
 	required_memory_bank m_bank4;
 	required_device<beta_disk_device> m_beta;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-private:
+
 	address_space *m_program;
 	uint8_t *m_p_ram;
 	void pentagon_update_memory();

src/mame/drivers/peoplepc.cpp

@@ -34,6 +34,10 @@ public:
 		m_cvram(*this, "cvram"),
 		m_charram(4*1024)
 	{ }
+
+	void olypeopl(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<palette_device> m_palette;
 	required_device<pic8259_device> m_pic_1;
@@ -63,10 +67,9 @@ public:
 	void floppy_unload(floppy_image_device *dev);
 
 	uint8_t m_dma0pg;
-	void olypeopl(machine_config &config);
 	void peoplepc_io(address_map &map);
 	void peoplepc_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 };

src/mame/drivers/peplus.cpp

@@ -218,11 +218,6 @@ A Note about Best Bet Products.
 class peplus_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_ASSERT_LP
-	};
-
 	peplus_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
@@ -251,6 +246,22 @@ public:
 	{
 	}
 
+	void peplus(machine_config &config);
+
+	void init_nonplus();
+	void init_peplus();
+	void init_peplussb();
+	void init_pepluss64();
+	void init_peplussbw();
+
+	DECLARE_CUSTOM_INPUT_MEMBER(peplus_input_r);
+
+private:
+	enum
+	{
+		TIMER_ASSERT_LP
+	};
+
 	required_device<cpu_device> m_maincpu;
 	required_device<r6545_1_device> m_crtc;
 	required_device<i2cmem_device> m_i2cmem;
@@ -320,17 +331,11 @@ public:
 	DECLARE_READ8_MEMBER(peplus_bgcolor_r);
 	DECLARE_READ8_MEMBER(peplus_dropdoor_r);
 	DECLARE_READ8_MEMBER(peplus_watchdog_r);
-	DECLARE_CUSTOM_INPUT_MEMBER(peplus_input_r);
 	DECLARE_WRITE8_MEMBER(peplus_crtc_mode_w);
 	DECLARE_WRITE_LINE_MEMBER(crtc_vsync);
 	DECLARE_WRITE8_MEMBER(i2c_nvram_w);
 	DECLARE_READ8_MEMBER(peplus_input_bank_a_r);
 	DECLARE_READ8_MEMBER(peplus_input0_r);
-	void init_nonplus();
-	void init_peplus();
-	void init_peplussb();
-	void init_pepluss64();
-	void init_peplussbw();
 	TILE_GET_INFO_MEMBER(get_bg_tile_info);
 	MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr);
 	virtual void machine_reset() override;
@@ -340,10 +345,9 @@ public:
 	DECLARE_PALETTE_INIT(peplus);
 	void handle_lightpen();
 
-	void peplus(machine_config &config);
 	void peplus_iomap(address_map &map);
 	void peplus_map(address_map &map);
-protected:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 };
 

src/mame/drivers/perq.cpp

@@ -18,12 +18,12 @@ class perq_state : public driver_device
 public:
 	perq_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//      , m_maincpu(*this, "maincpu")
+		//      , m_maincpu(*this, "maincpu")
 	{ }
 
-void perq(machine_config &config);
+	void perq(machine_config &config);
 private:
-//  required_device<cpu_device> m_maincpu;
+	//  required_device<cpu_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( perq )

src/mame/drivers/pet.cpp

@@ -222,6 +222,61 @@ public:
 		m_user_diag(1)
 	{ }
 
+	void _4k(machine_config &config);
+	void _8k(machine_config &config);
+	void _16k(machine_config &config);
+	void _32k(machine_config &config);
+	void pet(machine_config &config);
+	void pet2001n(machine_config &config);
+	void pet2001n8(machine_config &config);
+	void cbm3032(machine_config &config);
+	void pet20018(machine_config &config);
+	void pet2001n16(machine_config &config);
+	void cbm3016(machine_config &config);
+	void cbm3000(machine_config &config);
+	void cbm4000(machine_config &config);
+	void cbm4032f(machine_config &config);
+	void cbm4032(machine_config &config);
+	void cbm4016(machine_config &config);
+	void cbm3008(machine_config &config);
+	void pet2001(machine_config &config);
+	void pet2001n32(machine_config &config);
+
+	DECLARE_READ8_MEMBER( read );
+	DECLARE_WRITE8_MEMBER( write );
+
+	DECLARE_WRITE_LINE_MEMBER( via_irq_w );
+	DECLARE_WRITE8_MEMBER( via_pa_w );
+	DECLARE_READ8_MEMBER( via_pb_r );
+	DECLARE_WRITE8_MEMBER( via_pb_w );
+	DECLARE_WRITE_LINE_MEMBER( via_ca2_w );
+	DECLARE_WRITE_LINE_MEMBER( via_cb2_w );
+
+	DECLARE_WRITE_LINE_MEMBER( pia1_irqa_w );
+	DECLARE_WRITE_LINE_MEMBER( pia1_irqb_w );
+	DECLARE_READ8_MEMBER( pia1_pa_r );
+	DECLARE_READ8_MEMBER( pia1_pb_r );
+	DECLARE_WRITE8_MEMBER( pia1_pa_w );
+	DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w );
+
+	DECLARE_WRITE_LINE_MEMBER( pia2_irqa_w );
+	DECLARE_WRITE_LINE_MEMBER( pia2_irqb_w );
+
+	DECLARE_WRITE_LINE_MEMBER( user_diag_w );
+
+	MC6845_BEGIN_UPDATE( pet_begin_update );
+	MC6845_UPDATE_ROW( pet40_update_row );
+
+	TIMER_DEVICE_CALLBACK_MEMBER( sync_tick );
+
+	DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_pet );
+
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	DECLARE_MACHINE_START( pet40 );
+	DECLARE_MACHINE_RESET( pet40 );
+
+protected:
 	required_device<m6502_device> m_maincpu;
 	required_device<via6522_device> m_via;
 	required_device<pia6821_device> m_pia1;
@@ -247,43 +302,11 @@ public:
 	DECLARE_MACHINE_START( pet );
 	DECLARE_MACHINE_START( pet2001 );
 	DECLARE_MACHINE_RESET( pet );
-	DECLARE_MACHINE_START( pet40 );
-	DECLARE_MACHINE_RESET( pet40 );
 
-	MC6845_BEGIN_UPDATE( pet_begin_update );
-	MC6845_UPDATE_ROW( pet40_update_row );
-
-	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	void check_interrupts();
 	void update_speaker();
 
-	DECLARE_READ8_MEMBER( read );
-	DECLARE_WRITE8_MEMBER( write );
-
-	DECLARE_WRITE_LINE_MEMBER( via_irq_w );
-	DECLARE_WRITE8_MEMBER( via_pa_w );
-	DECLARE_READ8_MEMBER( via_pb_r );
-	DECLARE_WRITE8_MEMBER( via_pb_w );
-	DECLARE_WRITE_LINE_MEMBER( via_ca2_w );
-	DECLARE_WRITE_LINE_MEMBER( via_cb2_w );
-
-	DECLARE_WRITE_LINE_MEMBER( pia1_irqa_w );
-	DECLARE_WRITE_LINE_MEMBER( pia1_irqb_w );
-	DECLARE_READ8_MEMBER( pia1_pa_r );
-	DECLARE_READ8_MEMBER( pia1_pb_r );
-	DECLARE_WRITE8_MEMBER( pia1_pa_w );
-	DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w );
-
-	DECLARE_WRITE_LINE_MEMBER( pia2_irqa_w );
-	DECLARE_WRITE_LINE_MEMBER( pia2_irqb_w );
-
-	DECLARE_WRITE_LINE_MEMBER( user_diag_w );
-
-	TIMER_DEVICE_CALLBACK_MEMBER( sync_tick );
-
-	DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_pet );
-
 	enum
 	{
 		SEL0 = 0,
@@ -327,25 +350,6 @@ public:
 	int m_pia2b_irq;
 	int m_exp_irq;
 	int m_user_diag;
-	void _4k(machine_config &config);
-	void _8k(machine_config &config);
-	void _16k(machine_config &config);
-	void _32k(machine_config &config);
-	void pet(machine_config &config);
-	void pet2001n(machine_config &config);
-	void pet2001n8(machine_config &config);
-	void cbm3032(machine_config &config);
-	void pet20018(machine_config &config);
-	void pet2001n16(machine_config &config);
-	void cbm3016(machine_config &config);
-	void cbm3000(machine_config &config);
-	void cbm4000(machine_config &config);
-	void cbm4032f(machine_config &config);
-	void cbm4032(machine_config &config);
-	void cbm4016(machine_config &config);
-	void cbm3008(machine_config &config);
-	void pet2001(machine_config &config);
-	void pet2001n32(machine_config &config);
 	void pet2001_mem(address_map &map);
 };
 
@@ -357,7 +361,6 @@ public:
 		pet_state(mconfig, type, tag)
 	{ }
 
-	DECLARE_READ8_MEMBER( pia1_pb_r );
 	void pet2001b(machine_config &config);
 	void pet2001b32(machine_config &config);
 	void pet4000(machine_config &config);
@@ -372,6 +375,10 @@ public:
 	void cbm4032b(machine_config &config);
 	void pet2001b8(machine_config &config);
 	void pet4016(machine_config &config);
+
+protected:
+	DECLARE_READ8_MEMBER( pia1_pb_r );
+
 };
 
 
@@ -382,13 +389,16 @@ public:
 		pet2001b_state(mconfig, type, tag)
 	{ }
 
+	void pet80(machine_config &config);
+	void pet8032(machine_config &config);
+
 	DECLARE_MACHINE_START( pet80 );
 	DECLARE_MACHINE_RESET( pet80 );
 
-	MC6845_UPDATE_ROW( pet80_update_row );
 	MC6845_UPDATE_ROW( cbm8296_update_row );
-	void pet80(machine_config &config);
+
-	void pet8032(machine_config &config);
+protected:
+	MC6845_UPDATE_ROW( pet80_update_row );
 };
 
 
@@ -425,6 +435,10 @@ public:
 		m_pla2(*this, PLA2_TAG)
 	{ }
 
+	void cbm8296d(machine_config &config);
+	void cbm8296(machine_config &config);
+
+private:
 	required_memory_region m_basic_rom;
 	required_memory_region m_editor_rom;
 	required_memory_region m_ue5_rom;
@@ -447,8 +461,6 @@ public:
 	DECLARE_WRITE8_MEMBER( write );
 
 	uint8_t m_cr;
-	void cbm8296d(machine_config &config);
-	void cbm8296(machine_config &config);
 	void cbm8296_mem(address_map &map);
 };
 

src/mame/drivers/peyper.cpp

@@ -61,7 +61,7 @@ public:
 
 	void peyper(machine_config &config);
 
-protected:
+private:
 	DECLARE_READ8_MEMBER(sw_r);
 	DECLARE_WRITE8_MEMBER(col_w);
 	DECLARE_WRITE8_MEMBER(disp_w);
@@ -79,7 +79,6 @@ protected:
 	void peyper_io(address_map &map);
 	void peyper_map(address_map &map);
 
-private:
 	uint8_t m_digit;
 	uint8_t m_disp_layout[36];
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/pg685.cpp

@@ -113,6 +113,13 @@ public:
 		m_floppy1(*this, "fdc:1")
 		{ }
 
+	void pg685_backplane(machine_config &config);
+	void pg685_module(machine_config &config);
+	void pg685(machine_config &config);
+	void pg675(machine_config &config);
+	void pg685oua12(machine_config &config);
+
+private:
 	MC6845_UPDATE_ROW(crtc_update_row);
 	MC6845_UPDATE_ROW(crtc_update_row_oua12);
 
@@ -130,15 +137,10 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
 	DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
 
-	void pg685_backplane(machine_config &config);
-	void pg685_module(machine_config &config);
-	void pg685(machine_config &config);
-	void pg675(machine_config &config);
-	void pg685oua12(machine_config &config);
 	void pg675_mem(address_map &map);
 	void pg685_mem(address_map &map);
 	void pg685oua12_mem(address_map &map);
-private:
+
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/pgm3.cpp

@@ -60,15 +60,18 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu") { }
 
+	void pgm3(machine_config &config);
+
 	void init_kov3hd();
 
+private:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	uint32_t screen_update_pgm3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(screen_vblank_pgm3);
 	required_device<cpu_device> m_maincpu;
-	void pgm3(machine_config &config);
 	void pgm3_map(address_map &map);
 };
 

src/mame/drivers/photon.cpp

@@ -34,6 +34,9 @@ public:
 		: pk8000_base_state(mconfig, type, tag),
 		m_speaker(*this, "speaker") { }
 
+	void photon(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(_80_porta_w);
 	DECLARE_READ8_MEMBER(_80_portb_r);
 	DECLARE_WRITE8_MEMBER(_80_portc_w);
@@ -48,7 +51,6 @@ public:
 	void set_bank(uint8_t data);
 
 	required_device<speaker_sound_device> m_speaker;
-	void photon(machine_config &config);
 	void pk8000_io(address_map &map);
 	void pk8000_mem(address_map &map);
 };

src/mame/drivers/photon2.cpp

@@ -39,6 +39,9 @@ public:
 		m_speaker(*this, "speaker"),
 		m_spectrum_video_ram(*this, "spectrum_vram") { }
 
+	void photon2(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
 
@@ -62,7 +65,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(screen_vblank_spectrum);
 
 	TIMER_DEVICE_CALLBACK_MEMBER(spec_interrupt_hack);
-	void photon2(machine_config &config);
 	void spectrum_io(address_map &map);
 	void spectrum_mem(address_map &map);
 };

src/mame/drivers/photoply.cpp

@@ -41,6 +41,9 @@ public:
 	{
 	}
 
+	void photoply(machine_config &config);
+
+private:
 	required_device<eeprom_serial_93cxx_device> m_eeprom;
 
 	required_region_ptr<uint8_t> m_main_bios;
@@ -54,11 +57,10 @@ public:
 	DECLARE_WRITE8_MEMBER(eeprom_w);
 
 	uint16_t m_pci_shadow_reg;
-	void photoply(machine_config &config);
 
 	void photoply_io(address_map &map);
 	void photoply_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 

src/mame/drivers/phunsy.cpp

@@ -53,7 +53,11 @@ public:
 	{
 	}
 
+	void phunsy(machine_config &config);
+
 	void init_phunsy();
+
+private:
 	DECLARE_READ8_MEMBER(phunsy_data_r);
 	DECLARE_WRITE8_MEMBER(phunsy_ctrl_w);
 	DECLARE_WRITE8_MEMBER(phunsy_data_w);
@@ -64,11 +68,10 @@ public:
 	DECLARE_PALETTE_INIT(phunsy);
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void phunsy(machine_config &config);
 	void phunsy_data(address_map &map);
 	void phunsy_io(address_map &map);
 	void phunsy_mem(address_map &map);
-private:
+
 	uint8_t       m_data_out;
 	uint8_t       m_keyboard_input;
 	virtual void machine_reset() override;

src/mame/drivers/picno.cpp

@@ -42,9 +42,11 @@ public:
 	{ }
 
 	void picno(machine_config &config);
+
+private:
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/pinball2k.cpp

@@ -44,6 +44,12 @@ public:
 		m_ramdac(*this, "ramdac"),
 		m_palette(*this, "palette") { }
 
+	void mediagx(machine_config &config);
+
+	void init_mediagx();
+	void init_pinball2k();
+
+private:
 	required_shared_ptr<uint32_t> m_main_ram;
 	required_shared_ptr<uint32_t> m_cga_ram;
 	required_shared_ptr<uint32_t> m_bios_ram;
@@ -91,7 +97,7 @@ public:
 	DECLARE_WRITE32_MEMBER(port400_w);
 	DECLARE_READ32_MEMBER(port800_r);
 	DECLARE_WRITE32_MEMBER(port800_w);
-	void init_pinball2k();
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -99,8 +105,6 @@ public:
 	void draw_char(bitmap_rgb32 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y);
 	void draw_framebuffer(bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	void draw_cga(bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void init_mediagx();
-	void mediagx(machine_config &config);
 	void mediagx_io(address_map &map);
 	void mediagx_map(address_map &map);
 	void ramdac_map(address_map &map);

src/mame/drivers/pipbug.cpp

@@ -54,11 +54,13 @@ public:
 	{
 	}
 
+	void pipbug(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(pipbug_ctrl_w);
 	required_device<rs232_port_device> m_rs232;
 	required_device<cpu_device> m_maincpu;
 	DECLARE_QUICKLOAD_LOAD_MEMBER( pipbug );
-	void pipbug(machine_config &config);
 	void pipbug_data(address_map &map);
 	void pipbug_mem(address_map &map);
 };

src/mame/drivers/pipedrm.cpp

@@ -180,17 +180,20 @@ public:
 		m_soundlatch(*this, "soundlatch")
 	{ }
 
+	void pipedrm(machine_config &config);
+	void hatris(machine_config &config);
+
+	void init_pipedrm();
+	void init_hatris();
+
+private:
 	required_device<generic_latch_8_device> m_soundlatch;
 
 	DECLARE_MACHINE_START(pipedrm);
 	DECLARE_MACHINE_RESET(pipedrm);
-	void init_pipedrm();
-	void init_hatris();
 	DECLARE_WRITE8_MEMBER( pipedrm_bankswitch_w );
 	DECLARE_WRITE8_MEMBER( sound_bankswitch_w );
 	DECLARE_READ8_MEMBER( pending_command_r );
-	void pipedrm(machine_config &config);
-	void hatris(machine_config &config);
 	void hatris_sound_portmap(address_map &map);
 	void main_map(address_map &map);
 	void main_portmap(address_map &map);

src/mame/drivers/pipeline.cpp

@@ -95,6 +95,9 @@ public:
 	{
 	}
 
+	void pipeline(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(vram2_w);
 	DECLARE_WRITE8_MEMBER(vram1_w);
 	DECLARE_WRITE8_MEMBER(mcu_portA_w);
@@ -113,11 +116,10 @@ public:
 
 	TIMER_CALLBACK_MEMBER(protection_deferred_w);
 
-	void pipeline(machine_config &config);
 	void cpu0_mem(address_map &map);
 	void cpu1_mem(address_map &map);
 	void sound_port(address_map &map);
-protected:
+
 	required_device<cpu_device>         m_maincpu;
 	required_device<m68705r_device>     m_mcu;
 	required_device<gfxdecode_device>   m_gfxdecode;

src/mame/drivers/piratesh.cpp

@@ -61,6 +61,12 @@ public:
 	m_spriteram(*this,"spriteram")
 	{ }
 
+	void piratesh(machine_config &config);
+
+	DECLARE_CUSTOM_INPUT_MEMBER(helm_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(battery_r);
+
+private:
 	required_device<cpu_device> m_maincpu;
 
 	required_device<k053250ps_device> m_k053250;
@@ -97,8 +103,6 @@ public:
 	DECLARE_WRITE16_MEMBER(k053247_scattered_word_w);
 	DECLARE_READ16_MEMBER(k053247_martchmp_word_r);
 	DECLARE_WRITE16_MEMBER(k053247_martchmp_word_w);
-	DECLARE_CUSTOM_INPUT_MEMBER(helm_r);
-	DECLARE_CUSTOM_INPUT_MEMBER(battery_r);
 
 	DECLARE_MACHINE_START(piratesh);
 	DECLARE_MACHINE_RESET(piratesh);
@@ -108,7 +112,6 @@ public:
 	TIMER_DEVICE_CALLBACK_MEMBER(piratesh_interrupt);
 	K056832_CB_MEMBER(piratesh_tile_callback);
 	K055673_CB_MEMBER(piratesh_sprite_callback);
-	void piratesh(machine_config &config);
 	void piratesh_map(address_map &map);
 };
 

src/mame/drivers/pitagjr.cpp

@@ -167,13 +167,15 @@ public:
 		, m_rombank(*this, "rombank")
 	{ }
 
+	void pitajr(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_memory_bank m_rombank;
 
 	virtual void machine_start() override;
 	DECLARE_PALETTE_INIT(pitagjr);
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void pitajr(machine_config &config);
 	void pitajr_mem(address_map &map);
 };
 

src/mame/drivers/pk8000.cpp

@@ -47,6 +47,9 @@ public:
 		, m_keyboard(*this, "LINE%u", 0)
 	{ }
 
+	void pk8000(machine_config &config);
+
+private:
 	uint8_t m_keyboard_line;
 
 	DECLARE_READ8_MEMBER(joy_1_r);
@@ -64,10 +67,9 @@ public:
 	INTERRUPT_GEN_MEMBER(interrupt);
 	IRQ_CALLBACK_MEMBER(irq_callback);
 
-	void pk8000(machine_config &config);
 	void pk8000_io(address_map &map);
 	void pk8000_mem(address_map &map);
-protected:
+
 	required_device<cassette_image_device> m_cassette;
 	required_device<ram_device> m_ram;
 	required_device<speaker_sound_device> m_speaker;

src/mame/drivers/pkscram.cpp

@@ -39,7 +39,7 @@ public:
 
 	void pkscramble(machine_config &config);
 
-protected:
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;

src/mame/drivers/plan80.cpp

@@ -32,11 +32,6 @@
 class plan80_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_BOOT
-	};
-
 	plan80_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
@@ -44,15 +39,23 @@ public:
 		, m_p_chargen(*this, "chargen")
 	{ }
 
+	void plan80(machine_config &config);
+
+	void init_plan80();
+
+private:
+	enum
+	{
+		TIMER_BOOT
+	};
+
 	DECLARE_READ8_MEMBER(plan80_04_r);
 	DECLARE_WRITE8_MEMBER(plan80_09_w);
-	void init_plan80();
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void plan80(machine_config &config);
 	void plan80_io(address_map &map);
 	void plan80_mem(address_map &map);
-private:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 	uint8_t m_kbd_row;
 	virtual void machine_reset() override;

src/mame/drivers/play_1.cpp

@@ -41,6 +41,10 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void chance(machine_config &config);
+	void play_1(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(port07_r);
 	DECLARE_WRITE8_MEMBER(port01_w);
 	DECLARE_WRITE8_MEMBER(port02_w);
@@ -55,12 +59,10 @@ public:
 	DECLARE_READ_LINE_MEMBER(ef4_r);
 	DECLARE_WRITE_LINE_MEMBER(clock_w);
 
-	void chance(machine_config &config);
-	void play_1(machine_config &config);
 	void chance_map(address_map &map);
 	void play_1_io(address_map &map);
 	void play_1_map(address_map &map);
-private:
+
 	uint16_t m_resetcnt;
 	uint16_t m_clockcnt;
 	uint16_t m_waitcnt;

src/mame/drivers/play_2.cpp

@@ -59,6 +59,12 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void play_2(machine_config &config);
+	void zira(machine_config &config);
+
+	void init_zira();
+
+private:
 	DECLARE_WRITE8_MEMBER(port01_w);
 	DECLARE_WRITE8_MEMBER(port02_w);
 	DECLARE_WRITE8_MEMBER(port03_w);
@@ -78,14 +84,11 @@ public:
 	DECLARE_READ8_MEMBER(psg_r);
 	DECLARE_WRITE8_MEMBER(psg_w);
 	DECLARE_READ8_MEMBER(sound_in_r);
-	void init_zira();
 
-	void play_2(machine_config &config);
-	void zira(machine_config &config);
 	void play_2_io(address_map &map);
 	void play_2_map(address_map &map);
 	void zira_sound_map(address_map &map);
-private:
+
 	uint16_t m_clockcnt;
 	uint16_t m_resetcnt;
 	uint8_t m_kbdrow;

src/mame/drivers/play_3.cpp

@@ -73,6 +73,11 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void sklflite(machine_config &config);
+	void play_3(machine_config &config);
+	void megaaton(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(port01_w);
 	DECLARE_WRITE8_MEMBER(megaaton_port01_w);
 	DECLARE_WRITE8_MEMBER(port02_w);
@@ -92,16 +97,13 @@ public:
 	DECLARE_READ8_MEMBER(port02_a_r);
 	DECLARE_READ_LINE_MEMBER(clear_a_r);
 
-	void sklflite(machine_config &config);
-	void play_3(machine_config &config);
-	void megaaton(machine_config &config);
 	void megaaton_io(address_map &map);
 	void play_3_audio_io(address_map &map);
 	void play_3_audio_map(address_map &map);
 	void play_3_io(address_map &map);
 	void play_3_map(address_map &map);
 	void sklflite_io(address_map &map);
-private:
+
 	u16 m_clockcnt;
 	u16 m_resetcnt;
 	u16 m_resetcnt_a;

src/mame/drivers/plus4.cpp

@@ -76,6 +76,11 @@ public:
 		m_exp_irq(CLEAR_LINE)
 	{ }
 
+	void plus4(machine_config &config);
+
+	DECLARE_WRITE8_MEMBER( cpu_w );
+
+protected:
 	required_device<m7501_device> m_maincpu;
 	required_device<pla_device> m_pla;
 	required_device<mos7360_device> m_ted;
@@ -108,7 +113,6 @@ public:
 	DECLARE_READ8_MEMBER( ted_videoram_r );
 
 	DECLARE_READ8_MEMBER( cpu_r );
-	DECLARE_WRITE8_MEMBER( cpu_w );
 
 	DECLARE_WRITE_LINE_MEMBER( ted_irq_w );
 	DECLARE_READ8_MEMBER( ted_k_r );
@@ -155,7 +159,6 @@ public:
 	// keyboard state
 	uint8_t m_kb;
 
-	void plus4(machine_config &config);
 	void plus4_mem(address_map &map);
 	void ted_videoram_map(address_map &map);
 };
@@ -168,13 +171,15 @@ public:
 		: plus4_state(mconfig, type, tag)
 	{ }
 
-	DECLARE_READ8_MEMBER( cpu_r );
 	void v364(machine_config &config);
 	void c16n(machine_config &config);
 	void c16p(machine_config &config);
 	void c232(machine_config &config);
 	void plus4p(machine_config &config);
 	void plus4n(machine_config &config);
+
+private:
+	DECLARE_READ8_MEMBER( cpu_r );
 };
 
 

src/mame/drivers/pluto5.cpp

@@ -189,20 +189,22 @@ public:
 			m_maincpu(*this, "maincpu")
 	{ }
 
+	void pluto5(machine_config &config);
+
+	void init_hb();
+
+private:
 	uint32_t* m_cpuregion;
 	std::unique_ptr<uint32_t[]> m_mainram;
 
 	DECLARE_READ32_MEMBER(pluto5_mem_r);
 	DECLARE_WRITE32_MEMBER(pluto5_mem_w);
 
-	void pluto5(machine_config &config);
 	void pluto5_map(address_map &map);
-protected:
 
 	// devices
 	required_device<m68340_cpu_device> m_maincpu;
-public:
+
-	void init_hb();
 	virtual void machine_start() override;
 };
 

src/mame/drivers/pmi80.cpp

@@ -47,13 +47,15 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void pmi80(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(keyboard_r);
 	DECLARE_WRITE8_MEMBER(keyboard_w);
 	DECLARE_WRITE8_MEMBER(leds_w);
-	void pmi80(machine_config &config);
 	void pmi80_io(address_map &map);
 	void pmi80_mem(address_map &map);
-private:
+
 	uint8_t m_keyrow;
 	bool m_ledready;
 	virtual void machine_reset() override;

src/mame/drivers/pntnpuzl.cpp

@@ -155,6 +155,13 @@ public:
 		m_via(*this, "via")
 	{ }
 
+	void pntnpuzl(machine_config &config);
+
+	void init_pip();
+
+	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+private:
 	uint16_t m_pntpzl_200000;
 	uint16_t m_serial;
 	uint16_t m_serial_out;
@@ -169,10 +176,7 @@ public:
 	DECLARE_READ16_MEMBER(irq1_ack_r);
 	DECLARE_READ16_MEMBER(irq2_ack_r);
 	DECLARE_READ16_MEMBER(irq4_ack_r);
-	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-	void init_pip();
 	required_device<via6522_device> m_via;
-	void pntnpuzl(machine_config &config);
 	void mcu_map(address_map &map);
 	void pntnpuzl_map(address_map &map);
 };

src/mame/drivers/pockchal.cpp

@@ -41,6 +41,9 @@ public:
 		, m_cart(*this, "cartslot")
 	{ }
 
+	void pockchalv1(machine_config &config);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -49,7 +52,6 @@ public:
 	required_device<generic_slot_device> m_cart;
 	uint32_t  m_rom_size;
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(pockchalv1_cart);
-	void pockchalv1(machine_config &config);
 	void pockchalv1_map(address_map &map);
 };