srcclean pass in preparation for release branch

hash/apple2gs_flop_orig.xml

@@ -3930,7 +3930,7 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-	
+
 	<software name="spacea2">
 		<description>Space Ace II: Borf's Revenge</description>
 		<year>2022</year>
@@ -4021,5 +4021,5 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-	
+
 </softwarelist>

hash/digiblast_cart.xml

@@ -5,7 +5,7 @@ license:CC0
 -->
 
 <!--
-	These dumps seem to have blank ECC data, it might need to be reconstructed as done in eolith/ghosteo.cpp
+    These dumps seem to have blank ECC data, it might need to be reconstructed as done in eolith/ghosteo.cpp
 -->
 <softwarelist name="digiblast_cart" description="Nikko Entertainment B.V. / Grey Innovation digiBLAST Cartridges">
 
@@ -19,7 +19,7 @@ license:CC0
 			</dataarea>
 		</part>
 	</software>
-	
+
 	<software name="sbsp1" supported="no">
 		<description>Sponge Bob Square Pants 1 (Italy / Spain)</description>
 		<year>2005</year>
@@ -29,8 +29,8 @@ license:CC0
 				<rom name="sponge bob square pants 1 (ita spa).bin" size="0x4200000" crc="56deccb3" sha1="251967cdc72cf06bb92957ecc3ad8a3b1573c91e" />
 			</dataarea>
 		</part>
-	</software>	
-	
+	</software>
+
 	<software name="totsp1" supported="no">
 		<description>Totally Spies! 1 (Italy)</description>
 		<year>2005</year>
@@ -40,8 +40,8 @@ license:CC0
 				<rom name="totally spies 1 (ita).bin" size="0x4200000" crc="2f88baaf" sha1="5cda9f4844cd708e577426285a0d7f0024e83168" />
 			</dataarea>
 		</part>
-	</software>		
-	
+	</software>
+
 	<software name="yugi" supported="no">
 		<description>Yu-Gi-Oh! (Italy / Spain)</description>
 		<year>2005</year>
@@ -51,8 +51,8 @@ license:CC0
 				<rom name="yu-gi-oh (ita esp).bin" size="0x4200000" crc="2494e958" sha1="76594cebc642c61afa84d20370b40d18e9aabc80" />
 			</dataarea>
 		</part>
-	</software>	
-	
+	</software>
+
 	<software name="wxatari" supported="no">
 		<description>Winx Club + 5 Atari Games (Italy / Spain)</description>
 		<year>2005</year>
@@ -62,8 +62,8 @@ license:CC0
 				<rom name="winx club + 5 atari games (ita esp).bin" size="0x4200000" crc="09897866" sha1="df1b42368ae776d9028a27796874d5830bfd38c2" />
 			</dataarea>
 		</part>
-	</software>		
-	
+	</software>
+
 	<software name="winx1" supported="no">
 		<description>Winx Club 1 (Italy / Spain)</description>
 		<year>2005</year>
@@ -73,6 +73,6 @@ license:CC0
 				<rom name="winx club 1 (ita esp).bin" size="0x4200000" crc="a870766e" sha1="ade470b1e574761bf35254064b2437dccf1a3c2c" />
 			</dataarea>
 		</part>
-	</software>			
-	
+	</software>
+
 </softwarelist>

hash/ekara_japan_s.xml

@@ -155,7 +155,7 @@ license:CC0
 	</software>
 
 	<software name="sc0014">
-		<description>Saiten Cartridge Challenge Idol vol.4 (Japan) (SC0014-SAI)</description>
+		<description>Saiten Cartridge: Challenge Idol vol.4 (Japan) (SC0014-SAI)</description>
 		<year>2002</year>
 		<publisher>Takara</publisher>
 		<info name="alt_title" value="採点カートリッジ チャレンジアイドル vol.4"/>
@@ -164,7 +164,7 @@ license:CC0
 				<rom name="sc0014-sai.u1" size="0x100000" crc="1c07e017" sha1="257d878578fcbf14d7c951bbe68fd25bee3c8db0"/>
 			</dataarea>
 		</part>
-	</software>	
+	</software>
 
 	<software name="sc0015">
 		<description>Saiten Cartridge: Detective Conan Vol.2 (Japan) (SC0015-DCS)</description>
