private: use (W,X,Y,Z,#) (#3721)

* private: use (W,X,Y,Z,#)

* A part 1 (nw)

src/mame/drivers/1945kiii.cpp

@@ -70,7 +70,7 @@ public:
 	void flagrall(machine_config &config);
 	void k3(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE16_MEMBER(bgram_w);
 	DECLARE_WRITE16_MEMBER(scrollx_w);
 	DECLARE_WRITE16_MEMBER(scrolly_w);
@@ -88,7 +88,6 @@ protected:
 	void flagrall_map(address_map &map);
 	void k3_base_map(address_map &map);
 
-private:
 	/* devices */
 	optional_device_array<okim6295_device, 2> m_oki;
 	/* memory pointers */

src/mame/drivers/24cdjuke.cpp

@@ -71,6 +71,9 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 		{ }
 
+	void midcoin24cdjuke(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_ioport m_io_row0;
 	required_ioport m_io_row1;
@@ -88,10 +91,9 @@ public:
 
 	DECLARE_READ8_MEMBER(unknown_r) { return machine().rand(); }
 
-	void midcoin24cdjuke(machine_config &config);
 	void midcoin24cdjuke_io(address_map &map);
 	void midcoin24cdjuke_map(address_map &map);
-private:
+
 	uint8_t m_kb_col;
 };
 

src/mame/drivers/2mindril.cpp

@@ -50,6 +50,11 @@ public:
 		: taito_f3_state(mconfig, type, tag),
 		m_in0(*this, "IN0") { }
 
+	void drill(machine_config &config);
+
+	void init_drill();
+
+private:
 	/* input-related */
 	required_ioport m_in0;
 	uint8_t         m_defender_sensor;
@@ -63,7 +68,7 @@ public:
 	DECLARE_WRITE16_MEMBER(sensors_w);
 	DECLARE_READ16_MEMBER(drill_irq_r);
 	DECLARE_WRITE16_MEMBER(drill_irq_w);
-	void init_drill();
+
 	DECLARE_MACHINE_START(drill);
 	DECLARE_MACHINE_RESET(drill);
 	INTERRUPT_GEN_MEMBER(drill_vblank_irq);
@@ -71,7 +76,6 @@ public:
 	void tile_decode();
 	DECLARE_WRITE_LINE_MEMBER(irqhandler);
 
-	void drill(machine_config &config);
 	void drill_map(address_map &map);
 
 	#ifdef UNUSED_FUNCTION

src/mame/drivers/3x3puzzl.cpp

@@ -63,6 +63,9 @@ public:
 			m_screen(*this, "screen")
 	{ }
 
+	void _3x3puzzle(machine_config &config);
+
+private:
 	/* memory pointers */
 	required_shared_ptr<uint16_t> m_videoram1;
 	required_shared_ptr<uint16_t> m_videoram2;
@@ -97,9 +100,8 @@ public:
 	DECLARE_WRITE16_MEMBER(tilemap1_scrollx_w);
 	DECLARE_WRITE16_MEMBER(tilemap1_scrolly_w);
 
-	void _3x3puzzle(machine_config &config);
 	void _3x3puzzle_map(address_map &map);
-protected:
+
 	virtual void video_start() override;
 	virtual void machine_start() override;
 	virtual void machine_reset() override;

src/mame/drivers/4004clk.cpp

@@ -29,7 +29,7 @@ public:
 
 	void _4004clk(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE8_MEMBER( nixie_w );
 	DECLARE_WRITE8_MEMBER( neon_w );
 
@@ -41,7 +41,6 @@ protected:
 
 	virtual void machine_start() override;
 
-private:
 	static constexpr uint8_t nixie_to_num(uint16_t val)
 	{
 		return

src/mame/drivers/4dpi.cpp

@@ -34,6 +34,11 @@ public:
 		: driver_device(mconfig, type, tag) ,
 		m_maincpu(*this, "maincpu") { }
 
+	void sgi_ip6(machine_config &config);
+
+	void init_sgi_ip6();
+
+private:
 	ip6_regs_t m_ip6_regs;
 	DECLARE_READ32_MEMBER(ip6_unk1_r);
 	DECLARE_WRITE32_MEMBER(ip6_unk1_w);
@@ -41,7 +46,6 @@ public:
 	DECLARE_WRITE32_MEMBER(ip6_unk2_w);
 	DECLARE_READ32_MEMBER(ip6_unk3_r);
 	DECLARE_WRITE32_MEMBER(ip6_unk3_w);
-	void init_sgi_ip6();
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -49,7 +53,6 @@ public:
 	INTERRUPT_GEN_MEMBER(sgi_ip6_vbl);
 	inline void ATTR_PRINTF(3,4) verboselog( int n_level, const char *s_fmt, ... );
 	required_device<cpu_device> m_maincpu;
-	void sgi_ip6(machine_config &config);
 	void sgi_ip6_map(address_map &map);
 };
 

src/mame/drivers/4enlinea.cpp

@@ -214,7 +214,9 @@ public:
 		m_maincpu(*this, "maincpu")
 	{ }
 
+	void _4enlinea(machine_config &config);
 
+private:
 	required_device<ay8910_device> m_ay;
 
 	DECLARE_READ8_MEMBER(serial_r);
@@ -233,7 +235,6 @@ public:
 	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
 
-	void _4enlinea(machine_config &config);
 	void audio_map(address_map &map);
 	void audio_portmap(address_map &map);
 	void main_map(address_map &map);

src/mame/drivers/5clown.cpp

@@ -471,6 +471,11 @@ public:
 	{
 	}
 
+	void fclown(machine_config &config);
+
+	void init_fclown();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
 	required_device<ay8910_device> m_ay8910;
@@ -501,13 +506,12 @@ public:
 	DECLARE_READ8_MEMBER(pia0_b_r);
 	DECLARE_READ8_MEMBER(pia1_b_r);
 	DECLARE_WRITE8_MEMBER(fclown_ay8910_w);
-	void init_fclown();
 	TILE_GET_INFO_MEMBER(get_fclown_tile_info);
 	virtual void machine_start() override;
 	virtual void video_start() override;
 	DECLARE_PALETTE_INIT(_5clown);
 	uint32_t screen_update_fclown(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void fclown(machine_config &config);
+
 	void fcaudio_map(address_map &map);
 	void fclown_map(address_map &map);
 };

src/mame/drivers/68ksbc.cpp

@@ -42,8 +42,9 @@ public:
 	{ }
 
 	void c68ksbc(machine_config &config);
-	void c68ksbc_mem(address_map &map);
+
 private:
+	void c68ksbc_mem(address_map &map);
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/a1supply.cpp

@@ -45,21 +45,18 @@ public:
 	{
 	}
 
+	void a1supply(machine_config &config);
+
+private:
 	// devices
 	required_device<netlist_mame_device> m_maincpu;
 	required_device<fixedfreq_device> m_video;
 
-	void a1supply(machine_config &config);
-protected:
-
 	// driver_device overrides
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
 	virtual void video_start() override;
-
-private:
-
 };
 
 

src/mame/drivers/a5105.cpp

@@ -59,6 +59,9 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void a5105(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(a5105_memsel_r);
 	DECLARE_READ8_MEMBER(key_r);
 	DECLARE_READ8_MEMBER(key_mux_r);
@@ -73,11 +76,10 @@ public:
 	UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
 	UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
 
-	void a5105(machine_config &config);
 	void a5105_io(address_map &map);
 	void a5105_mem(address_map &map);
 	void upd7220_map(address_map &map);
-private:
+
 	uint8_t *m_ram_base;
 	uint8_t *m_rom_base;
 	uint8_t *m_char_ram;

src/mame/drivers/a51xx.cpp

@@ -26,6 +26,10 @@ public:
 		, m_maincpu(*this, "maincpu")
 	{ }
 
+	void a5130(machine_config &config);
+	void a5120(machine_config &config);
+
+private:
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	DECLARE_MACHINE_RESET(a5130);
@@ -33,8 +37,6 @@ public:
 	uint32_t screen_update_a5120(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_a5130(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
-	void a5130(machine_config &config);
-	void a5120(machine_config &config);
 	void a5120_io(address_map &map);
 	void a5120_mem(address_map &map);
 	void a5130_io(address_map &map);

src/mame/drivers/a6809.cpp

@@ -77,7 +77,7 @@ public:
 
 	void a6809(machine_config &config);
 
-protected:
+private:
 	void kbd_put(u8 data);
 	DECLARE_READ8_MEMBER(videoram_r);
 	DECLARE_WRITE8_MEMBER(a6809_address_w);
@@ -89,7 +89,6 @@ protected:
 
 	void a6809_mem(address_map &map);
 
-private:
 	required_shared_ptr<uint8_t> m_p_videoram;
 	uint16_t m_start_address;
 	uint16_t m_cursor_address;

src/mame/drivers/a7150.cpp

@@ -67,6 +67,9 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void a7150(machine_config &config);
+
+private:
 	virtual void machine_reset() override;
 	virtual void machine_start() override;
 
@@ -104,7 +107,7 @@ public:
 	required_shared_ptr<uint8_t> m_video_ram;
 	required_device<address_map_bank_device> m_video_bankdev;
 	required_device<palette_device> m_palette;
-	void a7150(machine_config &config);
+
 	void a7150_io(address_map &map);
 	void a7150_mem(address_map &map);
 	void k7070_cpu_banked(address_map &map);

src/mame/drivers/a7800.cpp

@@ -157,7 +157,6 @@ protected:
 	int m_p2_one_button;
 	int m_bios_enabled;
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<tia_device> m_tia;
 	required_device<atari_maria_device> m_maria;

src/mame/drivers/aa310.cpp

@@ -107,20 +107,6 @@ public:
 		, m_ram(*this, RAM_TAG)
 	{ }
 
-	required_shared_ptr<uint32_t> m_physram;
-
-	DECLARE_READ32_MEMBER(aa310_psy_wram_r);
-	DECLARE_WRITE32_MEMBER(aa310_psy_wram_w);
-	DECLARE_WRITE_LINE_MEMBER(aa310_wd177x_intrq_w);
-	DECLARE_WRITE_LINE_MEMBER(aa310_wd177x_drq_w);
-	void init_aa310();
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
-	DECLARE_INPUT_CHANGED_MEMBER(send_mouse_input);
-	DECLARE_FLOPPY_FORMATS( floppy_formats );
-
-
 	void aa5000a(machine_config &config);
 	void aa305(machine_config &config);
 	void aa310(machine_config &config);
@@ -135,8 +121,27 @@ public:
 	void aa540(machine_config &config);
 	void aa440(machine_config &config);
 	void aa4201(machine_config &config);
+
+	void init_aa310();
+
+	DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
+	DECLARE_INPUT_CHANGED_MEMBER(send_mouse_input);
+
+private:
+	required_shared_ptr<uint32_t> m_physram;
+
+	DECLARE_READ32_MEMBER(aa310_psy_wram_r);
+	DECLARE_WRITE32_MEMBER(aa310_psy_wram_w);
+	DECLARE_WRITE_LINE_MEMBER(aa310_wd177x_intrq_w);
+	DECLARE_WRITE_LINE_MEMBER(aa310_wd177x_drq_w);
+
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	DECLARE_FLOPPY_FORMATS( floppy_formats );
+
 	void aa310_mem(address_map &map);
-protected:
+
 	required_device<ram_device> m_ram;
 };
 

src/mame/drivers/aaa.cpp

@@ -19,9 +19,11 @@ public:
 	{ }
 
 	void aaa(machine_config &config);
+
+private:
 	void mem_map(address_map &map);
 	void io_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_p_chargen;
 };

src/mame/drivers/accomm.cpp

@@ -60,7 +60,7 @@ public:
 
 	void accomm(machine_config &config);
 
-protected:
+private:
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	DECLARE_WRITE8_MEMBER(ch00switch_w);
@@ -98,7 +98,6 @@ protected:
 	inline uint8_t read_vram( uint16_t addr );
 	inline void plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint32_t color);
 
-private:
 	bool m_ch00rom_enabled;
 
 	/* ULA context */

src/mame/drivers/acd.cpp

@@ -15,12 +15,12 @@ class acd_state : public driver_device
 public:
 	acd_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 acd(machine_config &config);
+	void acd(machine_config &config);
 private:
-//  required_device<cpu_device> m_maincpu;
+	//  required_device<cpu_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( acd )

src/mame/drivers/ace.cpp

@@ -64,7 +64,7 @@ public:
 
 	void ace(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE8_MEMBER(ace_objpos_w);
 	DECLARE_WRITE8_MEMBER(ace_characterram_w);
 	DECLARE_WRITE8_MEMBER(ace_scoreram_w);
@@ -76,7 +76,6 @@ protected:
 	void ace_postload();
 	void main_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 
 	/* video-related */

src/mame/drivers/aceex.cpp

@@ -56,10 +56,13 @@ public:
 		: driver_device(mconfig, type, tag)
 		,m_maincpu(*this, "maincpu")
 	{ }
+
+	void aceex2814(machine_config &config);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
-	void aceex2814(machine_config &config);
 	void aceex2814_map(address_map &map);
 };
 

src/mame/drivers/acefruit.cpp

@@ -23,11 +23,6 @@ Inputs and Dip Switches by Stephh
 class acefruit_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_ACEFRUIT_REFRESH
-	};
-
 	acefruit_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
@@ -44,15 +39,20 @@ public:
 		m_refresh_timer(nullptr)
 	{ }
 
+	void acefruit(machine_config &config);
+
 	void init_sidewndr();
 
 	DECLARE_CUSTOM_INPUT_MEMBER(sidewndr_payout_r);
 	DECLARE_CUSTOM_INPUT_MEMBER(starspnr_coinage_r);
 	DECLARE_CUSTOM_INPUT_MEMBER(starspnr_payout_r);
 
-	void acefruit(machine_config &config);
+private:
+	enum
+	{
+		TIMER_ACEFRUIT_REFRESH
+	};
 
-protected:
 	DECLARE_WRITE8_MEMBER(acefruit_colorram_w);
 	DECLARE_WRITE8_MEMBER(acefruit_coin_w);
 	DECLARE_WRITE8_MEMBER(acefruit_sound_w);
@@ -71,7 +71,6 @@ protected:
 	void acefruit_io(address_map &map);
 	void acefruit_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint8_t> m_videoram;
 	required_shared_ptr<uint8_t> m_colorram;

src/mame/drivers/acesp.cpp

@@ -29,15 +29,16 @@ public:
 	{ }
 
 	void ace_sp(machine_config &config);
+
+	void init_ace_sp();
+	void init_ace_cr();
+
+private:
 	void ace_sp_map(address_map &map);
 	void ace_sp_portmap(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;
-public:
-	void init_ace_sp();
-	void init_ace_cr();
 };
 
 

src/mame/drivers/acommand.cpp

@@ -85,6 +85,9 @@ public:
 		m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void acommand(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(oki_bank_w);
 	DECLARE_WRITE16_MEMBER(output_7seg0_w);
 	DECLARE_WRITE16_MEMBER(output_7seg1_w);
@@ -101,13 +104,10 @@ public:
 	uint32_t screen_update_acommand(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(acommand_scanline);
 
-
-	void acommand(machine_config &config);
 	void acommand_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 
-private:
 	required_shared_ptr<uint16_t> m_spriteram;
 	required_device<cpu_device> m_maincpu;
 	required_device<okim6295_device> m_oki1;

src/mame/drivers/acrnsys1.cpp

@@ -72,7 +72,7 @@ public:
 
 	void acrnsys1(machine_config &config);
 
-protected:
+private:
 	virtual void machine_start() override;
 	DECLARE_READ8_MEMBER(ins8154_b1_port_a_r);
 	DECLARE_WRITE8_MEMBER(ins8154_b1_port_a_w);
@@ -81,7 +81,6 @@ protected:
 	TIMER_DEVICE_CALLBACK_MEMBER(acrnsys1_p);
 	void acrnsys1_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<ttl74145_device> m_ttl74145;
 	required_device<cassette_image_device> m_cass;

src/mame/drivers/acvirus.cpp

@@ -76,16 +76,16 @@ public:
 		m_rombank(*this, "rombank")
 	{ }
 
-	void init_virus();
 	void virus(machine_config &config);
 
-protected:
+	void init_virus();
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
 	void virus_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_memory_bank m_rombank;
 };

src/mame/drivers/adp.cpp

@@ -181,6 +181,14 @@ public:
 		m_in0(*this, "IN0")
 	{ }
 
+	void skattv(machine_config &config);
+	void quickjac(machine_config &config);
+	void fashiong(machine_config &config);
+	void fstation(machine_config &config);
+	void funland(machine_config &config);
+	void skattva(machine_config &config);
+
+private:
 	required_device<microtouch_device> m_microtouch;
 	required_device<cpu_device> m_maincpu;
 	required_device<mc68681_device> m_duart;
@@ -200,12 +208,7 @@ public:
 	IRQ_CALLBACK_MEMBER(duart_iack_handler);
 	//INTERRUPT_GEN_MEMBER(adp_int);
 	void skattva_nvram_init(nvram_device &nvram, void *base, size_t size);
-	void skattv(machine_config &config);
+
-	void quickjac(machine_config &config);
-	void fashiong(machine_config &config);
-	void fstation(machine_config &config);
-	void funland(machine_config &config);
-	void skattva(machine_config &config);
 	void adp_hd63484_map(address_map &map);
 	void fashiong_hd63484_map(address_map &map);
 	void fstation_hd63484_map(address_map &map);

src/mame/drivers/agat.cpp

@@ -106,6 +106,9 @@ public:
 		, m_upperbank(*this, A7_UPPERBANK_TAG)
 	{ }
 
+	void agat7(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<ram_device> m_ram;
 	required_device<ay3600_device> m_ay3600;
@@ -160,10 +163,9 @@ public:
 	DECLARE_READ8_MEMBER(controller_strobe_r);
 	DECLARE_WRITE8_MEMBER(controller_strobe_w);
 
-	void agat7(machine_config &config);
 	void agat7_map(address_map &map);
 	void inhbank_map(address_map &map);
-private:
+
 	int m_speaker_state;
 	int m_cassette_state;
 

src/mame/drivers/age_candy.cpp

@@ -24,10 +24,12 @@ public:
 	//  ,m_maincpu(*this, "maincpu")
 	{ }
 
+	void age_candy(machine_config &config);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
-	void age_candy(machine_config &config);
 	void age_candy_map(address_map &map);
 //  required_device<mcs51_cpu_device> m_maincpu;
 };

src/mame/drivers/aim65_40.cpp

@@ -74,10 +74,12 @@ class aim65_40_state : public driver_device
 public:
 	aim65_40_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		{ }
+	{ }
 
-		void aim65_40(machine_config &config);
+	void aim65_40(machine_config &config);
-		void aim65_40_mem(address_map &map);
+
+private:
+	void aim65_40_mem(address_map &map);
 	// devices
 	//device_t *m_via0;
 	//device_t *m_via1;

src/mame/drivers/airraid.cpp

@@ -172,7 +172,13 @@ public:
 		, m_airraid_video(*this,"airraid_vid")
 	{ }
 
+	void airraid(machine_config &config);
+	void airraid_crypt(machine_config &config);
 
+	void init_cshootere();
+	void init_cshooter();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	optional_device<seibu_sound_device> m_seibu_sound;
 	optional_shared_ptr<uint8_t> m_mainram;
@@ -185,12 +191,9 @@ public:
 	DECLARE_WRITE8_MEMBER(cshooter_c500_w);
 	DECLARE_WRITE8_MEMBER(cshooter_c700_w);
 	DECLARE_WRITE8_MEMBER(bank_w);
-	void init_cshootere();
-	void init_cshooter();
 	DECLARE_MACHINE_RESET(cshooter);
 	TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline);
-	void airraid(machine_config &config);
+
-	void airraid_crypt(machine_config &config);
 	void airraid_map(address_map &map);
 	void airraid_sound_decrypted_opcodes_map(address_map &map);
 	void airraid_sound_map(address_map &map);

src/mame/drivers/akaiax80.cpp

@@ -60,8 +60,10 @@ public:
 	{ }
 
 	void ax80(machine_config &config);
-	void ax80_map(address_map &map);
+
 private:
+	void ax80_map(address_map &map);
+
 	virtual void machine_reset() override;
 	required_device<upd7810_device> m_maincpu;
 };

src/mame/drivers/albazc.cpp

@@ -37,7 +37,7 @@ public:
 
 	void hanaroku(machine_config &config);
 
-protected:
+private:
 	/* video-related */
 	DECLARE_WRITE8_MEMBER(hanaroku_out_0_w);
 	DECLARE_WRITE8_MEMBER(hanaroku_out_1_w);
@@ -49,7 +49,6 @@ protected:
 	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void hanaroku_map(address_map &map);
 
-private:
 	required_shared_ptr<uint8_t> m_spriteram1;
 	required_shared_ptr<uint8_t> m_spriteram2;
 	required_shared_ptr<uint8_t> m_spriteram3;

src/mame/drivers/albazg.cpp

@@ -61,7 +61,7 @@ public:
 
 	virtual void yumefuda(machine_config &config);
 
-protected:
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -80,7 +80,6 @@ protected:
 	void main_map(address_map &map);
 	void port_map(address_map &map);
 
-private:
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_cus_ram;
 	required_shared_ptr<uint8_t> m_videoram;

src/mame/drivers/aleck64.cpp

@@ -193,7 +193,12 @@ public:
 			m_e90_pal(*this,"e90pal"),
 			m_dip_read_offset(0) { }
 
+	void aleck64(machine_config &config);
+	void a64_e90(machine_config &config);
+
 	void init_aleck64();
+
+private:
 	DECLARE_WRITE32_MEMBER(aleck_dips_w);
 	DECLARE_READ32_MEMBER(aleck_dips_r);
 	DECLARE_READ16_MEMBER(e90_prot_r);
@@ -201,16 +206,12 @@ public:
 
 	uint32_t screen_update_e90(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	void aleck64(machine_config &config);
-	void a64_e90(machine_config &config);
 	void e90_map(address_map &map);
 	void n64_map(address_map &map);
 	void rsp_map(address_map &map);
-protected:
 	optional_shared_ptr<uint32_t> m_e90_vram;
 	optional_shared_ptr<uint32_t> m_e90_pal;
 
-private:
 	uint32_t m_dip_read_offset;
 };
 

src/mame/drivers/alesis_qs.cpp

@@ -25,8 +25,10 @@ public:
 	{ }
 
 	void qs7(machine_config &config);
+
+private:
 	void qs7_prog_map(address_map &map);
-protected:
+
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/alien.cpp

@@ -81,16 +81,17 @@ public:
 			m_maincpu(*this, "maincpu")
 	{ }
 
+	void alien(machine_config &config);
+
+	void init_dkbanans();
+
+private:
 	DECLARE_READ64_MEMBER(test_r);
 
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	void alien(machine_config &config);
 	void alien_map(address_map &map);
 
-	void init_dkbanans();
-protected:
-
 	// devices
 	required_device<cpu_device> m_maincpu;
 

src/mame/drivers/alinvade.cpp

@@ -38,6 +38,9 @@ public:
 		, m_discrete(*this, "discrete")
 	{ }
 
+	void alinvade(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(irqmask_r);
 	DECLARE_WRITE8_MEMBER(irqmask_w);
 	DECLARE_WRITE8_MEMBER(sound_w);
@@ -45,9 +48,8 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	void alinvade(machine_config &config);
 	void alinvade_map(address_map &map);
-private:
+
 	uint8_t m_irqmask;
 	uint8_t m_irqff;
 	virtual void machine_start() override;

src/mame/drivers/allied.cpp

@@ -68,6 +68,9 @@ public:
 		, m_leds(*this, "led%u", 0U)
 	{ }
 
+	void allied(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(ic1_b_w);
 	DECLARE_WRITE8_MEMBER(ic2_b_w);
 	DECLARE_WRITE_LINE_MEMBER(ic2_cb2_w);
@@ -88,9 +91,8 @@ public:
 	DECLARE_READ8_MEMBER(ic7_a_r);
 	DECLARE_WRITE_LINE_MEMBER(ic8_cb2_w);
 	TIMER_DEVICE_CALLBACK_MEMBER(timer_a);
-	void allied(machine_config &config);
 	void allied_map(address_map &map);
-private:
+
 	uint32_t m_player_score[6];
 	uint8_t m_display;
 	uint8_t m_bit_counter;

src/mame/drivers/alphasma.cpp

@@ -37,6 +37,11 @@ public:
 	{
 	}
 
+	void alphasmart(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(kb_irq);
+
+protected:
 	required_device<cpu_device> m_maincpu;
 	required_device<hd44780_device> m_lcdc0;
 	required_device<hd44780_device> m_lcdc1;
@@ -51,7 +56,6 @@ public:
 	DECLARE_PALETTE_INIT(alphasmart);
 	virtual uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	DECLARE_INPUT_CHANGED_MEMBER(kb_irq);
 	DECLARE_READ8_MEMBER(kb_r);
 	DECLARE_WRITE8_MEMBER(kb_matrixl_w);
 	DECLARE_WRITE8_MEMBER(kb_matrixh_w);
@@ -61,10 +65,9 @@ public:
 	DECLARE_WRITE8_MEMBER(port_d_w);
 	void update_lcdc(address_space &space, bool lcdc0, bool lcdc1);
 
-	void alphasmart(machine_config &config);
 	void alphasmart_io(address_map &map);
 	void alphasmart_mem(address_map &map);
-protected:
+
 	uint8_t           m_matrix[2];
 	uint8_t           m_port_a;
 	uint8_t           m_port_d;
@@ -80,15 +83,17 @@ public:
 	{
 	}
 
+	void asma2k(machine_config &config);
+
+private:
 	required_shared_ptr<uint8_t> m_intram;
 
 	DECLARE_READ8_MEMBER(io_r);
 	DECLARE_WRITE8_MEMBER(io_w);
 	virtual DECLARE_WRITE8_MEMBER(port_a_w) override;
 
-	void asma2k(machine_config &config);
 	void asma2k_mem(address_map &map);
-private:
+
 	uint8_t m_lcd_ctrl;
 };
 

src/mame/drivers/alphatro.cpp

@@ -52,11 +52,6 @@
 class alphatro_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_SYSTEM
-	};
-
 	alphatro_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_ram(*this, RAM_TAG)
@@ -79,6 +74,16 @@ public:
 		, m_cart(*this, "cartslot")
 	{ }
 
+	void alphatro(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(alphatro_break);
+
+private:
+	enum
+	{
+		TIMER_SYSTEM
+	};
+
 	DECLARE_READ8_MEMBER (ram0000_r);
 	DECLARE_WRITE8_MEMBER(ram0000_w);
 	DECLARE_READ8_MEMBER (ram6000_r);
@@ -94,7 +99,6 @@ public:
 	DECLARE_WRITE8_MEMBER(port30_w);
 	DECLARE_READ8_MEMBER(portf0_r);
 	DECLARE_WRITE8_MEMBER(portf0_w);
-	DECLARE_INPUT_CHANGED_MEMBER(alphatro_break);
 	DECLARE_WRITE_LINE_MEMBER(txdata_callback);
 	DECLARE_WRITE_LINE_MEMBER(hrq_w);
 	DECLARE_WRITE_LINE_MEMBER(fdc_irq_w);
@@ -107,13 +111,12 @@ public:
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, m_cart); }
 	DECLARE_FLOPPY_FORMATS( floppy_formats );
 
-	void alphatro(machine_config &config);
 	void alphatro_io(address_map &map);
 	void alphatro_map(address_map &map);
 	void cartbank_map(address_map &map);
 	void monbank_map(address_map &map);
 	void rombank_map(address_map &map);
-private:
+
 	uint8_t *m_ram_ptr;
 	required_device<ram_device> m_ram;
 	required_shared_ptr<u8> m_p_videoram;

src/mame/drivers/altair.cpp

@@ -43,14 +43,13 @@ public:
 
 	void altair(machine_config &config);
 
-protected:
+private:
 	DECLARE_QUICKLOAD_LOAD_MEMBER(altair);
 
 	virtual void machine_reset() override;
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint8_t> m_ram;
 };

