Merge remote-tracking branch 'upstream/release0264' into rel264

hash/megadriv.xml

@@ -6324,9 +6324,9 @@ Unsupported [Menacer] peripheral
 	</software>
 
 	<software name="pga2hb" cloneof="pga2" supported="no">
-		<description>HeartBeat PGA Tour Golf II</description>
+		<description>PGA Tour Golf II for use with the Personal Trainer</description>
 		<year>1995</year>
-		<publisher>Polar Technology</publisher> <!-- box art shows Polar Technology branding, but cartridge label says "HEARTBEAT CORP." -->
+		<publisher>HeartBeat Corp</publisher>
 		<info name="usage" value="Requires HeartBeat Personal Trainer activity tracker"/>
 		<part name="cart" interface="megadriv_cart">
 			<feature name="slot" value="rom"/>

hash/spectrum_cass.xml

@@ -126928,7 +126928,7 @@ Nothing happens after loading the cassette
 	<software name="scramina">
 		<description>Scrabble + Campo de Minas</description>
 		<year>198?</year>
-		<publisher>Microbaite Software</publisher>	<!-- The inlay says "Microbaite" but the loading screen says "Microbyte" -->
+		<publisher>Microbaite Software</publisher>  <!-- The inlay says "Microbaite" but the loading screen says "Microbyte" -->
 		<info name="language" value="English/Portuguese" />
 		<part name="cass1" interface="spectrum_cass">
 			<feature name="part_id" value="A - Campo de Minas"/>

scripts/src/video.lua

@@ -895,6 +895,18 @@ if (VIDEOS["PC_VGA_MATROX"]~=null) then
 	}
 end
 