@@ -204,7 +204,7 @@ license:CC0
 	</software>
 
 	<software name="sc0020">
-		<description>Saiten Cartridge Challenge Idol vol.5 (Japan) (SC0020-SAI)</description>
+		<description>Saiten Cartridge: Challenge Idol vol.5 (Japan) (SC0020-SAI)</description>
 		<year>2002</year>
 		<publisher>Takara</publisher>
 		<info name="alt_title" value="採点カートリッジ チャレンジアイドル vol.5"/>

src/devices/bus/mtu130/board.h

@@ -17,7 +17,7 @@ class mtu130_extension_interface : public device_interface
 	// Read/write on banks 2/3
 	virtual void write23(offs_t offset, u8 data) = 0;
 	virtual u8 read23(offs_t offset) = 0;
-	
+
 	// Map i/o in the bfxx area.
 	virtual void map_io(address_space_installer &space) = 0;
 
@@ -38,14 +38,14 @@ class mtu130_extension_device : public device_t, public device_single_card_slot_
 
 	// Read/write on banks 2/3, read return 0xff if not driven
 	void write23(offs_t offset, u8 data) {
-        auto dev = get_card_device();
-        if(dev)
+		auto dev = get_card_device();
+		if(dev)
 			dev->write23(offset, data);
 	}
 
 	u8 read23(offs_t offset) {
-        auto dev = get_card_device();
-        return dev ? dev->read23(offset) : 0xff;
+		auto dev = get_card_device();
+		return dev ? dev->read23(offset) : 0xff;
 	}
 
 	void map_io(address_space_installer &space);

src/devices/cpu/m6502/m6502.h