src/mame/drivers/alto1.cpp

@@ -18,12 +18,12 @@ class alto1_state : public driver_device
 public:
 	alto1_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 alto1(machine_config &config);
+	void alto1(machine_config &config);
 private:
-//  required_device<cpu_device> m_maincpu;
+	//  required_device<cpu_device> m_maincpu;
 };
 
 

src/mame/drivers/altos2.cpp

@@ -38,7 +38,7 @@ public:
 
 	void altos2(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE8_MEMBER(video_mode_w);
 
 	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -47,7 +47,6 @@ protected:
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<x2210_device> m_novram;
 	required_region_ptr<u8> m_p_chargen;

src/mame/drivers/altos486.cpp

@@ -26,7 +26,7 @@ public:
 
 	void altos486(machine_config &config);
 
-protected:
+private:
 	DECLARE_READ8_MEMBER(read_rmx_ack);
 
 	DECLARE_READ16_MEMBER(mmu_ram_r);
@@ -40,7 +40,6 @@ protected:
 	void altos486_z80_io(address_map &map);
 	void altos486_z80_mem(address_map &map);
 
-private:
 	required_device<i80186_cpu_device> m_maincpu;
 	required_shared_ptr<uint16_t> m_ram;
 	required_memory_region m_rom;

src/mame/drivers/altos5.cpp

@@ -38,12 +38,13 @@ public:
 		, m_floppy1(*this, "fdc:1")
 	{ }
 
-	void init_altos5();
 	void altos5(machine_config &config);
 
+	void init_altos5();
+
 	DECLARE_QUICKLOAD_LOAD_MEMBER(altos5);
 
-protected:
+private:
 	DECLARE_READ8_MEMBER(memory_read_byte);
 	DECLARE_WRITE8_MEMBER(memory_write_byte);
 	DECLARE_READ8_MEMBER(io_read_byte);
@@ -59,7 +60,6 @@ protected:
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-private:
 	uint8_t m_port08;
 	uint8_t m_port09;
 	uint8_t *m_p_prom;

src/mame/drivers/altos8600.cpp

@@ -35,7 +35,7 @@ public:
 
 	void altos8600(machine_config &config);
 
-protected:
+private:
 	DECLARE_READ16_MEMBER(cpuram_r);
 	DECLARE_WRITE16_MEMBER(cpuram_w);
 	DECLARE_READ16_MEMBER(stkram_r);
@@ -82,7 +82,6 @@ protected:
 	void extra_mem(address_map &map);
 	void stack_mem(address_map &map);
 
-private:
 	u16 xlate_r(address_space &space, offs_t offset, u16 mem_mask, int permbit);
 	void xlate_w(address_space &space, offs_t offset, u16 data, u16 mem_mask, int permbit);
 	void seterr(offs_t offset, u16 mem_mask, u16 err_mask);

src/mame/drivers/alvg.cpp

@@ -13,16 +13,17 @@ public:
 	{ }
 
 	void alvg(machine_config &config);
+
+	void init_alvg();
+
+private:
 	void alvg_map(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;
 
 	// driver_device overrides
 	virtual void machine_reset() override;
-public:
-	void init_alvg();
 };
 
 

src/mame/drivers/ambush.cpp

@@ -72,6 +72,11 @@ public:
 		m_color_bank(0)
 	{ }
 
+	void mariobl(machine_config &config);
+	void ambush(machine_config &config);
+	void dkong3abl(machine_config &config);
+
+private:
 	DECLARE_PALETTE_INIT(ambush);
 	DECLARE_PALETTE_INIT(mario);
 	DECLARE_PALETTE_INIT(dkong3);
@@ -96,13 +101,10 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
 	DECLARE_WRITE8_MEMBER(output_latches_w);
 
-	void mariobl(machine_config &config);
-	void ambush(machine_config &config);
-	void dkong3abl(machine_config &config);
 	void bootleg_map(address_map &map);
 	void main_map(address_map &map);
 	void main_portmap(address_map &map);
-private:
+
 	void register_save_states();
 
 	required_device<gfxdecode_device> m_gfxdecode;

src/mame/drivers/amerihok.cpp

@@ -33,6 +33,9 @@ public:
 		, m_oki(*this, "oki")
 	{ }
 
+	void amerihok(machine_config &config);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
@@ -40,7 +43,6 @@ public:
 
 	required_device<cpu_device> m_maincpu;
 	required_device<okim6376_device> m_oki;
-	void amerihok(machine_config &config);
 	void amerihok_data_map(address_map &map);
 	void amerihok_map(address_map &map);
 };