+--------------------------------------------------
+--
+--@src/devices/video/pc_vga_mediagx.h,VIDEOS["PC_VGA_MEDIAGX"] = true
+--------------------------------------------------
+
+if (VIDEOS["PC_VGA_MEDIAGX"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/pc_vga_mediagx.cpp",
+		MAME_DIR .. "src/devices/video/pc_vga_mediagx.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/devices/video/pc_vga_nvidia.h,VIDEOS["PC_VGA_NVIDIA"] = true

src/devices/bus/ata/xm3301.cpp

@@ -30,8 +30,8 @@ void toshiba_xm3301_device::device_start()
 	// [3605] as Rev number
 	// Both TAISATAP.SYS and CD_BALLY.SYS tests against one of these strings:
 	// "TOSHIBA CD-ROM"
-    // "TOSHIBA CD-ROM XM-3301"
-    // "TOSHIBA CD-ROM DRIVE:XM"
+	// "TOSHIBA CD-ROM XM-3301"
+	// "TOSHIBA CD-ROM DRIVE:XM"
 	// "TOSHIBA DVD" (CD_BALLY.SYS only)
 	t10mmc::set_model("TOSHIBA CD-ROM XM-5401TA3605");
 

src/devices/bus/epson_sio/pf10.cpp

@@ -126,7 +126,7 @@ void epson_pf10_device::device_reset()
 
 TIMER_CALLBACK_MEMBER( epson_pf10_device::serial_clk_tick )
 {
-	m_cpu->m6801_clock_serial();
+	m_cpu->clock_serial();
 }
 
 

src/devices/bus/pci/clgd5446.cpp

@@ -40,11 +40,11 @@ ROM_START( gd5446 )
 	ROM_REGION32_LE( 0x8000, "vga_rom", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS( 0, "quadtel", "Quadtel CL-GD5446 1.31" )
 	ROMX_LOAD( "cl-gd5446_pci_vga_bios_version_1.31.u2", 0x0000, 0x8000, CRC(61f8cac7) SHA1(6e54aadfe10dfa5c7e417a054e9a64499a99083c), ROM_BIOS(0) )
-	// Chip:CL-GD5446-HC-A - ROM: CL-GD5436/46 PCI VGA BIOS Version 1.25 - RAM: 1MB, 2MB, 4MB - 
+	// Chip:CL-GD5446-HC-A - ROM: CL-GD5436/46 PCI VGA BIOS Version 1.25 - RAM: 1MB, 2MB, 4MB -
 	// OSC: 14.31818MHz - Connector: DB15 - VESA feature connector
 	ROM_SYSTEM_BIOS( 1, "quadtelo", "Quadtel CL-GD5446 1.25" )
 	ROMX_LOAD("cl-gd5446_pci_vga_bios_version_1.25.u2",  0x0000, 0x8000, CRC(7a859659) SHA1(ff667218261969c48082ec12aa91088a01b0cb2a), ROM_BIOS(1) )
-//	ROMX_LOAD("5446bv.vbi", 0x00000, 0x10000, CRC(7a859659) SHA1(ff667218261969c48082ec12aa91088a01b0cb2a) )
+//  ROMX_LOAD("5446bv.vbi", 0x00000, 0x10000, CRC(7a859659) SHA1(ff667218261969c48082ec12aa91088a01b0cb2a) )
 ROM_END
 
 const tiny_rom_entry *cirrus_gd5446_pci_device::device_rom_region() const

src/devices/bus/pci/pci_slot.cpp

@@ -109,7 +109,7 @@ void pci_card_device::irq_pin_w(offs_t line, int state)
 void pci_cards(device_slot_interface &device)
 {
 	// 0x00 - backward compatible pre-class code
-//	device.option_add("voodoo1",        VOODOO_1_PCI);
+//  device.option_add("voodoo1",        VOODOO_1_PCI);
 	device.option_add("vision864",      VISION864_PCI);
 	device.option_add("vision964",      VISION964_PCI);
 

src/devices/bus/pci/pdc20262.cpp

@@ -160,7 +160,7 @@ void pdc20262_device::bus_master_ide_control_map(address_map &map)
 void pdc20262_device::extra_map(address_map &map)
 {
 	// TODO: should be memory mapped versions of above, *nix driver seems to use this
-//	map(0x00, 0x07).m(*this, FUNC(pdc20262_device::ide1_command_map)));
+//  map(0x00, 0x07).m(*this, FUNC(pdc20262_device::ide1_command_map)));
 // ...
 }
 

src/devices/bus/pci/sis6326.cpp

@@ -52,8 +52,8 @@ ROM_START( sis6326agp )
 	ROMX_LOAD( "sis6326agp.bin", 0x000000, 0x010000, CRC(a671255c) SHA1(332ab9499142e8f7a235afe046e8e8d21a28580d), ROM_BIOS(3) )
 
 	// basically identical to siso
-//	ROM_SYSTEM_BIOS( 3, "sisvbi", "SiS6326 4MB PCI 1.21d" )
-//	ROMX_LOAD( "4mb_pci.vbi",  0x000000, 0x00c000, CRC(8fca47be) SHA1(7ce995ec0d8b9ac4f0f40ccd0a61d7fc209d313f), ROM_BIOS(3) )
+//  ROM_SYSTEM_BIOS( 3, "sisvbi", "SiS6326 4MB PCI 1.21d" )
+//  ROMX_LOAD( "4mb_pci.vbi",  0x000000, 0x00c000, CRC(8fca47be) SHA1(7ce995ec0d8b9ac4f0f40ccd0a61d7fc209d313f), ROM_BIOS(3) )
 ROM_END
 
 const tiny_rom_entry *sis6326_agp_device::device_rom_region() const

src/devices/bus/pci/vision.cpp

@@ -232,7 +232,7 @@ void vision968_pci_device::device_start()
 {
 	pci_card_device::device_start();
 
-//	add_map(64 * 1024 * 1024, M_MEM | M_DISABLED, FUNC(vision968_pci_device::lfb_map));
+//  add_map(64 * 1024 * 1024, M_MEM | M_DISABLED, FUNC(vision968_pci_device::lfb_map));
 	add_map(64 * 1024 * 1024, M_MEM, FUNC(vision968_pci_device::lfb_map));
 	set_map_address(0, 0x70000000);
 
@@ -259,20 +259,20 @@ void vision968_pci_device::device_reset()
 void vision968_pci_device::lfb_map(address_map &map)
 {
 	map(0x0000'0000, 0x00ff'ffff).rw(m_vga, FUNC(s3vision864_vga_device::mem_linear_r), FUNC(s3vision864_vga_device::mem_linear_w));
-//	map(0x0100'0000, 0x0100'7fff) image transfer data
+//  map(0x0100'0000, 0x0100'7fff) image transfer data
 	map(0x0100'8000, 0x0100'803f).m(FUNC(vision968_pci_device::config_map));
-//	map(0x0100'8100, 0x0100'816f) packed copro regs
-//	map(0x0100'82e8, 0x0100'82e8) current ypos
-//	map(0x0100'82ea, 0x0100'82ea) current ypos-2
+//  map(0x0100'8100, 0x0100'816f) packed copro regs
+//  map(0x0100'82e8, 0x0100'82e8) current ypos
+//  map(0x0100'82ea, 0x0100'82ea) current ypos-2
 	map(0x0100'83b0, 0x0100'83df).m(m_vga, FUNC(s3vision968_vga_device::io_map));
-//	map(0x0100'8502, 0x0100'8502) (VGA $0102 alias)
-//	map(0x0100'8504, 0x0100'8504) (VGA $42e8 alias)
-//	map(0x0100'8508, 0x0100'8508) (VGA $46e8 alias)
-//	map(0x0100'850c, 0x0100'850c) (VGA $4ae8 alias)
-//	map(0x0100'86e8, 0x0100'8eea) PnP copro region
-//	map(0x0101'0000, 0x0101'3fff) Pixel formatter data transfer
-//	map(0x0101'4000, 0x0101'7fff) Pixel formatter Mask data
-//	map(0x0101'8080, 0x0101'809f) Pixel formatter regs
+//  map(0x0100'8502, 0x0100'8502) (VGA $0102 alias)
+//  map(0x0100'8504, 0x0100'8504) (VGA $42e8 alias)
+//  map(0x0100'8508, 0x0100'8508) (VGA $46e8 alias)
+//  map(0x0100'850c, 0x0100'850c) (VGA $4ae8 alias)
+//  map(0x0100'86e8, 0x0100'8eea) PnP copro region
+//  map(0x0101'0000, 0x0101'3fff) Pixel formatter data transfer
+//  map(0x0101'4000, 0x0101'7fff) Pixel formatter Mask data
+//  map(0x0101'8080, 0x0101'809f) Pixel formatter regs
 }
 
 void vision968_pci_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,

src/devices/bus/rs232/loopback.cpp

@@ -4,7 +4,7 @@
 #include "emu.h"
 #include "loopback.h"
 
-DEFINE_DEVICE_TYPE(RS232_LOOPBACK, rs232_loopback_device, "rs232_loopback", "RS232 Loopback")
+DEFINE_DEVICE_TYPE(RS232_LOOPBACK, rs232_loopback_device, "rs232_loopback", "RS-232 Loopback")
 
 rs232_loopback_device::rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, RS232_LOOPBACK, tag, owner, clock)
@@ -43,7 +43,7 @@ void rs232_loopback_device::input_dtr(int state)
 	}
 }
 
-DEFINE_DEVICE_TYPE(DEC_RS232_LOOPBACK, dec_rs232_loopback_device, "dec_rs232_loopback", "RS232 Loopback (DEC 12-15336-00)")
+DEFINE_DEVICE_TYPE(DEC_RS232_LOOPBACK, dec_rs232_loopback_device, "dec_rs232_loopback", "RS-232 Loopback (DEC 12-15336-00)")
 
 dec_rs232_loopback_device::dec_rs232_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, DEC_RS232_LOOPBACK, tag, owner, clock)

src/devices/bus/rs232/null_modem.cpp

@@ -149,4 +149,4 @@ void null_modem_device::rcv_complete()
 	}
 }
 
