Merge remote-tracking branch 'upstream/master'

src/devices/bus/hp_dio/hp98644.cpp

@@ -186,7 +186,7 @@ uint16_t dio16_98644_device::io_r(offs_t offset)
 		break;
 
 	case 1:
-		ret = m_control | m_control << 8 | \
+		ret = m_control | m_control << 8 |
 		(((m_switches->read() >> REG_SWITCHES_INT_LEVEL_SHIFT) & REG_SWITCHES_INT_LEVEL_MASK) << 4);
 		break;
 

src/devices/bus/idpartner/sasi.cpp

@@ -36,6 +36,7 @@ class idpartner_sasi_device :
     void reset_w(u8 data);
 
 	void req_w(int state);
+    void io_w(int state);
 
 private:
 	required_device<nscsi_bus_device> m_sasibus;
@@ -87,7 +88,9 @@ u8 idpartner_sasi_device::data_r()
 {
     u8 data = m_sasi->read();
     if (m_data_enable) {
-        m_sasi->ack_w(1);       
+        m_sasi->ack_w(1);
+        if (m_drq_enable)
+            m_bus->drq_w(0);
     }
     return data;
 }
@@ -98,13 +101,17 @@ void idpartner_sasi_device::ctrl_w(u8 data)
     m_sasi->sel_w(BIT(data,0));
     m_data_enable = BIT(data,1);
     m_drq_enable = BIT(data,5);
+    if (m_data_enable && m_drq_enable)
+        m_bus->drq_w(m_sasi->req_r());
 }
 
 void idpartner_sasi_device::data_w(u8 data)
 {
     m_sasi->write(data);
     if (m_data_enable) {
         m_sasi->ack_w(1);
+        if (m_drq_enable)
+            m_bus->drq_w(0);
     }
 }
 
@@ -117,6 +124,14 @@ void idpartner_sasi_device::reset_w(u8 data)
 void idpartner_sasi_device::req_w(int state)
 {
     m_sasi->ack_w(0);
+    if (m_data_enable && m_drq_enable)
+        m_bus->drq_w(state);
+}
+
+void idpartner_sasi_device::io_w(int state)
+{
+    if (state)
+        m_sasi->write(0); // clears lateched data
 }
 
 void idpartner_sasi_device::device_add_mconfig(machine_config &config)
@@ -127,6 +142,7 @@ void idpartner_sasi_device::device_add_mconfig(machine_config &config)
         .option_add_internal("scsicb", NSCSI_CB)
         .machine_config([this](device_t* device) {
            downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(idpartner_sasi_device::req_w));
+           downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(idpartner_sasi_device::io_w));
         });
     }
 } // anonymous namespace

src/devices/cpu/alto2/a2emu.cpp

@@ -267,8 +267,8 @@ void alto2_cpu_device::f1_early_emu_block()
 	CPU_CLR_TASK_WAKEUP(m_task);
 	LOG((this,LOG_EMU,2, "   BLOCK %02o:%s\n", m_task, task_name(m_task)));
 #elif   0
-	throw emu_fatalerror(1, "Emulator task want's to BLOCK.\n" \
-			"%s-%04o: r:%02o af:%02o bs:%02o f1:%02o f2:%02o" \
+	throw emu_fatalerror(1, "Emulator task want's to BLOCK.\n"
+			"%s-%04o: r:%02o af:%02o bs:%02o f1:%02o f2:%02o"
 			" t:%o l:%o next:%05o next2:%05o cycle:%lld\n",
 			task_name(m_task), m_mpc,
 			m_rsel, m_daluf, m_dbs, m_df1, mdf2,