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

Merge pull request #6129 from 86Box/tc1995

Browse Source 
Minor cleanup on 53c9x code (September 7th, 2025)
This commit is contained in:
Miran Grča
2025-09-07 00:44:58 +02:00
committed by GitHub
parent 41dcee22b7 2141353592
commit daef24de13
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/scsi/scsi_pcscsi.c
View File

@@ -1274,7 +1274,7 @@ esp_command_complete(void *priv, uint32_t status)
static void static void
esp_timer_on(esp_t *dev, scsi_device_t *sd, double p) esp_timer_on(esp_t *dev, scsi_device_t *sd, double p)
{ {
if ((dev->rregs[ESP_CFG3] & 0x18) == 0x18) { if ((dev->wregs[ESP_CFG3] & 0x18) == 0x18) {
/* Fast SCSI: 10000000 bytes per second */ /* Fast SCSI: 10000000 bytes per second */
dev->period = (p > 0.0) ? p : (((double) sd->buffer_length) * 0.1); dev->period = (p > 0.0) ? p : (((double) sd->buffer_length) * 0.1);
} else { } else {
@@ -1537,11 +1537,11 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
esp_pci_soft_reset(dev); esp_pci_soft_reset(dev);
break; break;
case CMD_BUSRESET: case CMD_BUSRESET:
esp_log("ESP Bus Reset val=%02x.\n", (dev->rregs[ESP_CFG1] & CFG1_RESREPT)); esp_log("ESP Bus Reset val=%02x.\n", (dev->wregs[ESP_CFG1] & CFG1_RESREPT));
for (uint8_t i = 0; i < 16; i++) for (uint8_t i = 0; i < 16; i++)
scsi_device_reset(&scsi_devices[dev->bus][i]); scsi_device_reset(&scsi_devices[dev->bus][i]);
if (!(dev->rregs[ESP_CFG1] & CFG1_RESREPT)) { if (!(dev->wregs[ESP_CFG1] & CFG1_RESREPT)) {
dev->rregs[ESP_RINTR] |= INTR_RST; dev->rregs[ESP_RINTR] |= INTR_RST;
esp_log("ESP Bus Reset with IRQ\n"); esp_log("ESP Bus Reset with IRQ\n");
esp_raise_irq(dev); esp_raise_irq(dev);
@@ -1579,7 +1579,7 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
esp_raise_irq(dev); esp_raise_irq(dev);
break; break;
case CMD_PAD: case CMD_PAD:
esp_log("val = %02X\n", val); esp_log("PAD=%02X\n", val);
timer_stop(&dev->timer); timer_stop(&dev->timer);
timer_on_auto(&dev->timer, dev->period); timer_on_auto(&dev->timer, dev->period);
esp_log("ESP Transfer Pad\n"); esp_log("ESP Transfer Pad\n");
@@ -2214,7 +2214,8 @@ esp_pci_reset(void *priv)
esp_pci_soft_reset(dev); esp_pci_soft_reset(dev);
esp_log("PCI Reset.\n"); esp_log("PCI Reset.\n");
} } else
esp_log("NULL.\n");
} }
static void * static void *