claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More NCR53c400 fixes (January 13th, 2025)

Browse Source 
Getting on my nerves, NCR 5380...
This commit is contained in:
TC1995
2025-01-13 21:10:12 +01:00
parent 923dd076c5
commit 29ec9fa9ba
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/scsi_ncr5380.h
View File

@@ -104,6 +104,7 @@ typedef struct ncr_t {
int state; int state;
int clear_req; int clear_req;
int wait_data; int wait_data;
int wait_data_back;
int wait_complete; int wait_complete;
int command_pos; int command_pos;
int data_pos; int data_pos;

9
src/scsi/scsi_ncr5380.c
View File

@@ -197,7 +197,7 @@ ncr5380_bus_read(ncr_t *ncr)
phase = (ncr->cur_bus & SCSI_PHASE_MESSAGE_IN); phase = (ncr->cur_bus & SCSI_PHASE_MESSAGE_IN);
if (phase == SCSI_PHASE_DATA_IN) { if (phase == SCSI_PHASE_DATA_IN) {
if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_initiator_receive_ext) { if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_initiator_receive_ext || (ncr->wait_data_back == 1)) {
ncr5380_log("Phase Data In.\n"); ncr5380_log("Phase Data In.\n");
if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL)) if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL))
ncr->tx_data = dev->sc->temp_buffer[ncr->data_pos++]; ncr->tx_data = dev->sc->temp_buffer[ncr->data_pos++];
@@ -210,11 +210,12 @@ ncr5380_bus_read(ncr_t *ncr)
ncr->state = STATE_IDLE; ncr->state = STATE_IDLE;
ncr->cur_bus &= ~BUS_BSY; ncr->cur_bus &= ~BUS_BSY;
} else { } else {
if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_send_ext) if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_send_ext || (ncr->wait_data_back == 1))
ncr->state = STATE_DATAOUT; ncr->state = STATE_DATAOUT;
} }
} else if (phase == SCSI_PHASE_STATUS) { } else if (phase == SCSI_PHASE_STATUS) {
ncr5380_log("Phase Status.\n"); ncr5380_log("Phase Status.\n");
ncr->wait_data_back = 0;
ncr->cur_bus |= BUS_REQ; ncr->cur_bus |= BUS_REQ;
ncr->state = STATE_STATUS; ncr->state = STATE_STATUS;
ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(dev->status) | BUS_DBP; ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(dev->status) | BUS_DBP;
@@ -359,7 +360,7 @@ ncr5380_bus_update(ncr_t *ncr, int bus)
ncr5380_log("DMA mode idle IN=%d.\n", ncr->data_pos); ncr5380_log("DMA mode idle IN=%d.\n", ncr->data_pos);
ncr->timer(ncr->priv, ncr->period); ncr->timer(ncr->priv, ncr->period);
} else { } else {
ncr5380_log("DMA mode IN=%d.\n", ncr->data_pos); pclog("DMA mode IN=%d.\n", ncr->data_pos);
ncr->clear_req = 3; ncr->clear_req = 3;
} }
@@ -495,7 +496,7 @@ ncr5380_write(uint16_t port, uint8_t val, ncr_t *ncr)
break; break;
case 7: /* start DMA Initiator Receive */ case 7: /* start DMA Initiator Receive */
ncr5380_log("[%04X:%08X]: Write: start DMA initiator receive register, dma? = %02x\n", CS, cpu_state.pc, ncr->mode & MODE_DMA); pclog("[%04X:%08X]: Write: start DMA initiator receive register, dma? = %02x\n", CS, cpu_state.pc, ncr->mode & MODE_DMA);
/*a Read 6/10 has occurred, start the timer when the block count is loaded*/ /*a Read 6/10 has occurred, start the timer when the block count is loaded*/
ncr->dma_mode = DMA_INITIATOR_RECEIVE; ncr->dma_mode = DMA_INITIATOR_RECEIVE;
if (ncr->dma_initiator_receive_ext) if (ncr->dma_initiator_receive_ext)

1
src/scsi/scsi_ncr53c400.c
View File

@@ -193,6 +193,7 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
else else
timer_on_auto(&ncr400->timer, ncr->period); timer_on_auto(&ncr400->timer, ncr->period);
ncr->wait_data_back = ncr->wait_data;
ncr53c400_log("DMA timer on=%02x, callback=%lf, scsi buflen=%d, waitdata=%d, waitcomplete=%d, clearreq=%d, datawait=%d, enabled=%d.\n", ncr53c400_log("DMA timer on=%02x, callback=%lf, scsi buflen=%d, waitdata=%d, waitcomplete=%d, clearreq=%d, datawait=%d, enabled=%d.\n",
ncr->mode & MODE_MONITOR_BUSY, scsi_device_get_callback(dev), dev->buffer_length, ncr->wait_data, ncr->wait_complete, ncr->clear_req, ncr->data_wait, timer_is_enabled(&ncr400->timer)); ncr->mode & MODE_MONITOR_BUSY, scsi_device_get_callback(dev), dev->buffer_length, ncr->wait_data, ncr->wait_complete, ncr->clear_req, ncr->data_wait, timer_is_enabled(&ncr400->timer));
} }