src/mame/drivers/amico2k.cpp

@@ -45,6 +45,9 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 		{ }
 
+	void amico2k(machine_config &config);
+
+private:
 	void machine_start() override;
 
 	DECLARE_READ8_MEMBER( ppi_pa_r );
@@ -55,9 +58,8 @@ public:
 	// timers
 	emu_timer *m_led_refresh_timer;
 	TIMER_CALLBACK_MEMBER(led_refresh);
-	void amico2k(machine_config &config);
 	void amico2k_mem(address_map &map);
-private:
+
 	int m_ls145_p;
 	uint8_t m_segment;
 	required_device<cpu_device> m_maincpu;

src/mame/drivers/ampex.cpp

@@ -36,6 +36,9 @@ public:
 		, m_p_chargen(*this, "chargen")
 	{ }
 
+	void ampex(machine_config &config);
+
+private:
 	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	DECLARE_READ8_MEMBER(read_5840);
@@ -54,9 +57,8 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(so_w);
 	DECLARE_WRITE_LINE_MEMBER(dav_w);
 
-	void ampex(machine_config &config);
 	void mem_map(address_map &map);
-private:
+
 	virtual void machine_start() override;
 
 	u8 m_page;

src/mame/drivers/ampro.cpp

@@ -44,17 +44,20 @@ public:
 		, m_floppy0(*this, "fdc:0")
 	{ }
 
