Merge remote-tracking branch 'upstream/master'

Robbbert · Mar 9, 2024 · 09cc806 · 09cc806
2 parents 278d5fa + 3b02100
commit 09cc806
Show file tree

Hide file tree

Showing 294 changed files with 795 additions and 1,224 deletions.
diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h
@@ -34,7 +34,7 @@ class o2_chess_device : public device_t,
 	virtual void cart_init() override;
 
 	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; }
-	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; }
+	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; }
 
 	virtual void write_p1(u8 data) override;
 	virtual void io_write(offs_t offset, u8 data) override;

diff --git a/src/devices/bus/odyssey2/homecomp.h b/src/devices/bus/odyssey2/homecomp.h
@@ -37,7 +37,7 @@ class o2_homecomp_device : public device_t,
 	virtual void cart_init() override;
 
 	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; }
-	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; }
+	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; }
 
 	virtual void write_p1(u8 data) override;
 	virtual void io_write(offs_t offset, u8 data) override;

diff --git a/src/devices/bus/odyssey2/rally.h b/src/devices/bus/odyssey2/rally.h
@@ -30,7 +30,7 @@ class o2_rally_device : public device_t,
 	virtual void cart_init() override;
 
 	virtual u8 read_rom04(offs_t offset) override;
-	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset + 0x400); }
 
 	virtual void write_p1(u8 data) override { m_control = data; }
 	virtual void io_write(offs_t offset, u8 data) override;

diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h
@@ -30,7 +30,7 @@ class o2_rom_device : public device_t,
 	virtual void cart_init() override;
 
 	virtual u8 read_rom04(offs_t offset) override;
-	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset + 0x400); }
 
 	virtual void write_p1(u8 data) override { m_bank = data & 3; }
 

diff --git a/src/devices/bus/odyssey2/test.h b/src/devices/bus/odyssey2/test.h
@@ -30,7 +30,7 @@ class o2_test_device : public device_t,
 	virtual void cart_init() override;
 
 	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset]; }
-	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset]; }
+	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0x400]; }
 	virtual void bus_write(u8 data) override { m_bus_data = data; }
 
 	virtual void write_p1(u8 data) override;

diff --git a/src/emu/diserial.cpp b/src/emu/diserial.cpp
@@ -227,8 +227,8 @@ void device_serial_interface::rx_w(int state)
 		LOGMASKED(LOG_RX, "Receiver is synchronized\n");
 		if (m_rcv_clock && !(m_rcv_rate.is_never()))
 		{
-			// make start delay just a bit longer to make sure we are called after the sender
-			m_rcv_clock->adjust(((m_rcv_rate*5)/3), 0, m_rcv_rate);
+			// make start delay half a cycle longer to make sure we are called after the sender
+			m_rcv_clock->adjust(m_rcv_rate*2, 0, m_rcv_rate);
 		}
 		else if (m_start_bit_hack_for_external_clocks)
 			m_rcv_bit_count_received--;

diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp
@@ -287,6 +287,7 @@ const double XTAL::known_xtals[] = {
 	 17'010'000, /* 17.01_MHz_XTAL         Epic 14E */
 	 17'064'000, /* 17.064_MHz_XTAL        Memorex 1377 */
 	 17'074'800, /* 17.0748_MHz_XTAL       SWTPC 8212 */
+	 17'320'000, /* 17.320_MHz_XTAL        Visual 50 */
 	 17'350'000, /* 17.35_MHz_XTAL         ITT Courier 1700 */
 	 17'360'000, /* 17.36_MHz_XTAL         OMTI Series 10 SCSI controller */
 	 17'430'000, /* 17.43_MHz_XTAL         Videx Videoterm */

diff --git a/src/mame/alliedleisure/aztarac.cpp b/src/mame/alliedleisure/aztarac.cpp
@@ -89,8 +89,6 @@ class aztarac_state : public driver_device
 };
 
 
-// audio
-
 uint8_t aztarac_state::sound_r()
 {
 	return m_sound_status & 0x01;
@@ -130,8 +128,6 @@ INTERRUPT_GEN_MEMBER(aztarac_state::snd_timed_irq)
 }
 
 
-// video
-
 #define AVECTOR(x, y, color, intensity) \
 m_vector->add_point(m_xcenter + ((x) << 16), m_ycenter - ((y) << 16), color, intensity)
 
@@ -225,8 +221,6 @@ void aztarac_state::video_start()
 }
 
 