-DEFINE_DEVICE_TYPE(NULL_MODEM, null_modem_device, "null_modem", "RS232 Null Modem")
+DEFINE_DEVICE_TYPE(NULL_MODEM, null_modem_device, "null_modem", "RS-232 Null Modem")

src/devices/bus/rs232/pty.cpp

@@ -159,4 +159,4 @@ TIMER_CALLBACK_MEMBER(pseudo_terminal_device::update_queue)
 	}
 }
 
-DEFINE_DEVICE_TYPE(PSEUDO_TERMINAL, pseudo_terminal_device, "pseudo_terminal", "Pseudo terminal")
+DEFINE_DEVICE_TYPE(PSEUDO_TERMINAL, pseudo_terminal_device, "pseudo_terminal", "Pseudo Terminal")

src/devices/bus/rs232/rs232_sync_io.cpp

@@ -198,4 +198,4 @@ void rs232_sync_io_device::update_serial(int state)
 	m_clk_timer->adjust(period , 0 , period);
 }
 
-DEFINE_DEVICE_TYPE(RS232_SYNC_IO, rs232_sync_io_device, "rs232_sync_io", "RS232 Synchronous I/O")
+DEFINE_DEVICE_TYPE(RS232_SYNC_IO, rs232_sync_io_device, "rs232_sync_io", "RS-232 Synchronous I/O")

