mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2025-08-12 17:27:35 +02:00
parent a0f6644e00 01a570bc63
commit eb4f68960d
36 changed files with 151 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#define SCSI_PCSCSI_H
extern const device_t am53c974_pci_device;
extern const device_t am53c974a_pci_device;
extern const device_t dc390_pci_device;
extern const device_t ncr53c90a_mca_device;

2
src/qt/languages/86box.pot
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/ca-ES.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/cs-CZ.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/de-DE.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/es-ES.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/fi-FI.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/fr-FR.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/hr-HR.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/hu-HU.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/it-IT.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/ja-JP.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/ko-KR.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/nl-NL.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/pl-PL.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

4
src/qt/languages/pt-BR.po
View File

@@ -1278,8 +1278,8 @@ msgstr "Build"
msgid "Version"
msgstr "Versão"
msgid "An update to 86Box is available!"
msgstr "Uma atualização do 86Box está disponível!"
msgid "<b>An update to 86Box is available!</b>"
msgstr "<b>Uma atualização do 86Box está disponível!</b>"
msgid "Warning"
msgstr "Aviso"

2
src/qt/languages/pt-PT.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/ru-RU.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/sk-SK.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/sl-SI.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/sv-SE.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/tr-TR.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/uk-UA.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/vi-VN.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/zh-CN.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

2
src/qt/languages/zh-TW.po
View File

@@ -1278,7 +1278,7 @@ msgstr ""
msgid "Version"
msgstr ""
msgid "An update to 86Box is available!"
msgid "<b>An update to 86Box is available!</b>"
msgstr ""
msgid "Warning"

1
src/scsi/scsi.c
View File