-// machine
-
 /*************************************
  *
  *  Machine init

diff --git a/src/mame/atari/arcadecl.cpp b/src/mame/atari/arcadecl.cpp
@@ -138,8 +138,6 @@ class arcadecl_state : public sparkz_state
 };
 
 
-// video
-
 /***************************************************************************
 
     Note: this video hardware has some similarities to Shuuz & company
@@ -256,8 +254,6 @@ uint32_t sparkz_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
 }
 
 
-// machine
-
 /*************************************
  *
  *  Interrupt handling

diff --git a/src/mame/atari/batman.cpp b/src/mame/atari/batman.cpp
@@ -77,8 +77,6 @@ class batman_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Tilemap callbacks
@@ -280,8 +278,6 @@ uint32_t batman_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization

diff --git a/src/mame/atari/beathead.cpp b/src/mame/atari/beathead.cpp
@@ -188,8 +188,6 @@ class beathead_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Video start/stop
@@ -358,8 +356,6 @@ uint32_t beathead_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 /*************************************
  *
  *  Machine init

diff --git a/src/mame/atari/blstroid.cpp b/src/mame/atari/blstroid.cpp
@@ -81,8 +81,6 @@ class blstroid_state : public atarigen_state
 };
 
 
-// video
-
 /*************************************
  *
  *  Tilemap callbacks
@@ -233,8 +231,6 @@ uint32_t blstroid_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization & interrupts

diff --git a/src/mame/atari/canyon.cpp b/src/mame/atari/canyon.cpp
@@ -109,8 +109,6 @@ class canyon_state : public driver_device
 };
 
 
-// audio
-
 /*************************************
  *
  *  Write handlers
@@ -129,8 +127,6 @@ void canyon_state::explode_w(uint8_t data)
 }
 
 
-// video
-
 void canyon_state::videoram_w(offs_t offset, uint8_t data)
 {
 	m_videoram[offset] = data;
@@ -201,8 +197,6 @@ uint32_t canyon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
 }
 
 
-// machine
-
 /*************************************
  *
  *  Palette generation

diff --git a/src/mame/atari/ccastles.cpp b/src/mame/atari/ccastles.cpp
@@ -227,8 +227,6 @@ class ccastles_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Video startup
@@ -555,8 +553,6 @@ uint32_t ccastles_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 /************************************* *
  *  VBLANK and IRQ generation
  *

diff --git a/src/mame/atari/cloak.cpp b/src/mame/atari/cloak.cpp
@@ -193,8 +193,6 @@ class cloak_state : public driver_device
 };
 
 
-// video
-
 /***************************************************************************
 
   CLOAK & DAGGER uses RAM to dynamically
@@ -381,8 +379,6 @@ uint32_t cloak_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
 }
 
 
-// machine
-
 /*************************************
  *
  *  Output ports

diff --git a/src/mame/atari/cloud9.cpp b/src/mame/atari/cloud9.cpp
@@ -185,8 +185,6 @@ class cloud9_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Video startup
@@ -465,8 +463,6 @@ uint32_t cloud9_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
 }
 
 
-// machine
-
 static constexpr double MASTER_CLOCK = 10'000'000;
 static constexpr double PIXEL_CLOCK = MASTER_CLOCK / 2;
 static constexpr uint16_t HTOTAL = 320;

diff --git a/src/mame/atari/copsnrob.cpp b/src/mame/atari/copsnrob.cpp
@@ -126,8 +126,6 @@ class copsnrob_state : public driver_device
 };
 
 
-// video
-
 uint32_t copsnrob_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	// redrawing the entire display is faster in this case
@@ -246,8 +244,6 @@ uint32_t copsnrob_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 
 void copsnrob_state::one_start_w(int state)
 {

diff --git a/src/mame/atari/cyberbal.cpp b/src/mame/atari/cyberbal.cpp
@@ -170,8 +170,6 @@ class cyberbal_state : public cyberbal_base_state
 };
 
 
-// video
-
 /*************************************
  *
  *  Tilemap callbacks
@@ -423,8 +421,6 @@ uint32_t cyberbal2p_state::screen_update_cyberbal2p(screen_device &screen, bitma
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization

diff --git a/src/mame/atari/cybstorm.cpp b/src/mame/atari/cybstorm.cpp
@@ -83,8 +83,6 @@ class cybstorm_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Tilemap callbacks
@@ -286,8 +284,6 @@ uint32_t cybstorm_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization

diff --git a/src/mame/atari/dragrace.cpp b/src/mame/atari/dragrace.cpp
@@ -97,8 +97,6 @@ class dragrace_state : public driver_device
 };
 
 
-// video
-
 TILE_GET_INFO_MEMBER(dragrace_state::get_tile_info)
 {
 	uint8_t code = m_playfield_ram[tile_index];
@@ -159,8 +157,6 @@ uint32_t dragrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 TIMER_DEVICE_CALLBACK_MEMBER(dragrace_state::frame_callback)
 {
 	for (int i = 0; i < 2; i++)

diff --git a/src/mame/atari/eprom.cpp b/src/mame/atari/eprom.cpp
@@ -107,8 +107,6 @@ class eprom_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Palette
@@ -508,8 +506,6 @@ uint32_t eprom_state::screen_update_guts(screen_device &screen, bitmap_ind16 &bi
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization

diff --git a/src/mame/atari/firetrk.cpp b/src/mame/atari/firetrk.cpp
@@ -191,8 +191,6 @@ class superbug_state : public firetrk_state
 };
 
 
-// video
-
 void firetrk_state::palette(palette_device &palette)
 {
 	static constexpr uint8_t colortable_source[] =
@@ -606,8 +604,6 @@ uint32_t montecar_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// audio
-
 void firetrk_state::skid_reset_w(uint8_t data)
 {
 	m_skid[0] = 0;
@@ -661,8 +657,6 @@ void firetrk_state::xtndply_w(uint8_t data)
 }
 
 
-// machine
-
 void firetrk_state::set_service_mode(int enable)
 {
 	m_in_service_mode = enable;

diff --git a/src/mame/atari/gauntlet.cpp b/src/mame/atari/gauntlet.cpp
@@ -232,8 +232,6 @@ class gauntlet_state : public driver_device
 };
 
 
-// video
-
 /*************************************
  *
  *  Tilemap callbacks
@@ -417,8 +415,6 @@ uint32_t gauntlet_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
 }
 
 
-// machine
-
 /*************************************
  *
  *  Initialization & interrupts