+	void ampro(machine_config &config);
+
 	void init_ampro();
+
+private:
 	DECLARE_MACHINE_RESET(ampro);
 	TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
 	DECLARE_WRITE8_MEMBER(port00_w);
 	DECLARE_READ8_MEMBER(io_r);
 	DECLARE_WRITE8_MEMBER(io_w);
 
-	void ampro(machine_config &config);
 	void ampro_io(address_map &map);
 	void ampro_mem(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 	required_device<z80dart_device> m_dart;
 	required_device<z80ctc_device> m_ctc;

src/mame/drivers/ampscarp.cpp

@@ -23,8 +23,9 @@ public:
 	{ }
 
 	void ampscarp(machine_config &config);
-	void mem_map(address_map &map);
+
 private:
+	void mem_map(address_map &map);
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/amstr_pc.cpp

@@ -53,6 +53,12 @@ public:
 	{
 	}
 
+	void pc200(machine_config &config);
+	void pc2086(machine_config &config);
+	void ppc640(machine_config &config);
+	void ppc512(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<pc_noppi_mb_device> m_mb;
 	required_device<pc_keyboard_device> m_keyboard;
@@ -86,10 +92,7 @@ public:
 
 	int m_dipstate;
 	static void cfg_com(device_t *device);
-	void pc200(machine_config &config);
+
-	void pc2086(machine_config &config);
-	void ppc640(machine_config &config);
-	void ppc512(machine_config &config);
 	void pc200_io(address_map &map);
 	void pc2086_map(address_map &map);
 	void ppc512_io(address_map &map);

src/mame/drivers/amusco.cpp

@@ -115,8 +115,13 @@ public:
 		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
-	TILE_GET_INFO_MEMBER(get_bg_tile_info);
+	void amusco(machine_config &config);
+	void draw88pkr(machine_config &config);
+
 	DECLARE_WRITE_LINE_MEMBER(coin_irq);
+
+private:
+	TILE_GET_INFO_MEMBER(get_bg_tile_info);
 	DECLARE_READ8_MEMBER(mc6845_r);
 	DECLARE_WRITE8_MEMBER(mc6845_w);
 	DECLARE_WRITE8_MEMBER(output_a_w);
@@ -130,14 +135,9 @@ public:
 	MC6845_UPDATE_ROW(update_row);
 	DECLARE_PALETTE_INIT(amusco);
 
-	void amusco(machine_config &config);
-	void draw88pkr(machine_config &config);
-
-protected:
 	virtual void video_start() override;
 	virtual void machine_start() override;
 
-private:
 	void amusco_mem_map(address_map &map);
 	void amusco_io_map(address_map &map);
 

src/mame/drivers/amust.cpp

@@ -98,11 +98,6 @@ ToDo:
 class amust_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_BEEP_OFF
-	};
-
 	amust_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_palette(*this, "palette")
@@ -114,8 +109,17 @@ public:
 		, m_floppy0(*this, "fdc:0")
 		, m_floppy1(*this, "fdc:1")
 	{ }
+	
+	void amust(machine_config &config);
 
 	void init_amust();
+
+private:
+	enum
+	{
+		TIMER_BEEP_OFF
+	};
+
 	DECLARE_MACHINE_RESET(amust);
 	DECLARE_READ8_MEMBER(port04_r);
 	DECLARE_WRITE8_MEMBER(port04_w);
@@ -132,10 +136,9 @@ public:
 	INTERRUPT_GEN_MEMBER(irq_vs);
 	MC6845_UPDATE_ROW(crtc_update_row);
 
-	void amust(machine_config &config);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-private:
+
 	u8 m_port04;
 	u8 m_port06;
 	u8 m_port08;

src/mame/drivers/anes.cpp

@@ -37,18 +37,19 @@ public:
 	{
 	}
 
+	void anes(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(vram_offset_w);
 	DECLARE_WRITE8_MEMBER(blit_trigger_w);
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void anes(machine_config &config);
 	void io_map(address_map &map);
 	void prg_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 
-private:
 	uint8_t m_vram_offset[3];
 };
 

src/mame/drivers/anzterm.cpp

@@ -364,11 +364,13 @@ public:
 	{
 	}
 
+	void anzterm(machine_config &config);
+
+private:
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 	{
 		return 0;
 	}
-	void anzterm(machine_config &config);
 	void anzterm(address_map &map);
 };
 

src/mame/drivers/apc.cpp

@@ -95,6 +95,13 @@ public:
 		m_palette(*this, "palette")
 	{ }
 
+	void apc(machine_config &config);
+
+	void init_apc();
+
+	DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
+
+private:
 	// devices
 	required_device<cpu_device> m_maincpu;
 	required_device<upd7220_device> m_hgdc1;
@@ -144,7 +151,6 @@ public:
 		uint8_t sig; //switch signal port
 		uint8_t sh; //shift switches
 	}m_keyb;
-	DECLARE_INPUT_CHANGED_MEMBER(key_stroke);
 
 	DECLARE_READ8_MEMBER(get_slave_ack);
 	DECLARE_WRITE_LINE_MEMBER(apc_dma_hrq_changed);