src/devices/bus/saitek_osa/maestro.cpp

@@ -39,8 +39,8 @@ handle the overclock well enough, they went for a slightly lower speed XTAL.
 #include "softlist_dev.h"
 
 
-DEFINE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device, "osa_maestro", "Maestro B-D")
-DEFINE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device, "osa_analyst", "Analyst")
+DEFINE_DEVICE_TYPE(OSA_MAESTRO, saitekosa_maestro_device, "osa_maestro", "Saitek OSA Maestro B-D")
+DEFINE_DEVICE_TYPE(OSA_ANALYST, saitekosa_analyst_device, "osa_analyst", "Saitek OSA Analyst")
 
 
 //-------------------------------------------------

src/devices/bus/saitek_osa/maestroa.cpp

@@ -29,7 +29,7 @@ compatible for upgrading to newer Maestro versions.
 #include "softlist_dev.h"
 
 
-DEFINE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device, "osa_maestroa", "Maestro A")
+DEFINE_DEVICE_TYPE(OSA_MAESTROA, saitekosa_maestroa_device, "osa_maestroa", "Saitek OSA Maestro A")
 
 
 //-------------------------------------------------

src/devices/bus/saitek_osa/sparc.cpp

@@ -36,7 +36,7 @@ only using 5MB or 9MB of the available RAM for hash tables.
 #include "sparc.h"
 
 
-DEFINE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device, "osa_sparc", "Sparc")
+DEFINE_DEVICE_TYPE(OSA_SPARC, saitekosa_sparc_device, "osa_sparc", "Saitek OSA Sparc")
 
 
 //-------------------------------------------------

src/devices/bus/vcs_ctrl/cx85.cpp