@@ -84,6 +84,7 @@ static SCSI_CARD scsi_cards[] = {
{ &buslogic_445c_device, },
/* PCI */
{ &am53c974_pci_device, },
{ &am53c974a_pci_device, },
{ &buslogic_958d_pci_device, },
{ &ncr53c810_pci_device, },
{ &ncr53c815_pci_device, },

104
src/scsi/scsi_pcscsi.c
View File

@@ -141,6 +141,7 @@ enum ESPASCMode {
#define CFG1_RESREPT 0x40
#define TCHI_ESP100A 0x01
#define TCHI_FAS100A 0x04
#define TCHI_AM53C974 0x12
@@ -666,6 +667,7 @@ esp_hard_reset(esp_t *dev)
dev->tchi_written = 0;
dev->asc_mode = ESP_ASC_MODE_DIS;
dev->rregs[ESP_CFG1] = dev->mca ? dev->HostID : 7;
dev->sbac = 1 << 19;
esp_log("ESP Reset\n");
@@ -716,7 +718,7 @@ esp_do_dma(esp_t *dev)
len = esp_get_tc(dev);
esp_log("ESP SCSI Actual DMA len=%d, cfg3=%02x.\n", len, dev->rregs[ESP_CFG3]);
esp_log("ESP SCSI Actual DMA len=%d, cfg3=%02x, phase=%x.\n", len, dev->rregs[ESP_CFG3], esp_get_phase(dev));
switch (esp_get_phase(dev)) {
case STAT_MO:
@@ -1316,6 +1318,7 @@ handle_s_without_atn(void *priv)
if (esp_select(dev) < 0)
return;
esp_log("Selection without ATN.\n");
esp_set_phase(dev, STAT_CD);
dev->cmdfifo_cdb_offset = 0;
@@ -1333,6 +1336,7 @@ handle_satn(void *priv)
if (esp_select(dev) < 0)
return;
esp_log("Selection with ATN.\n");
esp_set_phase(dev, STAT_MO);
if (dev->dma)
@@ -1434,12 +1438,17 @@ esp_reg_read(esp_t *dev, uint32_t saddr)
esp_log("Read Interrupt=%02x (old).\n", ret);
break;
case ESP_TCHI: /* Return the unique id if the value has never been written */
if (!dev->mca && !dev->tchi_written)
ret = TCHI_AM53C974;
else
ret = dev->rregs[ESP_TCHI];
if (!dev->tchi_written) {
if (dev->mca)
ret = TCHI_ESP100A;
else
ret = TCHI_AM53C974;
esp_log("Read TCHI Register=%02x.\n", ret);
esp_log("ChipID=%02x.\n", ret);
} else {
ret = dev->rregs[ESP_TCHI];
esp_log("Read TCHI Register=%02x.\n", ret);
}
break;
case ESP_RFLAGS:
ret = fifo8_num_used(&dev->fifo);
@@ -1525,6 +1534,12 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
break;
case CMD_BUSRESET:
esp_log("ESP Bus Reset val=%02x.\n", (dev->rregs[ESP_CFG1] & CFG1_RESREPT));
if (dev->mca) {
esp_lower_irq(dev);
esp_hard_reset(dev);
} else
esp_pci_soft_reset(dev);
for (uint8_t i = 0; i < 16; i++) {
scsi_device_reset(&scsi_devices[dev->bus][i]);
}
@@ -1635,6 +1650,7 @@ esp_pci_dma_memory_rw(esp_t *dev, uint8_t *buf, uint32_t len, int dir)
if (dev->dma_regs[DMA_WBC] < len)
len = dev->dma_regs[DMA_WBC];
esp_log("DMA Length=%d.\n", len);
if (dev->dma_regs[DMA_CMD] & DMA_CMD_MDL) {
if (len) {
dma_bm_read(dev->dma_regs[DMA_WMAC], (uint8_t *)&DMAPtr, 4, 4);
@@ -1681,16 +1697,18 @@ esp_pci_dma_memory_rw(esp_t *dev, uint8_t *buf, uint32_t len, int dir)
}
}
} else {
addr = dev->dma_regs[DMA_WAC];
if (len) {
addr = dev->dma_regs[DMA_WAC];
if (expected_dir)
dma_bm_write(addr, buf, len, 4);
else
dma_bm_read(addr, buf, len, 4);
if (expected_dir)
dma_bm_write(addr, buf, len, 4);
else
dma_bm_read(addr, buf, len, 4);
/* update status registers */
dev->dma_regs[DMA_WBC] -= len;
dev->dma_regs[DMA_WAC] += len;
/* update status registers */
dev->dma_regs[DMA_WBC] -= len;
dev->dma_regs[DMA_WAC] += len;
}
}
esp_log("Finished count=%d.\n", dev->dma_regs[DMA_WBC]);
@@ -2184,7 +2202,7 @@ esp_pci_read(UNUSED(int func), int addr, void *priv)
case 0x07:
return esp_pci_regs[0x07] | 0x02;
case 0x08:
return 0x10; /*Revision ID*/
return (dev->local == 1) ? 0 : 0x10; /*Revision ID*/
case 0x09:
return 0; /*Programming interface*/
case 0x0A:
@@ -2363,7 +2381,7 @@ esp_pci_reset(void *priv)
memcpy(dev, &reset_state, sizeof(esp_t));
dev->sbac = 1 << 19;
esp_pci_soft_reset(dev);
}
static void *
@@ -2650,6 +2668,44 @@ static const device_config_t bios_enable_config[] = {
// clang-format on
};
static const device_config_t am53c974_bios_enable_config[] = {
// clang-format off
{
.name = "bios_rev",
.description = "BIOS Revision",
.type = CONFIG_BIOS,
.default_string = "v3_01_amd",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
.bios = {
{
.name = "Version 3.01 (AMD)",
.internal_name = "v3_01_amd",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
.size = 16384,
.files = { AM53C974_3_01_AMD_ROM, "" }
},
{ .files_no = 0 }
},
},
{
.name = "bios",
.description = "Enable BIOS",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
.selection = { { 0 } },
.bios = { { 0 } }
},
{ .name = "", .description = "", .type = CONFIG_END }
// clang-format on
};
static const device_config_t am53c974a_bios_enable_config[] = {
// clang-format off
{
@@ -2739,7 +2795,7 @@ const device_t dc390_pci_device = {
};
const device_t am53c974_pci_device = {
.name = "AMD 53c974A PCI",
.name = "AMD 53c974 PCI",
.internal_name = "am53c974",
.flags = DEVICE_PCI,
.local = 1,
@@ -2749,6 +2805,20 @@ const device_t am53c974_pci_device = {
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = am53c974_bios_enable_config
};
const device_t am53c974a_pci_device = {
.name = "AMD 53c974A PCI",
.internal_name = "am53c974a",
.flags = DEVICE_PCI,
.local = 2,
.init = dc390_init,
.close = esp_close,
.reset = esp_pci_reset,
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = am53c974a_bios_enable_config
};

2
src/sio/sio_fdc37c669.c
View File

@@ -39,7 +39,7 @@ typedef struct fdc37c669_t {
uint8_t tries;
uint8_t has_ide;
uint8_t dma_map[4];
uint8_t irq_map[10];
uint8_t irq_map[16];
uint8_t regs[256];
int locked;
int rw_locked;

2
src/sio/sio_gm82c803ab.c
View File

@@ -35,7 +35,7 @@ typedef struct gm82c803ab_t {
uint8_t type;
uint8_t tries;
uint8_t has_ide;
uint8_t regs[16];
uint8_t regs[256];
int cur_reg;
int com3_addr;
int com4_addr;

2
src/sio/sio_gm82c803c.c
View File

@@ -35,7 +35,7 @@ typedef struct gm82c803c_t {
uint8_t has_ide;
uint8_t dma_map[4];
uint8_t irq_map[10];
uint8_t regs[16];
uint8_t regs[256];
int cur_reg;
fdc_t *fdc;
serial_t *uart[2];

2
src/sio/sio_pc87307.c
View File

@@ -42,7 +42,7 @@ typedef struct pc87307_t {
uint8_t baddr;
uint8_t pm_idx;
uint8_t regs[48];
uint8_t ld_regs[256][208];
uint8_t ld_regs[256][256];
uint8_t pcregs[16];
uint8_t gpio[2][8];
uint8_t pm[8];

2
src/sio/sio_pc87309.c
View File

@@ -42,7 +42,7 @@ typedef struct pc87309_t {
uint8_t baddr;
uint8_t pm_idx;
uint8_t regs[48];
uint8_t ld_regs[256][208];
uint8_t ld_regs[256][256];
uint8_t pm[8];
uint16_t superio_base;
uint16_t pm_base;

2
src/sio/sio_pc873xx.c
View File

@@ -39,7 +39,7 @@ typedef struct pc873xx_t {
uint8_t tries;
uint8_t has_ide;
uint8_t fdc_on;
uint8_t regs[15];
uint8_t regs[256];
uint16_t base_addr;
int cur_reg;
int max_reg;

46
src/video/vid_ati_mach8.c
View File

@@ -2928,10 +2928,12 @@ mach_recalctimings(svga_t *svga)
dev->h_disp_time = dev->hdisp >> 3;
svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen);
svga->clock_8514 = (cpuclock * (double) (1ULL << 32)) / svga->getclock((mach->accel.clock_sel >> 2) & 0x0f, svga->clock_gen) / 2;
if (mach->accel.clock_sel & 0x40)
svga->clock_8514 *= 2;
mach_log("8514/A clock sel=%x, divide reg ibm=%02x, divide reg vga=%02x.\n", clock_sel, mach->accel.clock_sel & 0x40, mach->regs[0xb8] & 0xc0);
if (dev->interlace)
dev->dispend >>= 1;
@@ -3060,29 +3062,29 @@ mach_recalctimings(svga_t *svga)
if (!svga->scrblank && (svga->crtc[0x17] & 0x80) && svga->attr_palette_enable) {
mach_log("GDCREG5=%02x, ATTR10=%02x, ATI B0 bit 5=%02x, ON=%d.\n",
svga->gdcreg[5] & 0x60, svga->attrregs[0x10] & 0x40, mach->regs[0xb0] & 0x20, dev->on);
svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
mach_log("VGA clock sel=%x, divide reg=%02x.\n", clock_sel, mach->regs[0xb8] & 0xc0);
if (ATI_MACH32) {
if (mach->regs[0xb8] & 0x40)
svga->clock *= 2;
} else {
switch (mach->regs[0xb8] & 0xc0) {
case 0x40:
svga->clock *= 2;
break;
case 0x80:
svga->clock *= 3;
break;
case 0xc0:
svga->clock *= 4;
break;
default:
break;
}
}
if ((svga->gdcreg[6] & 0x01) || (svga->attrregs[0x10] & 0x01)) {
if ((svga->gdcreg[5] & 0x40) || (svga->attrregs[0x10] & 0x40) || (mach->regs[0xb0] & 0x20)) {
svga->clock = (cpuclock * (double) (1ULL << 32)) / svga->getclock(clock_sel, svga->clock_gen);
mach_log("VGA clock=%02x.\n", mach->regs[0xa7] & 0x80);
if (ATI_MACH32) {
if (mach->regs[0xb8] & 0x40)
svga->clock *= 2;
} else {
switch (mach->regs[0xb8] & 0xc0) {
case 0x40:
svga->clock *= 2;
break;
case 0x80:
svga->clock *= 3;
break;
case 0xc0:
svga->clock *= 4;
break;
default:
break;
}
}
svga->map8 = svga->pallook;
mach_log("Lowres=%x, seqreg[1]bit3=%x.\n", svga->lowres, svga->seqregs[1] & 8);
if (svga->lowres)

11
src/video/vid_svga.c
View File

@@ -799,9 +799,10 @@ svga_recalctimings(svga_t *svga)
if ((svga->bpp <= 8) || ((svga->gdcreg[5] & 0x60) <= 0x20)) {
if ((svga->gdcreg[5] & 0x60) == 0x00) {
if (svga->seqregs[1] & 8) /*Low res (320)*/
if (svga->seqregs[1] & 8) { /*Low res (320)*/
svga->render = svga_render_4bpp_lowres;
else
svga_log("4 bpp low res.\n");
} else
svga->render = svga_render_4bpp_highres;
} else if ((svga->gdcreg[5] & 0x60) == 0x20) {
if (svga->seqregs[1] & 8) { /*Low res (320)*/
@@ -1045,11 +1046,11 @@ svga_recalctimings(svga_t *svga)
crtcconst = svga->clock * svga->char_width;
if (ibm8514_active && (svga->dev8514 != NULL)) {
if (dev->on)
crtcconst8514 = svga->clock_8514;
crtcconst8514 = svga->clock_8514 * 8;
}
if (xga_active && (svga->xga != NULL)) {
if (xga->on)
crtcconst_xga = svga->clock_xga;
crtcconst_xga = svga->clock_xga * svga->char_width;
}
#ifdef ENABLE_SVGA_LOG
@@ -1093,7 +1094,6 @@ svga_recalctimings(svga_t *svga)
if (dev->on) {
disptime8514 = dev->h_total;
_dispontime8514 = dev->h_disp_time;
svga_log("HTOTAL=%d, HDISP=%d.\n", dev->h_total, dev->h_disp);
}
}
@@ -1135,6 +1135,7 @@ svga_recalctimings(svga_t *svga)
case 1: /*Plus 8514/A*/
if (dev->on) {
_dispofftime8514 = disptime8514 - _dispontime8514;
svga_log("DISPTIME8514=%lf, off=%lf, DISPONTIME8514=%lf, CRTCCONST8514=%lf.\n", disptime8514, _dispofftime8514, _dispontime8514, crtcconst8514);
_dispontime8514 *= crtcconst8514;
_dispofftime8514 *= crtcconst8514;