@@ -158,20 +164,17 @@ public:
 	DECLARE_READ8_MEMBER(apc_dma_read_byte);
 	DECLARE_WRITE8_MEMBER(apc_dma_write_byte);
 
-	void init_apc();
-
 	int m_dack;
 	uint8_t m_dma_offset[4];
 
 	UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
 	UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
 
-	void apc(machine_config &config);
 	void apc_io(address_map &map);
 	void apc_map(address_map &map);
 	void upd7220_1_map(address_map &map);
 	void upd7220_2_map(address_map &map);
-protected:
+
 	// driver_device overrides
 	virtual void machine_start() override;
 	virtual void machine_reset() override;

src/mame/drivers/apf.cpp

@@ -110,6 +110,10 @@ public:
 		, m_p_videoram(*this, "videoram")
 	{ }
 
+	void apfm1000(machine_config &config);
+	void apfimag(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(videoram_r);
 	DECLARE_READ8_MEMBER(pia0_porta_r);
 	DECLARE_WRITE8_MEMBER(pia0_portb_w);
@@ -121,11 +125,9 @@ public:
 	DECLARE_READ8_MEMBER(serial_r);
 	DECLARE_WRITE8_MEMBER(serial_w);
 
-	void apfm1000(machine_config &config);
-	void apfimag(machine_config &config);
 	void apfimag_map(address_map &map);
 	void apfm1000_map(address_map &map);
-private:
+
 	uint8_t m_latch;
 	uint8_t m_keyboard_data;
 	uint8_t m_pad_data;

src/mame/drivers/apogee.cpp

@@ -33,6 +33,9 @@ public:
 		: radio86_state(mconfig, type, tag),
 		m_speaker(*this, "speaker") { }
 
+	void apogee(machine_config &config);
+
+private:
 	uint8_t m_out0;
 	uint8_t m_out1;
 	uint8_t m_out2;
@@ -42,7 +45,6 @@ public:
 	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
 
 	required_device<speaker_sound_device> m_speaker;
-	void apogee(machine_config &config);
 	void apogee_mem(address_map &map);
 };
 

src/mame/drivers/applix.cpp

@@ -101,6 +101,11 @@ public:
 		m_expansion(*this, "expansion"),
 		m_palette(*this, "palette"){ }
 
+	void applix(machine_config &config);
+
+	void init_applix();
+
+private:
 	DECLARE_READ16_MEMBER(applix_inputs_r);
 	DECLARE_WRITE16_MEMBER(palette_w);
 	DECLARE_WRITE16_MEMBER(analog_latch_w);
@@ -135,7 +140,7 @@ public:
 	DECLARE_READ8_MEMBER( p3_read );
 	DECLARE_WRITE8_MEMBER( p3_write );
 	TIMER_DEVICE_CALLBACK_MEMBER(cass_timer);
-	void init_applix();
+
 	MC6845_UPDATE_ROW(crtc_update_row);
 	uint8_t m_video_latch;
 	uint8_t m_pa;
@@ -144,13 +149,13 @@ public:
 	DECLARE_PALETTE_INIT(applix);
 	uint8_t m_palette_latch[4];
 	required_shared_ptr<uint16_t> m_base;
-	void applix(machine_config &config);
+
 	void applix_mem(address_map &map);
 	void keytronic_pc3270_io(address_map &map);
 	void keytronic_pc3270_program(address_map &map);
 	void subcpu_io(address_map &map);
 	void subcpu_mem(address_map &map);
-private:
+
 	uint8_t m_pb;
 	uint8_t m_analog_latch;
 	uint8_t m_dac_latch;
@@ -205,7 +210,7 @@ private:
 	required_ioport m_io_k3b0;
 	required_ioport m_io_k0b;
 	required_shared_ptr<uint16_t> m_expansion;
-public:
+
 	required_device<palette_device> m_palette;
 };
 

src/mame/drivers/apricot.cpp

@@ -68,6 +68,10 @@ public:
 		m_bus_locked(0)
 	{ }
 
+	void apricot(machine_config &config);
+	void apricotxi(machine_config &config);
+
+private:
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
 	DECLARE_WRITE_LINE_MEMBER(i8086_lock_w);
@@ -90,14 +94,11 @@ public:
 	MC6845_UPDATE_ROW(crtc_update_row);
 	uint32_t screen_update_apricot(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	void apricot(machine_config &config);
-	void apricotxi(machine_config &config);
 	void apricot_io(address_map &map);
 	void apricot_mem(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 
-private:
 	required_device<i8086_cpu_device> m_cpu;
 	required_device<i8089_device> m_iop;
 	required_device<ram_device> m_ram;

src/mame/drivers/apricotf.cpp

@@ -76,6 +76,9 @@ public:
 		, m_palette(*this, "palette")
 	{ }
 
+	void act_f1(machine_config &config);
+
+private:
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
 	virtual void machine_start() override;
@@ -104,7 +107,7 @@ public:
 
 	int m_40_80;
 	int m_200_256;
-	void act_f1(machine_config &config);
+
 	void act_f1_io(address_map &map);
 	void act_f1_mem(address_map &map);
 };

src/mame/drivers/apricotp.cpp

@@ -105,6 +105,9 @@ public:
 			m_video_ram(*this, "video_ram")
 	{ }
 
+	void fp(machine_config &config);
+
+private:
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
 	required_device<cpu_device> m_maincpu;
@@ -155,7 +158,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER( write_centronics_select );
 	DECLARE_WRITE_LINE_MEMBER( write_centronics_fault );
 	DECLARE_WRITE_LINE_MEMBER( write_centronics_perror );
-	void fp(machine_config &config);
+
 	void fp_io(address_map &map);
 	void fp_mem(address_map &map);
 	void sound_io(address_map &map);

src/mame/drivers/arachnid.cpp

@@ -86,6 +86,9 @@ public:
 			m_speaker(*this, SPEAKER_TAG)
 	{ }
 
+	void arachnid(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<pia6821_device> m_pia_u4;
 	required_device<pia6821_device> m_pia_u17;
@@ -109,7 +112,6 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(ptm_o1_callback);
 
 	uint8_t read_keyboard(int pa);
-	void arachnid(machine_config &config);
 	void arachnid_map(address_map &map);
 };
 

src/mame/drivers/argo.cpp

@@ -31,11 +31,6 @@ ToDo:
 class argo_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_BOOT
-	};
-
 	argo_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
@@ -43,16 +38,24 @@ public:
 		, m_p_chargen(*this, "chargen")
 	{ }
 
+	void argo(machine_config &config);
+
+	void init_argo();
+
+private:
+	enum
+	{
+		TIMER_BOOT
+	};
+
 	DECLARE_WRITE8_MEMBER(argo_videoram_w);
 	DECLARE_READ8_MEMBER(argo_io_r);
 	DECLARE_WRITE8_MEMBER(argo_io_w);
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void init_argo();
 
-	void argo(machine_config &config);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint8_t> m_p_videoram;
 	required_region_ptr<u8> m_p_chargen;

src/mame/drivers/argox.cpp

@@ -51,9 +51,12 @@ public:
 			m_maincpu(*this, "maincpu")
 	{ }
 
-	void init_os214();
-	required_device<cpu_device> m_maincpu;
 	void os214(machine_config &config);
+
+	void init_os214();
+
+private:
+	required_device<cpu_device> m_maincpu;
 	void os214_io_map(address_map &map);
 	void os214_prg_map(address_map &map);
 };

src/mame/drivers/aristmk4.cpp

@@ -371,6 +371,13 @@ public:
 		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
+	void aristmk4_poker(machine_config &config);
+	void aristmk4(machine_config &config);
+	void _86lions(machine_config &config);
+
+	void init_aristmk4();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<mc146818_device> m_rtc;
 	required_device<ay8910_device> m_ay1;
@@ -431,7 +438,7 @@ public:
 	DECLARE_READ8_MEMBER(pa1_r);
 	DECLARE_READ8_MEMBER(pb1_r);
 	DECLARE_READ8_MEMBER(pc1_r);
-	void init_aristmk4();
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
@@ -443,9 +450,7 @@ public:
 	TIMER_CALLBACK_MEMBER(hopper_reset);
 	TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_pf);
 	inline void uBackgroundColour();
-	void aristmk4_poker(machine_config &config);
+
-	void aristmk4(machine_config &config);
-	void _86lions(machine_config &config);
 	void aristmk4_map(address_map &map);
 	void aristmk4_poker_map(address_map &map);
 };

src/mame/drivers/aristmk5.cpp

@@ -483,6 +483,19 @@ public:
 		, m_lamps(*this, "lamp%u", 0U)
 	 { }
 
+	void aristmk5(machine_config &config);
+	void aristmk5_touch(machine_config &config);
+	void aristmk5_usa(machine_config &config);
+	void aristmk5_usa_touch(machine_config &config);
+
+	void init_aristmk5();
+
+	INPUT_CHANGED_MEMBER(coin_start);
+	CUSTOM_INPUT_MEMBER(coin_r);
+	CUSTOM_INPUT_MEMBER(coin_usa_r);
+	CUSTOM_INPUT_MEMBER(hopper_r);
+
+private:
 	DECLARE_WRITE32_MEMBER(Ns5w48);
 	DECLARE_READ32_MEMBER(Ns5x58);
 	DECLARE_READ32_MEMBER(Ns5r50);
@@ -507,18 +520,6 @@ public:
 	DECLARE_READ8_MEMBER(spi_data_r);
 	DECLARE_WRITE_LINE_MEMBER(uart_irq_callback);
 
