Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-28 11:11:48 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

ncr5390: various fixes (nw)

Browse Source 
Several important fixes that help Sun4 (can now boot Solaris 2.3 from CD-ROM) and Jazz work better.
* Fix stupid virtual/override errors preventing ncr53c90a+ from working properly.
* Start DMA after arbitration/selection is completed for "select with..." commands.
* Trigger an interrupt on SCSI bus reset (if enabled).
This commit is contained in:
Patrick Mackinlay 2018-10-02 13:59:39 +07:00
parent dacf82932a
commit a1a23add71
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/devices/machine/ncr5390.cpp
View File

@ -407,10 +407,15 @@ void ncr5390_device::step(bool timeout)
case DISC_SEL_ARBITRATION_INIT: case DISC_SEL_ARBITRATION_INIT:
// wait until a command is in the fifo // wait until a command is in the fifo
if (!fifo_pos && dma_command && !(status & S_TC0)) if (!fifo_pos && dma_command && !(status & S_TC0)) {
// dma starts after bus arbitration/selection is complete
dma_set(DMA_OUT);
step(false);
break; break;
}
command_length = derive_msg_size(fifo[0]); // "with atn" variants have a message byte before the command descriptor
command_length = (c == CD_SELECT) ? derive_msg_size(fifo[0]) : 1;
state = DISC_SEL_ARBITRATION; state = DISC_SEL_ARBITRATION;
step(false); step(false);
break; break;
@ -850,6 +855,12 @@ void ncr5390_device::start_command()
case CM_RESET_BUS: case CM_RESET_BUS:
LOGMASKED(LOG_COMMAND, "Reset SCSI bus\n"); LOGMASKED(LOG_COMMAND, "Reset SCSI bus\n");
reset_soft(); reset_soft();
// FIXME: this interrupt should be generated when the reset is reflected
// back into the device, and not when the device starts the scsi reset
if (!(config & 0x40)) {
istatus = I_SCSI_RESET;
check_irq();
}
break; break;
case CD_RESELECT: case CD_RESELECT:
@ -867,7 +878,6 @@ void ncr5390_device::start_command()
"Select with ATN and stop sequence\n"); "Select with ATN and stop sequence\n");
seq = 0; seq = 0;
state = DISC_SEL_ARBITRATION_INIT; state = DISC_SEL_ARBITRATION_INIT;
dma_set(dma_command ? DMA_OUT : DMA_NONE);
arbitrate(); arbitrate();
break; break;

18
src/devices/machine/ncr5390.h
View File

@ -35,7 +35,7 @@ public:
DECLARE_WRITE8_MEMBER(fifo_w); DECLARE_WRITE8_MEMBER(fifo_w);
DECLARE_READ8_MEMBER(command_r); DECLARE_READ8_MEMBER(command_r);
DECLARE_WRITE8_MEMBER(command_w); DECLARE_WRITE8_MEMBER(command_w);
DECLARE_READ8_MEMBER(status_r); virtual DECLARE_READ8_MEMBER(status_r);
DECLARE_WRITE8_MEMBER(bus_id_w); DECLARE_WRITE8_MEMBER(bus_id_w);
DECLARE_READ8_MEMBER(istatus_r); DECLARE_READ8_MEMBER(istatus_r);
DECLARE_WRITE8_MEMBER(timeout_w); DECLARE_WRITE8_MEMBER(timeout_w);
@ -236,7 +236,7 @@ protected:
void check_irq(); void check_irq();
protected: protected:
void reset_soft(); virtual void reset_soft();
private: private:
void reset_disconnect(); void reset_disconnect();
@ -262,19 +262,19 @@ public:
virtual void map(address_map &map) override; virtual void map(address_map &map) override;
DECLARE_READ8_MEMBER(status_r); virtual DECLARE_READ8_MEMBER(status_r) override;
DECLARE_READ8_MEMBER(conf2_r) { return config2; }; DECLARE_READ8_MEMBER(conf2_r) { return config2; };
DECLARE_WRITE8_MEMBER(conf2_w) { config2 = data; }; DECLARE_WRITE8_MEMBER(conf2_w) { config2 = data; };
DECLARE_READ8_MEMBER(read) override; virtual DECLARE_READ8_MEMBER(read) override;
DECLARE_WRITE8_MEMBER(write) override; virtual DECLARE_WRITE8_MEMBER(write) override;
protected: protected:
ncr53c90a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); ncr53c90a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override; virtual void device_start() override;
void reset_soft(); virtual void reset_soft() override;
virtual bool check_valid_command(uint8_t cmd) override; virtual bool check_valid_command(uint8_t cmd) override;
@ -298,12 +298,12 @@ public:
DECLARE_WRITE8_MEMBER(conf3_w) { config3 = data; }; DECLARE_WRITE8_MEMBER(conf3_w) { config3 = data; };
DECLARE_WRITE8_MEMBER(fifo_align_w) { fifo_align = data; }; DECLARE_WRITE8_MEMBER(fifo_align_w) { fifo_align = data; };
DECLARE_READ8_MEMBER(read) override; virtual DECLARE_READ8_MEMBER(read) override;
DECLARE_WRITE8_MEMBER(write) override; virtual DECLARE_WRITE8_MEMBER(write) override;
protected: protected:
virtual void device_start() override; virtual void device_start() override;
void reset_soft(); virtual void reset_soft() override;
private: private:
u8 config3; u8 config3;