misc copyright assignment + privatization

src/mame/drivers/bnstars.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood, ???
+// copyright-holders:David Haywood, Luca Elia
 /*
 Vs. Janshi Brandnew Stars
 (c)1997 Jaleco
@@ -120,6 +120,14 @@ public:
 			m_p1_keys(*this, "P1KEY.%u", 0),
 			m_p2_keys(*this, "P2KEY.%u", 0) { }
 
+	void bnstars(machine_config &config);
+
+	void init_bnstars();
+
+	DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
+
+private:
+
 	tilemap_t *m_ms32_tx_tilemap[2];
 	tilemap_t *m_ms32_bg_tilemap[2];
 	tilemap_t *m_ms32_roz_tilemap[2];
@@ -147,8 +155,6 @@ public:
 	DECLARE_WRITE32_MEMBER(ms32_roz0_ram_w);
 	DECLARE_WRITE32_MEMBER(ms32_roz1_ram_w);
 	DECLARE_WRITE32_MEMBER(bnstars1_mahjong_select_w);
-	DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
-	void init_bnstars();
 	TILE_GET_INFO_MEMBER(get_ms32_tx0_tile_info);
 	TILE_GET_INFO_MEMBER(get_ms32_tx1_tile_info);
 	TILE_GET_INFO_MEMBER(get_ms32_bg0_tile_info);
@@ -160,7 +166,6 @@ public:
 	uint32_t screen_update_bnstars_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, int chip);
 	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t *sprram_top, size_t sprram_size);
-	void bnstars(machine_config &config);
 	void bnstars_map(address_map &map);
 	void bnstars_sound_map(address_map &map);
 };

src/mame/drivers/megatech.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood, ???
+// copyright-holders:David Haywood, Barry Rodewald
 /* Sega MegaTech
 
 About MegaTech:
@@ -104,6 +104,16 @@ public:
 		m_region_maincpu(*this, "maincpu")
 	{ }
 
+	void megatech_multislot(machine_config &config);
+	void megatech_fixedslot(machine_config &config);
+
+	void init_mt_crt();
+	void init_mt_slot();
+
+private:
+
+	void megatech(machine_config &config);
+
 	DECLARE_READ8_MEMBER(cart_select_r);
 	DECLARE_WRITE8_MEMBER(cart_select_w);
 	DECLARE_READ8_MEMBER(bios_portc_r);
@@ -125,8 +135,6 @@ public:
 	DECLARE_READ8_MEMBER(sms_ioport_dd_r);
 	DECLARE_WRITE8_MEMBER(mt_sms_standard_rom_bank_w);
 
-	void init_mt_crt();
-	void init_mt_slot();
 	DECLARE_MACHINE_RESET(megatech);
 
 	image_init_result load_cart(device_image_interface &image, generic_slot_device *slot, int gameno);
@@ -143,12 +151,9 @@ public:
 	uint32_t screen_update_menu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(screen_vblank_main);
 
-	void megatech(machine_config &config);
-	void megatech_multislot(machine_config &config);
-	void megatech_fixedslot(machine_config &config);
 	void megatech_bios_map(address_map &map);
 	void megatech_bios_portmap(address_map &map);
-private:
+
 	uint8_t m_mt_cart_select_reg;
 	uint32_t m_bios_port_ctrl;
 	int m_current_MACHINE_IS_sms; // is the current game SMS based (running on genesis z80, in VDP compatibility mode)

src/mame/drivers/nsm.cpp

@@ -36,19 +36,21 @@ public:
 		, m_digits(*this, "digit%u", 0U)
 		{ }
 
+	void nsm(machine_config &config);
+
+private:
+
 	DECLARE_READ8_MEMBER(ff_r);
 	DECLARE_WRITE8_MEMBER(cru_w);
 	DECLARE_WRITE8_MEMBER(oe_w);
-	void nsm(machine_config &config);
 	void nsm_io_map(address_map &map);
 	void nsm_map(address_map &map);
 
-private:
 	uint8_t m_cru_data[9];
 	uint8_t m_cru_count;
 	virtual void machine_reset() override;
 	virtual void machine_start() override { m_digits.resolve(); }
-	required_device<cpu_device> m_maincpu;
+	required_device<tms9995_device> m_maincpu;
 	output_finder<60> m_digits;
 };
 
@@ -120,9 +122,8 @@ WRITE8_MEMBER( nsm_state::cru_w )
 void nsm_state::machine_reset()
 {
 	// Disable auto wait state generation by raising the READY line on reset
-	tms9995_device* cpu = static_cast<tms9995_device*>(machine().device("maincpu"));
+	m_maincpu->ready_line(ASSERT_LINE);
-	cpu->ready_line(ASSERT_LINE);
+	m_maincpu->reset_line(ASSERT_LINE);
-	cpu->reset_line(ASSERT_LINE);
 }
 
 MACHINE_CONFIG_START(nsm_state::nsm)

src/mame/drivers/r2dx_v33.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, David Haywood, ???
+// copyright-holders:Olivier Galibert, David Haywood
 /*
 
 Raiden 2 / DX V33 Version
@@ -88,6 +88,16 @@ public:
 		m_math(*this, "math")
 	{ }
 
+	void nzerotea(machine_config &config);
+	void rdx_v33(machine_config &config);
+	void zerotm2k(machine_config &config);
+
+	void init_rdx_v33();
+	void init_nzerotea();
+	void init_zerotm2k();
+
+private:
+
 	DECLARE_WRITE16_MEMBER(r2dx_angle_w);
 	DECLARE_WRITE16_MEMBER(r2dx_dx_w);
 	DECLARE_WRITE16_MEMBER(r2dx_dy_w);
@@ -110,9 +120,6 @@ public:
 	DECLARE_WRITE16_MEMBER(rdx_v33_eeprom_w);
 	DECLARE_WRITE16_MEMBER(zerotm2k_eeprom_w);
 	DECLARE_WRITE16_MEMBER(r2dx_rom_bank_w);
-	void init_rdx_v33();
-	void init_nzerotea();
-	void init_zerotm2k();
 
 	DECLARE_WRITE16_MEMBER(r2dx_tilemapdma_w);
 	DECLARE_WRITE16_MEMBER(r2dx_paldma_w);
@@ -123,18 +130,14 @@ public:
 	DECLARE_MACHINE_RESET(r2dx_v33);
 	DECLARE_MACHINE_RESET(nzeroteam);
 
-	void nzerotea(machine_config &config);
-	void rdx_v33(machine_config &config);
-	void zerotm2k(machine_config &config);
 	void nzerotea_map(address_map &map);
 	void nzeroteam_base_map(address_map &map);
 	void r2dx_oki_map(address_map &map);
 	void rdx_v33_map(address_map &map);
 	void zerotm2k_map(address_map &map);
-protected:
+
 	virtual void machine_start() override;
 
-private:
 	void r2dx_setbanking(void);
 
 	int m_r2dxbank;

src/mame/drivers/scotrsht.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood, ???
+// copyright-holders:David Haywood, Pierpaolo Prazzoli
 /***************************************************************************
 
  GX545 Scooter Shooter - (c) 1985 Konami

src/mame/includes/ms32.h

@@ -11,11 +11,11 @@ class ms32_state : public driver_device
 public:
 	ms32_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
+		m_palette(*this, "palette"),
+		m_gfxdecode(*this, "gfxdecode"),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
-		m_gfxdecode(*this, "gfxdecode"),
 		m_screen(*this, "screen"),
-		m_palette(*this, "palette"),
 		m_soundlatch(*this, "soundlatch"),
 		m_mainram(*this, "mainram"),
 		m_roz_ctrl(*this, "roz_ctrl"),
@@ -32,11 +32,45 @@ public:
 		m_f1superb_extraram(*this, "f1sb_extraram", 32),
 		m_z80bank(*this, "z80bank%u", 1) { }
 
+	void ms32(machine_config &config);
+	void f1superb(machine_config &config);
+
+	void init_ss92047_01();
+	void init_ss91022_10();
+	void init_kirarast();
+	void init_suchie2();
+	void init_ss92048_01();
+	void init_bnstars();
+	void init_f1superb();
+	void init_ss92046_01();
+
+	IRQ_CALLBACK_MEMBER(irq_callback);
+	DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
+
+protected:
+
+	void configure_banks();
+
+	TIMER_DEVICE_CALLBACK_MEMBER(ms32_interrupt);
+	DECLARE_WRITE8_MEMBER(ms32_snd_bank_w);
+
+	DECLARE_READ8_MEMBER(latch_r);
+	DECLARE_WRITE8_MEMBER(to_main_w);
+	DECLARE_READ32_MEMBER(ms32_sound_r);
+	DECLARE_WRITE32_MEMBER(ms32_sound_w);
+	DECLARE_WRITE32_MEMBER(reset_sub_w);
+
+	required_device<palette_device> m_palette;
+	required_device<gfxdecode_device> m_gfxdecode;
+
+	int m_reverse_sprite_order;
+	int m_flipscreen;
+
+private:
+
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
-	required_device<gfxdecode_device> m_gfxdecode;
 	optional_device<screen_device> m_screen;
-	required_device<palette_device> m_palette;
 	optional_device<generic_latch_8_device> m_soundlatch;
 
 	optional_shared_ptr<uint32_t> m_mainram;
@@ -66,16 +100,11 @@ public:
 	bitmap_ind16 m_temp_bitmap_tilemaps;
 	bitmap_ind16 m_temp_bitmap_sprites;
 	bitmap_ind8 m_temp_bitmap_sprites_pri;
-	int m_reverse_sprite_order;
-	int m_flipscreen;
 	uint32_t m_brt[4];
 	int m_brt_r;
 	int m_brt_g;
 	int m_brt_b;
 	DECLARE_READ32_MEMBER(ms32_read_inputs3);
-	DECLARE_WRITE32_MEMBER(ms32_sound_w);
-	DECLARE_READ32_MEMBER(ms32_sound_r);
-	DECLARE_WRITE32_MEMBER(reset_sub_w);
 	DECLARE_READ8_MEMBER(ms32_nvram_r8);
 	DECLARE_WRITE8_MEMBER(ms32_nvram_w8);
 	DECLARE_READ8_MEMBER(ms32_priram_r8);
@@ -97,22 +126,11 @@ public:
 	DECLARE_READ16_MEMBER(ms32_extra_r16);
 	DECLARE_WRITE32_MEMBER(ms32_irq2_guess_w);
 	DECLARE_WRITE32_MEMBER(ms32_irq5_guess_w);
-	DECLARE_READ8_MEMBER(latch_r);
-	DECLARE_WRITE8_MEMBER(ms32_snd_bank_w);
-	DECLARE_WRITE8_MEMBER(to_main_w);
 	DECLARE_WRITE32_MEMBER(ms32_brightness_w);
 	DECLARE_WRITE32_MEMBER(ms32_gfxctrl_w);
 	DECLARE_WRITE32_MEMBER(coin_counter_w);
-	DECLARE_CUSTOM_INPUT_MEMBER(mahjong_ctrl_r);
 	void init_ms32_common();
-	void init_ss92047_01();
+
-	void init_ss91022_10();
-	void init_kirarast();
-	void init_suchie2();
-	void init_ss92048_01();
-	void init_bnstars();
-	void init_f1superb();
-	void init_ss92046_01();
 	TILE_GET_INFO_MEMBER(get_ms32_tx_tile_info);
 	TILE_GET_INFO_MEMBER(get_ms32_roz_tile_info);
 	TILE_GET_INFO_MEMBER(get_ms32_bg_tile_info);
@@ -121,16 +139,11 @@ public:
 	virtual void video_start() override;
 	DECLARE_VIDEO_START(f1superb);
 	uint32_t screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	TIMER_DEVICE_CALLBACK_MEMBER(ms32_interrupt);
-	IRQ_CALLBACK_MEMBER(irq_callback);
 	void irq_init();
 	void irq_raise(int level);
 	void update_color(int color);
 	void draw_sprites(bitmap_ind16 &bitmap, bitmap_ind8 &bitmap_pri, const rectangle &cliprect, uint16_t *sprram_top, size_t sprram_size, int gfxnum, int reverseorder);
 	void draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect,int priority);
-	void configure_banks();
-	void ms32(machine_config &config);
-	void f1superb(machine_config &config);
 	void f1superb_map(address_map &map);
 	void ms32_map(address_map &map);
 	void ms32_sound_map(address_map &map);

src/mame/includes/scotrsht.h

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood, ???
+// copyright-holders:David Haywood, Pierpaolo Prazzoli
 
 #include "machine/gen_latch.h"
 #include "emupal.h"
@@ -19,6 +19,9 @@ public:
 		m_spriteram(*this, "spriteram"),
 		m_scroll(*this, "scroll")  { }
 
+	void scotrsht(machine_config &config);
+
+private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
 	required_device<gfxdecode_device> m_gfxdecode;
@@ -52,7 +55,6 @@ public:
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
-	void scotrsht(machine_config &config);
 	void scotrsht_map(address_map &map);
 	void scotrsht_sound_map(address_map &map);
 	void scotrsht_sound_port(address_map &map);

src/mame/video/ms32.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood,Paul Priest
+// copyright-holders:David Haywood,Paul Priest, Luca Elia
 /* Jaleco MegaSystem 32 Video Hardware */
 
 /* The Video Hardware is Similar to the Non-MS32 Version of Tetris Plus 2 */

src/mame/video/scotrsht.cpp

@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood, ???
+// copyright-holders:David Haywood, Pierpaolo Prazzoli
 #include "emu.h"
 #include "includes/scotrsht.h"