-	void init_aristmk5();
-	void aristmk5(machine_config &config);
-	void aristmk5_touch(machine_config &config);
-	void aristmk5_usa(machine_config &config);
-	void aristmk5_usa_touch(machine_config &config);
-
-	INPUT_CHANGED_MEMBER(coin_start);
-	CUSTOM_INPUT_MEMBER(coin_r);
-	CUSTOM_INPUT_MEMBER(coin_usa_r);
-	CUSTOM_INPUT_MEMBER(hopper_r);
-
-protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	TIMER_CALLBACK_MEMBER(mk5_VSYNC_callback);
@@ -535,7 +536,6 @@ protected:
 	uint64_t        m_coin_start_cycles;
 	uint8_t         m_coin_div;
 
-private:
 	required_device_array<eeprom_serial_93cxx_device, 2> m_eeprom;
 	required_device<ds1302_device> m_rtc;
 	required_device<nvram_device> m_nvram;

src/mame/drivers/aristmk6.cpp

@@ -47,7 +47,7 @@ public:
 
 	void aristmk6(machine_config &config);
 
-protected:
+private:
 	void testIrq();
 
 	DECLARE_READ8_MEMBER(irqpend_r);
@@ -62,7 +62,6 @@ protected:
 	void aristmk6_map(address_map &map);
 	void aristmk6_port(address_map &map);
 
-private:
 #if 0
 	u32 m_test_x,m_test_y,m_start_offs;
 	u8 m_type;

src/mame/drivers/arsystems.cpp

@@ -69,10 +69,8 @@ public:
 	{
 	}
 
-	DECLARE_WRITE16_MEMBER(arcadia_multibios_change_game);
+	void arcadia(machine_config &config);
-	DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r);
+	void argh(machine_config &config);
-	DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback);
-	DECLARE_WRITE8_MEMBER(arcadia_cia_0_portb_w);
 
 	void init_arcadia();
 	void init_xeon();
@@ -90,15 +88,19 @@ public:
 	void init_dlta();
 	void init_argh();
 
+	DECLARE_WRITE16_MEMBER(arcadia_multibios_change_game);
+	DECLARE_CUSTOM_INPUT_MEMBER(coin_counter_r);
+	DECLARE_INPUT_CHANGED_MEMBER(coin_changed_callback);
+	DECLARE_WRITE8_MEMBER(arcadia_cia_0_portb_w);
+
+private:
 	inline void generic_decode(const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0);
 
-	void arcadia(machine_config &config);
-	void argh(machine_config &config);
 	void a500_mem(address_map &map);
 	void arcadia_map(address_map &map);
 	void argh_map(address_map &map);
 	void overlay_512kb_map(address_map &map);
-protected:
+
 	virtual void machine_reset() override;
 
 	optional_memory_region m_bios_region;

src/mame/drivers/asst128.cpp

@@ -46,6 +46,9 @@ public:
 		, m_fdc(*this, "fdc")
 	{ }
 
+	void asst128(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<pc_fdc_xt_device> m_fdc;
 
@@ -53,7 +56,6 @@ public:
 	DECLARE_WRITE8_MEMBER(asst128_fdc_dor_w);
 
 	void machine_start() override;
-	void asst128(machine_config &config);
 	void asst128_io(address_map &map);
 	void asst128_map(address_map &map);
 };

src/mame/drivers/astinvad.cpp

@@ -50,12 +50,6 @@ enum
 class astinvad_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_INT_OFF,
-		TIMER_INT_GEN
-	};
-
 	astinvad_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
@@ -68,20 +62,33 @@ public:
 		, m_color_prom(*this, "proms")
 		{ }
 
+	void spcking2(machine_config &config);
+	void spaceint(machine_config &config);
+	void kamikaze(machine_config &config);
+
+	void init_kamikaze();
+	void init_spcking2();
+
+	DECLARE_INPUT_CHANGED_MEMBER(spaceint_coin_inserted);
+
+private:
+	enum
+	{
+		TIMER_INT_OFF,
+		TIMER_INT_GEN
+	};
+
 	DECLARE_WRITE8_MEMBER(color_latch_w);
 	DECLARE_WRITE8_MEMBER(spaceint_videoram_w);
 	DECLARE_READ8_MEMBER(kamikaze_ppi_r);
 	DECLARE_WRITE8_MEMBER(kamikaze_ppi_w);
 	DECLARE_WRITE8_MEMBER(spaceint_sound1_w);
 	DECLARE_WRITE8_MEMBER(spaceint_sound2_w);
-	DECLARE_INPUT_CHANGED_MEMBER(spaceint_coin_inserted);
 	DECLARE_WRITE8_MEMBER(kamikaze_sound1_w);
 	DECLARE_WRITE8_MEMBER(kamikaze_sound2_w);
 	DECLARE_WRITE8_MEMBER(spcking2_sound1_w);
 	DECLARE_WRITE8_MEMBER(spcking2_sound2_w);
 	DECLARE_WRITE8_MEMBER(spcking2_sound3_w);
-	void init_kamikaze();
-	void init_spcking2();
 	DECLARE_MACHINE_START(kamikaze);
 	DECLARE_MACHINE_RESET(kamikaze);
 	DECLARE_MACHINE_START(spaceint);
@@ -93,14 +100,11 @@ public:
 	TIMER_CALLBACK_MEMBER(kamikaze_int_off);
 	TIMER_CALLBACK_MEMBER(kamizake_int_gen);
 
-	void spcking2(machine_config &config);
-	void spaceint(machine_config &config);
-	void kamikaze(machine_config &config);
 	void kamikaze_map(address_map &map);
 	void kamikaze_portmap(address_map &map);
 	void spaceint_map(address_map &map);
 	void spaceint_portmap(address_map &map);
-private:
+
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 	void plot_byte( bitmap_rgb32 &bitmap, uint8_t y, uint8_t x, uint8_t data, uint8_t color );
 

src/mame/drivers/astrafr.cpp

@@ -31,6 +31,24 @@ public:
 		fgpa_after_rom_write_addr = 0xffff;
 	}
 
+	void astra_single(machine_config &config);
+	void astra_single_alt(machine_config &config);
+	void astrafr_dual(machine_config &config);
+	void astrafr_dual_alt(machine_config &config);
+	void astrafr_dual_alt_37(machine_config &config);
+	void astra_single_2e(machine_config &config);
+	void astra_single_alt_37(machine_config &config);
+	void astra_single_alt_57(machine_config &config);
+	void astra_single_37(machine_config &config);
+	void astrafr_dual_2e(machine_config &config);
+	void astrafr_dual_37(machine_config &config);
+
+	void init_astradec_sml();
+	void init_astradec();
+	void init_astradec_dual();
+	void init_astradec_sml_dual();
+
+private:
 	uint32_t* m_cpuregion;
 	int  m_cpuregion_size;
 	std::unique_ptr<uint32_t[]> m_mainram;
@@ -110,25 +128,11 @@ public:
 	required_device<m68340_cpu_device> m_maincpu;
 	optional_device<m68340_cpu_device> m_slavecpu;
 
-	void init_astradec_sml();
-	void init_astradec();
-	void init_astradec_dual();
-	void init_astradec_sml_dual();
 	DECLARE_MACHINE_START(astra_common);
 	DECLARE_MACHINE_START(astra_2e);
 	DECLARE_MACHINE_START(astra_37);
 	DECLARE_MACHINE_START(astra_57);
-	void astra_single(machine_config &config);
+
-	void astra_single_alt(machine_config &config);
-	void astrafr_dual(machine_config &config);
-	void astrafr_dual_alt(machine_config &config);
-	void astrafr_dual_alt_37(machine_config &config);
-	void astra_single_2e(machine_config &config);
-	void astra_single_alt_37(machine_config &config);
-	void astra_single_alt_57(machine_config &config);
-	void astra_single_37(machine_config &config);
-	void astrafr_dual_2e(machine_config &config);
-	void astrafr_dual_37(machine_config &config);
 	void astra_map(address_map &map);
 	void astrafr_master_alt_map(address_map &map);
 	void astrafr_master_map(address_map &map);

src/mame/drivers/astrcorp.cpp

@@ -64,6 +64,16 @@ public:
 		m_lamps(*this, "lamp%u", 0U)
 	{ }
 
+	void skilldrp(machine_config &config);
+	void showhand(machine_config &config);
+	void speeddrp(machine_config &config);
+	void showhanc(machine_config &config);
+
+	void init_astoneag();
+	void init_showhanc();
+	void init_showhand();
+
+private:
 	// devices
 	required_device<cpu_device> m_maincpu;
 	required_device<okim6295_device> m_oki;
@@ -88,23 +98,16 @@ public:
 	DECLARE_READ16_MEMBER(astrocorp_unk_r);
 	DECLARE_WRITE16_MEMBER(astrocorp_sound_bank_w);
 	DECLARE_WRITE16_MEMBER(skilldrp_sound_bank_w);
-	void init_astoneag();
-	void init_showhanc();
-	void init_showhand();
 	DECLARE_VIDEO_START(astrocorp);
 	uint32_t screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline);
 	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void skilldrp(machine_config &config);
+
-	void showhand(machine_config &config);
-	void speeddrp(machine_config &config);
-	void showhanc(machine_config &config);
 	void showhanc_map(address_map &map);
 	void showhand_map(address_map &map);
 	void skilldrp_map(address_map &map);
 	void speeddrp_map(address_map &map);
 
-protected:
 	virtual void machine_start() override;
 
 	output_finder<7> m_lamps;

src/mame/drivers/astropc.cpp

@@ -24,14 +24,15 @@ public:
 	{ }
 
 	void astropc(machine_config &config);
+
+	void init_astropc();
+
+private:
 	void astropc_io(address_map &map);
 	void astropc_map(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;
-public:
-	void init_astropc();
 };
 
 void astropc_state::astropc_map(address_map &map)

src/mame/drivers/at.cpp

@@ -109,17 +109,7 @@ public:
 		m_mb(*this, "mb"),
 		m_ram(*this, RAM_TAG)
 	{ }
