Merge remote-tracking branch 'upstream/master'

Robbbert · Aug 12, 2024 · 2c6c871 · 2c6c871
2 parents 9093400 + 339bb27
commit 2c6c871
Show file tree

Hide file tree

Showing 59 changed files with 1,560 additions and 940 deletions.
diff --git a/hash/sgi_mips.xml b/hash/sgi_mips.xml
@@ -5854,14 +5854,14 @@ license:CC0-1.0
 			<feature name="part_id" value="NetBSD 2.0 CD sgimipscd"/>
 			<!-- Origin: netbsd.org -->
 			<diskarea name="cdrom">
-				<disk name="sgimipscd" sha1="d8960cfffc55d87f8e83074346e0f670b7a7f024" />
+				<disk name="sgimipscd_2_0" sha1="d8960cfffc55d87f8e83074346e0f670b7a7f024" />
 			</diskarea>
 		</part>
 		<part name="cdrom2" interface="cdrom">
 			<feature name="part_id" value="NetBSD 2.0 CD sourcecd"/>
 			<!-- Origin: netbsd.org -->
 			<diskarea name="cdrom">
-				<disk name="sourcecd" sha1="073ceaa3db068938e11a4893fcec81ce533e1016" />
+				<disk name="sourcecd_2_0" sha1="073ceaa3db068938e11a4893fcec81ce533e1016" />
 			</diskarea>
 		</part>
 	</software>
@@ -5874,14 +5874,14 @@ license:CC0-1.0
 			<feature name="part_id" value="NetBSD 2.0.2 CD sgimipscd"/>
 			<!-- Origin: netbsd.org -->
 			<diskarea name="cdrom">
-				<disk name="sgimipscd" sha1="45b78a683010aa75476ca987e48fa469b4cfa127" />
+				<disk name="sgimipscd_2_0_2" sha1="45b78a683010aa75476ca987e48fa469b4cfa127" />
 			</diskarea>
 		</part>
 		<part name="cdrom2" interface="cdrom">
 			<feature name="part_id" value="NetBSD 2.0.2 CD sourcecd"/>
 			<!-- Origin: netbsd.org -->
 			<diskarea name="cdrom">
-				<disk name="sourcecd" sha1="e74be0fe637d4ddc8e5bbe818d6c3876fce2f6ae" />
+				<disk name="sourcecd_2_0_2" sha1="e74be0fe637d4ddc8e5bbe818d6c3876fce2f6ae" />
 			</diskarea>
 		</part>
 	</software>

diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
@@ -304,9 +304,10 @@ void luxor_55_21046_device::device_add_mconfig(machine_config & config)
 	m_maincpu->set_daisy_config(z80_daisy_chain);
 	m_maincpu->set_addrmap(AS_PROGRAM, &luxor_55_21046_device::luxor_55_21046_mem);
 	m_maincpu->set_addrmap(AS_IO, &luxor_55_21046_device::luxor_55_21046_io);
+	m_maincpu->busack_cb().set(m_dma, FUNC(z80dma_device::bai_w));
 
 	Z80DMA(config, m_dma, 16_MHz_XTAL / 4);
-	m_dma->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
+	m_dma->out_busreq_callback().set_inputline(m_maincpu, Z80_INPUT_LINE_BUSRQ);
 	m_dma->out_int_callback().set(FUNC(luxor_55_21046_device::dma_int_w));
 	m_dma->in_mreq_callback().set(FUNC(luxor_55_21046_device::memory_read_byte));
 	m_dma->out_mreq_callback().set(FUNC(luxor_55_21046_device::memory_write_byte));

diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
@@ -254,9 +254,10 @@ void luxor_55_21056_device::device_add_mconfig(machine_config &config)
 	m_maincpu->set_memory_map(&luxor_55_21056_device::luxor_55_21056_mem);
 	m_maincpu->set_io_map(&luxor_55_21056_device::luxor_55_21056_io);
 	m_maincpu->set_daisy_config(daisy_chain);
+	m_maincpu->busack_cb().set(m_dma, FUNC(z80dma_device::bai_w));
 
 	Z80DMA(config, m_dma, XTAL(8'000'000)/2);
-	m_dma->out_busreq_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
+	m_dma->out_busreq_callback().set_inputline(m_maincpu, Z80_INPUT_LINE_BUSRQ);
 	m_dma->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 	m_dma->in_mreq_callback().set(FUNC(luxor_55_21056_device::memory_read_byte));
 	m_dma->out_mreq_callback().set(FUNC(luxor_55_21056_device::memory_write_byte));