@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(ATARI_CX85, atari_cx85_device, "atari_cx85", "Atari CX85 Nume
 
 
 //**************************************************************************
-//  INPUT PORTS 
+//  INPUT PORTS
 //**************************************************************************
 
 static INPUT_PORTS_START(atari_cx85)

src/devices/cpu/avr8/avr8.cpp

@@ -566,6 +566,9 @@ void avr8_device<NumTimers>::base_internal_map(address_map &map)
 	map(0x003f, 0x003f).w(FUNC(avr8_device::eecr_w));
 	map(0x0043, 0x0043).w(FUNC(avr8_device::gtccr_w));
 	map(0x0044, 0x0044).w(FUNC(avr8_device::tccr0a_w));
+	map(0x0045, 0x0045).w(FUNC(avr8_device::tccr0b_w));
+	map(0x0047, 0x0047).w(FUNC(avr8_device::ocr0a_w));
+	map(0x0048, 0x0048).w(FUNC(avr8_device::ocr0b_w));
 	map(0x004a, 0x004a).w(FUNC(avr8_device::gpior1_w));
 	map(0x004b, 0x004b).w(FUNC(avr8_device::gpior2_w));
 	map(0x004c, 0x004c).w(FUNC(avr8_device::spcr_w));
@@ -1958,7 +1961,7 @@ void avr8_device<NumTimers>::update_timer_waveform_gen_mode(uint8_t t, uint8_t m
 	if (m_timer_top[t] == -1)
 	{
 		m_timer_top[t] = 0;
-		LOGMASKED((LOG_TIMER0 + t), "%s: update_timer_waveform_gen_mode: Timer %d - Unsupported waveform generation type: %d\n", machine().describe_context(), t, mode);
+		LOGMASKED((LOG_TIMER0 << t), "%s: update_timer_waveform_gen_mode: Timer %d - Unsupported waveform generation type: %d\n", machine().describe_context(), t, mode);
 	}
 }
 
@@ -2025,7 +2028,7 @@ void avr8_device<NumTimers>::timer2_tick_fast_pwm()
 			if (m_ocr2_not_reached_yet)
 			{
 				// Turn off
-				m_r[PORTD] |= 1 << 7;
+				m_r[PORTD] &= ~(1 << 7);
 				m_gpio_out_cb[GPIOD](m_r[PORTD]);
 				m_ocr2_not_reached_yet = false;
 			}
@@ -2188,11 +2191,11 @@ void avr8_device<NumTimers>::update_timer_clock_source(uint8_t clock_select, con
 	const uint16_t old_prescale = s_prescale_values[(Timer == 2) ? 1 : 0][old_clock_select];
 	m_timer_prescale[Timer] = (uint16_t)prescale_divisor;
 
-	LOGMASKED(LOG_TIMER0 + Timer, "%s: update_timer_clock_source: t = %d, cs = %d\n", machine().describe_context(), Timer, clock_select);
+	LOGMASKED(LOG_TIMER0 << Timer, "%s: update_timer_clock_source: t = %d, cs = %d\n", machine().describe_context(), Timer, clock_select);
 
 	if (prescale_divisor == -1)
 	{
-		LOGMASKED(LOG_TIMER0 + Timer, "%s: timer%d: update_timer_clock_source: External trigger mode not implemented yet\n", machine().describe_context(), Timer);
+		LOGMASKED(LOG_TIMER0 << Timer, "%s: timer%d: update_timer_clock_source: External trigger mode not implemented yet\n", machine().describe_context(), Timer);
 		m_timer_prescale[Timer] = 0xffff;
 	}
 

src/devices/cpu/avr8/avr8ops.hxx

@@ -1047,9 +1047,7 @@ void avr8_base_device::op_neg(uint16_t op)
 	const uint8_t res = 0 - rd;
 	m_r[SREG] &= ~(SREG_MASK_C | SREG_MASK_Z | SREG_MASK_N | SREG_MASK_V | SREG_MASK_S | SREG_MASK_H);
 	if (res == 0)
-	{
 		m_r[SREG] |= SREG_MASK_Z;
-	}
 	else
 	{
 		m_r[SREG] |= SREG_MASK_C;
@@ -1122,7 +1120,7 @@ void avr8_base_device::op_clrf(uint16_t op)
 
 void avr8_base_device::op_ijmp(uint16_t op)
 {
-	m_pc = (ZREG - 1) << 1;
+	m_pc = (ZREG << 1) - 2;
 }
 
 void avr8_base_device::op_eijmp(uint16_t op)
@@ -1135,21 +1133,20 @@ void avr8_base_device::op_dec(uint16_t op)
 	const uint8_t rd = m_r[RD5(op)];
 	const uint8_t res = rd - 1;
 	m_r[SREG] &= ~(SREG_MASK_V | SREG_MASK_N | SREG_MASK_S | SREG_MASK_Z);
-	if (rd == 0x7f)
+	if (res == 0)
+		m_r[SREG] |= SREG_MASK_Z;
+	else if (res == 0x7f)
 		m_r[SREG] |= SREG_MASK_V | SREG_MASK_S;
 	else if (BIT(res, 7))
 		m_r[SREG] |= SREG_MASK_N | SREG_MASK_S;
-	else if (res == 0)
-		m_r[SREG] |= SREG_MASK_Z;
 	m_r[RD5(op)] = res;
 }
 
 void avr8_base_device::op_jmp(uint16_t op)
 {
 	uint32_t offs = KCONST22(op) << 16;
 	m_pc += 2;
-	uint16_t wordval = m_program->read_word(m_pc);
-	offs |= wordval;
+	offs |= m_program->read_word(m_pc);
 	m_pc = offs << 1;
 	m_pc -= 2;
 }
@@ -1234,18 +1231,21 @@ void avr8_base_device::op_adiw(uint16_t op)
 	const uint8_t rr = m_r[25 + (DCONST(op) << 1)];
 	const uint16_t pd = ((rr << 8) | rd) + KCONST6(op);
 	m_r[SREG] &= ~(SREG_MASK_V | SREG_MASK_N | SREG_MASK_S | SREG_MASK_Z | SREG_MASK_C);
-	if (pd == 0)
-		m_r[SREG] |= SREG_MASK_Z;
-	else if (BIT(pd, 15))
+	if (BIT(pd, 15))
 	{
 		m_r[SREG] |= SREG_MASK_N;
-		if (!BIT(rr, 7))
-			m_r[SREG] |= SREG_MASK_V;
-		else
+		if (BIT(rr, 7))
 			m_r[SREG] |= SREG_MASK_S;
+		else
+			m_r[SREG] |= SREG_MASK_V;
+	}
+	else
+	{
+		if (pd == 0)
+			m_r[SREG] |= SREG_MASK_Z;
+		if (BIT(rr, 7))
+			m_r[SREG] |= SREG_MASK_C;
 	}
-	if (BIT(rr, 7) && !BIT(pd, 15))
-		m_r[SREG] |= SREG_MASK_C;
 	m_r[24 + (DCONST(op) << 1)] = pd & 0x00ff;
 	m_r[25 + (DCONST(op) << 1)] = (pd >> 8) & 0x00ff;
 }
@@ -1256,16 +1256,19 @@ void avr8_base_device::op_sbiw(uint16_t op)
 	const uint8_t rr = m_r[25 + (DCONST(op) << 1)];
 	const uint16_t pd = ((rr << 8) | rd) - KCONST6(op);
 	m_r[SREG] &= ~(SREG_MASK_V | SREG_MASK_N | SREG_MASK_S | SREG_MASK_Z | SREG_MASK_C);
-	m_r[SREG] |= (pd == 0) ? SREG_MASK_Z : 0;
 	if (BIT(pd, 15))
 	{
+		m_r[SREG] |= SREG_MASK_N | SREG_MASK_S;
+		if (!BIT(rr, 7))
+			m_r[SREG] |= SREG_MASK_C;
+	}
+	else
+	{
+		if (pd == 0)
+			m_r[SREG] |= SREG_MASK_Z;
 		if (BIT(rr, 7))
-			m_r[SREG] |= SREG_MASK_N | SREG_MASK_S | SREG_MASK_C;
-		else
-			m_r[SREG] |= SREG_MASK_N | SREG_MASK_S;
+			m_r[SREG] |= SREG_MASK_V | SREG_MASK_S;
 	}
-	else if (BIT(rr, 7))
-		m_r[SREG] |= SREG_MASK_V | SREG_MASK_S;
 	m_r[24 + (DCONST(op) << 1)] = pd & 0x00ff;
 	m_r[25 + (DCONST(op) << 1)] = (pd >> 8) & 0x00ff;
 }

src/devices/cpu/h8/h83217.cpp

@@ -14,7 +14,7 @@
     - keyboard matrix interrupt
     - TCONR @ 0xff9f (timer connection)
     - SEDGR @ 0xffa8 (edge sense)
-	- WSCR @ 0xffc2 (waitstate control)
+    - WSCR @ 0xffc2 (waitstate control)
     - finish STCR emulation
     - finish SYSCR emulation