-	required_device<cpu_device> m_maincpu;
-	required_device<at_mb_device> m_mb;
-	required_device<ram_device> m_ram;
-	void init_at();
-	void init_atpci();
-	DECLARE_READ16_MEMBER(ps1_unk_r);
-	DECLARE_WRITE16_MEMBER(ps1_unk_w);
-	DECLARE_READ8_MEMBER(ps1_portb_r);
 
-	void init_at_common(int xmsbase);
-	uint16_t m_ps1_reg[2];
 	void pc30iii(machine_config &config);
 	void k286i(machine_config &config);
 	void ibm5170(machine_config &config);
@@ -141,6 +131,20 @@ public:
 	void at386(machine_config &config);
 	void ews286(machine_config &config);
 
+	void init_at();
+	void init_atpci();
+
+protected:
+	required_device<cpu_device> m_maincpu;
+	required_device<at_mb_device> m_mb;
+	required_device<ram_device> m_ram;
+	DECLARE_READ16_MEMBER(ps1_unk_r);
+	DECLARE_WRITE16_MEMBER(ps1_unk_w);
+	DECLARE_READ8_MEMBER(ps1_portb_r);
+
+	void init_at_common(int xmsbase);
+	uint16_t m_ps1_reg[2];
+
 	static void cfg_single_360K(device_t *device);
 	static void cfg_single_1200K(device_t *device);
 	void at16_io(address_map &map);
@@ -180,22 +184,23 @@ public:
 		m_speaker(*this, "speaker")
 	{ }
 
-public:
+	void megapcpl(machine_config &config);
+	void megapc(machine_config &config);
+
+	void init_megapc();
+	void init_megapcpl();
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<wd7600_device> m_wd7600;
 	required_device<isa16_device> m_isabus;
 	required_device<speaker_sound_device> m_speaker;
 
-	void init_megapc();
-	void init_megapcpl();
-
 	DECLARE_READ16_MEMBER( wd7600_ior );
 	DECLARE_WRITE16_MEMBER( wd7600_iow );
 	DECLARE_WRITE_LINE_MEMBER( wd7600_hold );
 	DECLARE_WRITE8_MEMBER( wd7600_tc ) { m_isabus->eop_w(offset, data); }
 	DECLARE_WRITE_LINE_MEMBER( wd7600_spkr ) { m_speaker->level_w(state); }
-	void megapcpl(machine_config &config);
-	void megapc(machine_config &config);
 	void megapc_io(address_map &map);
 	void megapc_map(address_map &map);
 	void megapcpl_io(address_map &map);

src/mame/drivers/atari400.cpp

@@ -261,6 +261,21 @@ public:
 		m_cart(*this, "cartleft"),
 		m_cart2(*this, "cartright") { }
 
+	void atari_common_nodac(machine_config &config);
+	void atari_common(machine_config &config);
+	void a800pal(machine_config &config);
+	void a400pal(machine_config &config);
+	void a5200(machine_config &config);
+	void a800(machine_config &config);
+	void a1200xl(machine_config &config);
+	void a800xlpal(machine_config &config);
+	void a130xe(machine_config &config);
+	void a800xl(machine_config &config);
+	void a600xl(machine_config &config);
+	void xegs(machine_config &config);
+	void a400(machine_config &config);
+
+private:
 	DECLARE_MACHINE_START(a400);
 	DECLARE_MACHINE_START(a800);
 	DECLARE_MACHINE_START(a800xl);
@@ -300,19 +315,6 @@ public:
 	TIMER_DEVICE_CALLBACK_MEMBER(a800xl_interrupt);
 	TIMER_DEVICE_CALLBACK_MEMBER(a5200_interrupt);
 
-	void atari_common_nodac(machine_config &config);
-	void atari_common(machine_config &config);
-	void a800pal(machine_config &config);
-	void a400pal(machine_config &config);
-	void a5200(machine_config &config);
-	void a800(machine_config &config);
-	void a1200xl(machine_config &config);
-	void a800xlpal(machine_config &config);
-	void a130xe(machine_config &config);
-	void a800xl(machine_config &config);
-	void a600xl(machine_config &config);
-	void xegs(machine_config &config);
-	void a400(machine_config &config);
 	void a1200xl_mem(address_map &map);
 	void a130xe_mem(address_map &map);
 	void a400_mem(address_map &map);
@@ -320,7 +322,7 @@ public:
 	void a600xl_mem(address_map &map);
 	void a800xl_mem(address_map &map);
 	void xegs_mem(address_map &map);
-protected:
+
 	//required_device<cpu_device> m_maincpu;    // maincpu is already contained in atari_common_state
 	required_device<ram_device> m_ram;
 	required_device<pia6821_device> m_pia;

src/mame/drivers/atari_s1.cpp

@@ -78,7 +78,8 @@ public:
 	void midearth(machine_config &config);
 	void atari_s1(machine_config &config);
 	void atarians(machine_config &config);
-protected:
+
+private:
 	DECLARE_READ8_MEMBER(m1080_r);
 	DECLARE_WRITE8_MEMBER(m1080_w);
 	DECLARE_READ8_MEMBER(m1084_r);
@@ -97,7 +98,7 @@ protected:
 	void atari_s1_map(address_map &map);
 	void atarians_map(address_map &map);
 	void midearth_map(address_map &map);
-private:
+
 	bool m_audiores;
 	uint8_t m_timer_s[3];
 	uint8_t m_vol;

src/mame/drivers/atari_s2.cpp

