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

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-03-10 16:57:56 +01:00
parent 77f945ec59 262b49f987
commit a386bd015f
57 changed files with 4887 additions and 2284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scsi/scsi_cdrom.c
View File

@@ -373,7 +373,7 @@ scsi_cdrom_mode_sense_load(scsi_cdrom_t *dev)
if (fp) {
if (fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE], 1, 0x10, fp) != 0x10)
log_fatal(dev->log, "scsi_cdrom_mode_sense_load(): Error reading data\n");
(void) fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1,
(void) !fread(dev->ms_pages_saved.pages[GPMODE_CDROM_AUDIO_PAGE_SONY], 1,
0x10, fp);
fclose(fp);
}

13
src/scsi/scsi_t128.c
View File

@@ -95,7 +95,7 @@ t128_write(uint32_t addr, uint8_t val, void *priv)
t128->status, scsi_bus->period, timer_is_enabled(&t128->timer), t128->block_loaded);
t128->status &= ~0x04;
timer_on_auto(&t128->timer, 1.0);
timer_on_auto(&t128->timer, 10.0);
}
}
}
@@ -147,7 +147,7 @@ t128_read(uint32_t addr, void *priv)
scsi_bus->tx_mode = PIO_TX_BUS;
timer_stop(&t128->timer);
} else if (!timer_is_enabled(&t128->timer))
timer_on_auto(&t128->timer, 1.0);
timer_on_auto(&t128->timer, 10.0);
else
t128->status &= ~0x04;
}
@@ -223,7 +223,7 @@ t128_dma_initiator_receive_ext(void *priv, void *ext_priv)
t128->block_loaded = 1;
t128->status &= ~0x04;
timer_on_auto(&t128->timer, 1.0);
timer_on_auto(&t128->timer, 10.0);
}
return 1;
}
@@ -252,7 +252,7 @@ t128_callback(void *priv)
uint8_t status;
if (scsi_bus->tx_mode != PIO_TX_BUS)
timer_on_auto(&t128->timer, scsi_bus->period / 65.0);
timer_on_auto(&t128->timer, scsi_bus->period / 60.0);
if (scsi_bus->data_wait & 1) {
scsi_bus->clear_req = 3;
@@ -350,6 +350,7 @@ t128_callback(void *priv)
if (!t128->block_count) {
t128->block_loaded = 0;
scsi_bus->bus_out |= BUS_REQ;
timer_on_auto(&t128->timer, 10.0);
t128_log("IO End of read transfer\n");
}
break;
@@ -576,6 +577,10 @@ static const device_config_t t128_config[] = {
{ .description = "IRQ 3", .value = 3 },
{ .description = "IRQ 5", .value = 5 },
{ .description = "IRQ 7", .value = 7 },
{ .description = "IRQ 10", .value = 10 },
{ .description = "IRQ 12", .value = 12 },
{ .description = "IRQ 14", .value = 14 },
{ .description = "IRQ 15", .value = 15 },
{ .description = "" }
},
.bios = { { 0 } }