@@ -38,8 +38,8 @@ class m6502_device : public cpu_device {
 	m6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	void set_address_width(int width, bool custom_interface) {
-		program_config.m_addr_width = width;		
-		sprogram_config.m_addr_width = width;		
+		program_config.m_addr_width = width;
+		sprogram_config.m_addr_width = width;
 		uses_custom_memory_interface = custom_interface;
 	}
 

src/devices/sound/hc55516.cpp

@@ -11,7 +11,7 @@
 
     TODO:
     - see .h file
-	- research HC-55536 and HC-55564 differences vs HC-55516 (better auto-zeroing,
+    - research HC-55536 and HC-55564 differences vs HC-55516 (better auto-zeroing,
       and removal of the encoder offset compensation DAC?)
     - /src/mame/exidy/exidy440_a.cpp has its own internal implementation of the
       MC3417 and MC3418, it should be using this file instead

src/lib/formats/ap2_dsk.cpp

@@ -2054,11 +2054,11 @@ bool moof_format::load(util::random_read &io, uint32_t form_factor, const std::v
 			uint32_t trks_off = off_trks + (fidx * 8);
 			uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512;
 			uint32_t track_size = r32(img, trks_off + 4);
-			
+
 			uint32_t total_ticks = 0;
 			for(uint32_t i=0; i != track_size; i++)
 				total_ticks += img[boff+i];
-			
+
 			// Assume there is always a pulse at index, and it's
 			// the last one in the stream
 			std::vector<uint32_t> &buf = image->get_buffer(track, head);
@@ -2075,7 +2075,7 @@ bool moof_format::load(util::random_read &io, uint32_t form_factor, const std::v
 			uint32_t trks_off = off_trks + (idx * 8);
 
 			uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512;
-			
+
 			uint32_t track_size = r32(img, trks_off + 4);
 
 			if (track_size == 0)

src/lib/formats/fsmgr.h

@@ -301,8 +301,8 @@ class manager_t {
 		virtual void add_format(const floppy_image_format_t &type, u32 image_size, const char *name, const char *description) = 0;
 
 	private:
-		u32							m_form_factor;
-		const std::vector<u32> &	m_variants;
+		u32                         m_form_factor;
+		const std::vector<u32> &    m_variants;
 	};
 
 	struct hd_enumerator {

src/lib/formats/victor9k_dsk.cpp

@@ -36,10 +36,10 @@
     7           71-79       63-74       12          149.6        401
     8           unused      75-79       11          144.0        417
 
-    * The documentation for the Victor lists Zone 4 as ending with Track 48 
-    on side 1 and track 40 on side two. This is incorrect. The above table 
-    reflects disks analyzed from various machines and matches the assembly 
-    code in the floppy driver. Various written documents contain this 
+    * The documentation for the Victor lists Zone 4 as ending with Track 48
+    on side 1 and track 40 on side two. This is incorrect. The above table
+    reflects disks analyzed from various machines and matches the assembly
+    code in the floppy driver. Various written documents contain this
     documentation bug.
 
     Interleave factor 3
@@ -152,16 +152,16 @@ int victor9k_format::find_size(util::random_read &io, uint32_t form_factor)
 {
 	return find_size(io);
 }
-	
-int victor9k_format::identify(floppy_image *image)  
+
+int victor9k_format::identify(floppy_image *image)
 {
 	for(int i=0; formats[i].form_factor; i++) {
 		const format &f = formats[i];
 		if(f.variant == image->get_variant())
 			return i;
 	}
- 	
- 	return -1;
+
+	return -1;
 }
 
 
@@ -210,7 +210,7 @@ void victor9k_format::log_boot_sector(uint8_t *data)
 	//Disk type - flags
 	osd_printf_verbose("%s sided\n", (data[32]) ? "Double" : "Single");
 
-    //Sector Interleave
+	//Sector Interleave
 	osd_printf_verbose("Sector Interleave: %02x\n", data[33]);
 
 	// Disc type
@@ -296,7 +296,7 @@ bool victor9k_format::load(util::random_read &io, uint32_t form_factor, const st
 
 	const format &f = formats[type];
 
-	osd_printf_verbose("Type: %d Head Count: %d Sector Count: %d\n", type, 
+	osd_printf_verbose("Type: %d Head Count: %d Sector Count: %d\n", type,
 		f.head_count, f.sector_count);
 
 	uint64_t size;
@@ -314,7 +314,7 @@ bool victor9k_format::load(util::random_read &io, uint32_t form_factor, const st
 
 	int track_offset = 0;
 
-	osd_printf_verbose("load Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ", 
+	osd_printf_verbose("load Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
 		f.head_count, f.track_count, sectors_per_track[1][1]);
 
 	for (int head = 0; head < f.head_count; head++) {
@@ -432,7 +432,7 @@ const int victor9k_format::speed_zone[2][80] =
 		1, 1, 1, 1, 1, 1, 1, 1,
 		2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 		3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-		4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+		4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
 		5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 		6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
@@ -457,7 +457,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
 
 	const format &f = formats[type];
 
-	osd_printf_verbose("save Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ", 
+	osd_printf_verbose("save Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
 		f.head_count, f.track_count, sectors_per_track[1][1]);
 	for(int head=0; head < f.head_count; head++) {
 		for(int track=0; track < f.track_count; track++) {
@@ -466,7 +466,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
 			uint8_t sectdata[40*512];
 			desc_s sectors[40];
 			int offset = get_image_offset(f, head, track);
-			osd_printf_verbose(">>type: %s, head: %d, track: %d, sector_count: %d, offset: %d, track_size: %d\n", 
+			osd_printf_verbose(">>type: %s, head: %d, track: %d, sector_count: %d, offset: %d, track_size: %d\n",
 				f.sector_base_size, head, track, sector_count, offset, track_size);
 
 			build_sector_description(f, sectdata, 0, sectors, sector_count);
@@ -481,7 +481,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
 
 void victor9k_format::extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head, int sector_count)
 {
-	
+
 	// Extract the sectors
 	auto bitstream = generate_bitstream_from_track(track, head, cell_size[speed_zone[head][track]], image);
 	auto sectors = extract_sectors_from_bitstream_victor_gcr5(bitstream);
@@ -492,11 +492,11 @@ void victor9k_format::extract_sectors(floppy_image *image, const format &f, desc
 			sectors.push_back(sector);
 		}
 	}
- 
+
 	for(int i=0; i<sector_count; i++) {
 		desc_s &ds = sdesc[i];
 		const auto &data = sectors[ds.sector_id];
-		osd_printf_verbose("Head: %01d TracK: %02d Total Sectors: %02d Current Sector: %02d ", 
+		osd_printf_verbose("Head: %01d TracK: %02d Total Sectors: %02d Current Sector: %02d ",
 			head, track, sector_count, i);
 		if(data.empty()) {
 			memset((uint8_t *)ds.data, 0, ds.size);

src/mame/act/victor9k.cpp

@@ -642,12 +642,12 @@ void victor9k_state::machine_start()
 
 	//update RAM for ramsize
 	int m_ram_size = m_ram->size();
-    u8 *m_ram_ptr = m_ram->pointer();
+	u8 *m_ram_ptr = m_ram->pointer();
 
-    int ramsize = m_ram_size;
+	int ramsize = m_ram_size;
 	if (ramsize > 0) {
 		address_space& space = m_maincpu->space(AS_PROGRAM);
-		if (ramsize > 0xdffff)   //the 896KB option overlaps 1 bit with 
+		if (ramsize > 0xdffff)   //the 896KB option overlaps 1 bit with
 			ramsize = 0xdffff;   //the I/O memory space, truncating
 		if (LOG) logerror("install_ram ramsize %x\n", ramsize);
 		space.install_ram(0x0, ramsize, m_ram_ptr);

src/mame/apple/apple2gs.cpp

@@ -373,10 +373,10 @@ class apple2gs_state : public driver_device
 	u8 b1ram4000_r(offs_t offset);
 	void b1ram4000_w(offs_t offset, u8 data);
 
-	template<int addr> u8 e0ram_r(offs_t offset);
-	template<int addr> void e0ram_w(offs_t offset, u8 data);
-	template<int addr> u8 e1ram_r(offs_t offset);
-	template<int addr> void e1ram_w(offs_t offset, u8 data);
+	template <int Addr> u8 e0ram_r(offs_t offset);
+	template <int Addr> void e0ram_w(offs_t offset, u8 data);
+	template <int Addr> u8 e1ram_r(offs_t offset);
+	template <int Addr> void e1ram_w(offs_t offset, u8 data);
 
 	u8 c000_r(offs_t offset);
 	void c000_w(offs_t offset, u8 data);
@@ -3815,17 +3815,17 @@ u8 apple2gs_state::read_floatingbus()
     ADDRESS MAP
 ***************************************************************************/
 
-template<int addr>
-u8 apple2gs_state::e0ram_r(offs_t offset) { slow_cycle(); return m_megaii_ram[offset + addr]; }
+template <int Addr>
+u8 apple2gs_state::e0ram_r(offs_t offset) { slow_cycle(); return m_megaii_ram[offset + Addr]; }
 
-template<int addr>
-void apple2gs_state::e0ram_w(offs_t offset, u8 data) { slow_cycle(); m_megaii_ram[offset + addr] = data; }
+template <int Addr>
+void apple2gs_state::e0ram_w(offs_t offset, u8 data) { slow_cycle(); m_megaii_ram[offset + Addr] = data; }
 
-template<int addr>
-u8 apple2gs_state::e1ram_r(offs_t offset) { slow_cycle(); return m_megaii_ram[offset + addr + 0x10000]; }
+template <int Addr>
+u8 apple2gs_state::e1ram_r(offs_t offset) { slow_cycle(); return m_megaii_ram[offset + Addr + 0x10000]; }
 
-template<int addr>
-void apple2gs_state::e1ram_w(offs_t offset, u8 data) { slow_cycle(); m_megaii_ram[offset + addr + 0x10000] = data; }
+template <int Addr>
+void apple2gs_state::e1ram_w(offs_t offset, u8 data) { slow_cycle(); m_megaii_ram[offset + Addr + 0x10000] = data; }
 
 template u8 apple2gs_state::e0ram_r<0x0000>(offs_t offset);
 template u8 apple2gs_state::e0ram_r<0x0200>(offs_t offset);

src/mame/apple/lisa.cpp

@@ -102,8 +102,8 @@ void lisa_state::lisa(machine_config &config)
 
 	/* devices */
 	IWM(config, m_fdc, 8_MHz_XTAL);
-//	m_iwm->phases_cb().set(FUNC(mac128_state::phases_w));
-//	m_iwm->devsel_cb().set(FUNC(mac128_state::devsel_w));
+//  m_iwm->phases_cb().set(FUNC(mac128_state::phases_w));
+//  m_iwm->devsel_cb().set(FUNC(mac128_state::devsel_w));
 
 	applefdintf_device::add_35(config, m_floppy[0]);
 	applefdintf_device::add_35(config, m_floppy[1]);