@@ -48,7 +48,7 @@ public:
 	void atari_s2(machine_config &config);
 	void atari_s3(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE8_MEMBER(sound0_w);
 	DECLARE_WRITE8_MEMBER(sound1_w);
 	DECLARE_WRITE8_MEMBER(lamp_w) { };
@@ -62,7 +62,6 @@ protected:
 	void atari_s2_map(address_map &map);
 	void atari_s3_map(address_map &map);
 
-private:
 	bool m_timer_sb;
 	uint8_t m_timer_s[5];
 	uint8_t m_sound0;

src/mame/drivers/atarisy4.cpp

@@ -40,10 +40,10 @@ public:
 	{
 	}
 
-	void init_laststar();
-
 	void atarisy4(machine_config &config);
 
+	void init_laststar();
+
 protected:
 	struct atarisy4_polydata
 	{

src/mame/drivers/atlantis.cpp

@@ -114,7 +114,12 @@ public:
 		m_rtc(*this, "rtc"),
 		m_io_analog(*this, "AN.%u", 0)
 	{ }
+
+	void mwskins(machine_config &config);
+
 	void init_mwskins();
+
+private:
 	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;
@@ -183,7 +188,7 @@ public:
 
 	DECLARE_READ8_MEMBER(parallel_r);
 	DECLARE_WRITE8_MEMBER(parallel_w);
-	void mwskins(machine_config &config);
+
 	void map0(address_map &map);
 	void map1(address_map &map);
 	void map2(address_map &map);

src/mame/drivers/atm.cpp

@@ -29,25 +29,26 @@ public:
 		, m_beta(*this, BETA_DISK_TAG)
 	{ }
 
+	void atm(machine_config &config);
+	void atmtb2(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(atm_port_7ffd_w);
 	DECLARE_READ8_MEMBER(beta_neutral_r);
 	DECLARE_READ8_MEMBER(beta_enable_r);
 	DECLARE_READ8_MEMBER(beta_disable_r);
 	DECLARE_MACHINE_RESET(atm);
 
-	void atm(machine_config &config);
-	void atmtb2(machine_config &config);
 	void atm_io(address_map &map);
 	void atm_mem(address_map &map);
 	void atm_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;
 
-private:
 	address_space *m_program;
 	uint8_t *m_p_ram;
 	void atm_update_memory();

src/mame/drivers/atronic.cpp

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

src/mame/drivers/att4425.cpp

@@ -53,7 +53,7 @@ public:
 
 	void att4425(machine_config &config);
 
-protected:
+private:
 	DECLARE_WRITE8_MEMBER(port10_w);
 	DECLARE_WRITE8_MEMBER(port14_w);
 	DECLARE_READ8_MEMBER(port14_r);
@@ -69,7 +69,6 @@ protected:
 	void att4425_io(address_map &map);
 	void att4425_mem(address_map &map);
 
-private:
 	required_device<z80_device> m_maincpu;
 	required_device<i8251_device> m_i8251;
 	required_device<z80sio_device> m_sio;

src/mame/drivers/att630.cpp

@@ -19,11 +19,13 @@ public:
 		, m_maincpu(*this, "maincpu")
 	{ }
 
+	void att630(machine_config &config);
+
+private:
 	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	void att630(machine_config &config);
 	void mem_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/attache.cpp

@@ -125,6 +125,26 @@ public:
 			m_kb_empty(true)
 	{ }
 
+	void attache(machine_config &config);
+
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	DECLARE_READ8_MEMBER(pio_portA_r);
+	DECLARE_READ8_MEMBER(pio_portB_r);
+	DECLARE_WRITE8_MEMBER(pio_portA_w);
+	DECLARE_WRITE8_MEMBER(pio_portB_w);
+
+	DECLARE_READ8_MEMBER(dma_mem_r);
+	DECLARE_WRITE8_MEMBER(dma_mem_w);
+
+	DECLARE_READ8_MEMBER(fdc_dma_r);
+	DECLARE_WRITE8_MEMBER(fdc_dma_w);
+
+	DECLARE_WRITE_LINE_MEMBER(hreq_w);
+	DECLARE_WRITE_LINE_MEMBER(eop_w);
+	DECLARE_WRITE_LINE_MEMBER(fdc_dack_w);
+
+protected:
 	// PIO port B operation select
 	enum
 	{
@@ -152,39 +172,30 @@ public:
 	};
 
 	// overrides
-	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	virtual void driver_start() override;
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
 	DECLARE_READ8_MEMBER(rom_r);
 	DECLARE_WRITE8_MEMBER(rom_w);
-	DECLARE_READ8_MEMBER(pio_portA_r);
+
-	DECLARE_READ8_MEMBER(pio_portB_r);
-	DECLARE_WRITE8_MEMBER(pio_portA_w);
-	DECLARE_WRITE8_MEMBER(pio_portB_w);
 	DECLARE_WRITE8_MEMBER(display_command_w);
 	DECLARE_READ8_MEMBER(display_data_r);
 	DECLARE_WRITE8_MEMBER(display_data_w);
 	DECLARE_READ8_MEMBER(dma_mask_r);
 	DECLARE_WRITE8_MEMBER(dma_mask_w);
-	DECLARE_READ8_MEMBER(fdc_dma_r);
+
-	DECLARE_WRITE8_MEMBER(fdc_dma_w);
 	DECLARE_READ8_MEMBER(memmap_r);
 	DECLARE_WRITE8_MEMBER(memmap_w);
-	DECLARE_READ8_MEMBER(dma_mem_r);
+
-	DECLARE_WRITE8_MEMBER(dma_mem_w);
-	DECLARE_WRITE_LINE_MEMBER(hreq_w);
-	DECLARE_WRITE_LINE_MEMBER(eop_w);
-	DECLARE_WRITE_LINE_MEMBER(fdc_dack_w);
 	void operation_strobe(address_space& space,uint8_t data);
 	void keyboard_clock_w(bool state);
 	uint8_t keyboard_data_r();
 	uint16_t get_key();
-	void attache(machine_config &config);
+
 	void attache_io(address_map &map);
 	void attache_map(address_map &map);
-protected:
+
 	required_device<cpu_device> m_maincpu;
 	required_memory_region m_rom;
 	required_device<ram_device> m_ram;
@@ -248,6 +259,9 @@ public:
 		  m_z80_tx_ready(false)
 	{ }
 
+	void attache816(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(x86_comms_w);
 	DECLARE_READ8_MEMBER(x86_comms_r);
 	DECLARE_WRITE8_MEMBER(x86_irq_enable);
@@ -261,11 +275,10 @@ public:
 
 	virtual void machine_reset() override;
 
-	void attache816(machine_config &config);
 	void attache816_io(address_map &map);
 	void attache_x86_io(address_map &map);
 	void attache_x86_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_extcpu;
 	required_device<i8255_device> m_ppi;
 

src/mame/drivers/attckufo.cpp

@@ -29,14 +29,16 @@ public:
 		m_maincpu(*this, "maincpu")
 	{}
 
+	void attckufo(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER( vic_videoram_r );
 	DECLARE_READ8_MEMBER( vic_colorram_r );
 
-	void attckufo(machine_config &config);
 	void cpu_map(address_map &map);
 	void vic_colorram_map(address_map &map);
 	void vic_videoram_map(address_map &map);
-private:
+
 	required_device<cpu_device> m_maincpu;
 };
 

src/mame/drivers/atvtrack.cpp

@@ -117,6 +117,9 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_subcpu(*this, "subcpu") { }
 
+	void atvtrack(machine_config &config);
+
+protected:
 	DECLARE_READ64_MEMBER(control_r);
 	DECLARE_WRITE64_MEMBER(control_w);
 	DECLARE_READ64_MEMBER(nand_data_r);
@@ -145,12 +148,12 @@ public:
 	u16 gpu_irq_mask;
 	void gpu_irq_test();
 	void gpu_irq_set(int);
-	void atvtrack(machine_config &config);
+
 	void atvtrack_main_map(address_map &map);
 	void atvtrack_main_port(address_map &map);
 	void atvtrack_sub_map(address_map &map);
 	void atvtrack_sub_port(address_map &map);
-protected:
+
 	bool m_slaverun;
 };
 
@@ -161,9 +164,12 @@ public:
 	smashdrv_state(const machine_config &mconfig, device_type type, const char *tag)
 		: atvtrack_state(mconfig, type, tag) { }
 
+	void smashdrv(machine_config &config);
+
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	void smashdrv(machine_config &config);
+
 	void smashdrv_main_map(address_map &map);
 	void smashdrv_main_port(address_map &map);
 };

src/mame/drivers/avt.cpp

@@ -449,6 +449,10 @@ public:
 		, m_palette(*this, "palette")
 		{ }
 
+	void avtnfl(machine_config &config);
+	void avt(machine_config &config);
+
+private:
 	DECLARE_WRITE8_MEMBER(avt_6845_address_w);
 	DECLARE_WRITE8_MEMBER(avt_6845_data_w);
 	DECLARE_READ8_MEMBER( avt_6845_data_r );
@@ -460,11 +464,9 @@ public:
 	DECLARE_PALETTE_INIT(avt);
 	uint32_t screen_update_avt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void avtnfl(machine_config &config);
-	void avt(machine_config &config);
 	void avt_map(address_map &map);
 	void avt_portmap(address_map &map);
-private:
+
 	tilemap_t *m_bg_tilemap;
 	uint8_t m_crtc_vreg[0x100],m_crtc_index;
 	virtual void video_start() override;

src/mame/drivers/ax20.cpp

@@ -33,6 +33,9 @@ public:
 		m_palette(*this, "palette"),
 		m_fdc(*this, "fdc")  { }
 
+	void ax20(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint8_t> m_p_vram;
 	required_device<gfxdecode_device> m_gfxdecode;
@@ -45,7 +48,7 @@ public:
 	DECLARE_READ8_MEMBER(unk_r);
 	DECLARE_WRITE8_MEMBER(tc_w);
 	DECLARE_WRITE8_MEMBER(ctl_w);
-	void ax20(machine_config &config);
+
 	void ax20_io(address_map &map);
 	void ax20_map(address_map &map);
 };

src/mame/drivers/wacky_gator.cpp

@@ -50,7 +50,7 @@ public:
 
 	void wackygtr(machine_config &config);
 
-protected:
+private:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
@@ -76,7 +76,6 @@ protected:
 
 	void program_map(address_map &map);
 
-private:
 	required_device<cpu_device> m_maincpu;
 	required_device<msm5205_device> m_msm;
 	required_device<pit8253_device> m_pit8253_0;

src/mame/drivers/wardner.cpp

@@ -147,12 +147,15 @@ public:
 	{
 	}
 
+	void wardner(machine_config &config);
+
+	void init_wardner();
+
+private:
 	required_device<address_map_bank_device> m_membank;
 
 	DECLARE_WRITE8_MEMBER(wardner_bank_w);
-	void init_wardner();
 
-	void wardner(machine_config &config);
 	void DSP_io_map(address_map &map);
 	void DSP_program_map(address_map &map);
 	void main_bank_map(address_map &map);
@@ -160,7 +163,7 @@ public:
 	void main_program_map(address_map &map);
 	void sound_io_map(address_map &map);
 	void sound_program_map(address_map &map);
-protected:
+
 	virtual void driver_start() override;
 	virtual void machine_reset() override;
 };

src/mame/drivers/warpsped.cpp

@@ -100,6 +100,9 @@ public:
 		m_videoram(*this, "videoram"),
 		m_workram(*this, "workram") { }
 
+	void warpspeed(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<gfxdecode_device> m_gfxdecode;
 
@@ -121,7 +124,6 @@ public:
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_circles(bitmap_ind16 &bitmap);
-	void warpspeed(machine_config &config);
 	void warpspeed_io_map(address_map &map);
 	void warpspeed_map(address_map &map);
 };

src/mame/drivers/white_mod.cpp

@@ -17,16 +17,17 @@ public:
 	{ }
 
 	void whitestar_mod(machine_config &config);
+
+	void init_whitestar_mod();
+
+private:
 	void whitestar_mod_map(address_map &map);
-protected:
 
 	// devices
 	required_device<cpu_device> m_maincpu;
 
 	// driver_device overrides
 	virtual void machine_reset() override;
-public:
-	void init_whitestar_mod();
 };
 
 

src/mame/drivers/whitestar.cpp

@@ -21,6 +21,9 @@ public:
 		m_decodmd(*this, "decodmd")
 	{ }
 
+	void whitestar(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	//required_device<cpu_device> m_dmdcpu;
 	//required_device<mc6845_device> m_mc6845;
@@ -39,7 +42,6 @@ public:
 	DECLARE_WRITE8_MEMBER(switch_w);
 	virtual void machine_start() override;
 	INTERRUPT_GEN_MEMBER(whitestar_firq_interrupt);
-	void whitestar(machine_config &config);
 	void whitestar_map(address_map &map);
 };
 

src/mame/drivers/wicat.cpp

@@ -68,6 +68,9 @@ public:
 	{
 	}
 
+	void wicat(machine_config &config);
+
+private:
 	DECLARE_READ16_MEMBER(invalid_r);
 	DECLARE_WRITE16_MEMBER(invalid_w);
 	DECLARE_READ16_MEMBER(memmap_r);
@@ -131,14 +134,12 @@ public:
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-
-	void wicat(machine_config &config);
 	void wicat_mem(address_map &map);
 	void wicat_video_io(address_map &map);
 	void wicat_video_mem(address_map &map);
 	void wicat_wd1000_io(address_map &map);
 	void wicat_wd1000_mem(address_map &map);
-private:
+
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void driver_start() override;

src/mame/drivers/wico.cpp

@@ -60,6 +60,9 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
+	void wico(machine_config &config);
+
+private:
 	DECLARE_READ8_MEMBER(lampst_r);
 	DECLARE_READ8_MEMBER(switch_r);
 	DECLARE_WRITE8_MEMBER(muxen_w);
@@ -73,10 +76,9 @@ public:
 	DECLARE_READ8_MEMBER(gentmrcl_r);
 	TIMER_DEVICE_CALLBACK_MEMBER(irq_housekeeping);
 	TIMER_DEVICE_CALLBACK_MEMBER(firq_housekeeping);
-	void wico(machine_config &config);
 	void ccpu_map(address_map &map);
 	void hcpu_map(address_map &map);
-private:
+
 	bool m_zcen;
 	bool m_gten;
 	bool m_disp_on;