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

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

Browse Source
This commit is contained in:
OBattler
2026-02-26 23:23:26 +01:00
parent a59fb252f5 62c43d8699
commit 563611c171
30 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/chipset/opti895.c
View File

@@ -44,7 +44,6 @@ typedef struct opti895_t {
static uint8_t masks[0x10] = { 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
0xe3, 0xff, 0xe3, 0xff, 0x00, 0xff, 0xff, 0xff };
#define ENABLE_OPTI895_LOG 1
#ifdef ENABLE_OPTI895_LOG
int opti895_do_log = ENABLE_OPTI895_LOG;
@@ -250,9 +249,7 @@ opti895_read(uint16_t addr, void *priv)
if (((dev->idx >= 0x20) && (dev->idx <= 0x2f) && (dev->idx != 0x2c)) ||
((dev->idx >= 0xe0) && (dev->idx <= 0xef))) {
ret = dev->regs[dev->idx];
if (dev->idx == 0x21)
ret |= 0x1c;
else if (dev->idx == 0x28)
if (dev->idx == 0x28)
ret |= 0x18;
else if (dev->idx == 0xe0)
ret = (ret & 0xf6) | (in_smm ? 0x00 : 0x08) | !!dev->forced_green;

66
src/machine/machine_table.c
View File

@@ -4821,8 +4821,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -6385,8 +6386,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -6482,8 +6484,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00002020,
@@ -8386,8 +8389,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL, /* The keyboard controller is part of the VL82c113. */
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL, /*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8433,8 +8437,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8480,8 +8485,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -8527,8 +8533,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -8574,8 +8581,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -8584,7 +8592,6 @@ const machine_t machines[] = {
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
/*Has SIO (sorta): VLSI VL82C113A SCAMP Combination I/O*/
.vid_device = &gd5426_onboard_device,
.snd_device = NULL,
.net_device = NULL
@@ -9285,8 +9292,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000ce0,
@@ -9332,8 +9340,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -9379,8 +9388,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the VLSI VL82C113. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x000004f0,
@@ -11144,8 +11154,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = 0x00000000,
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the OPTi 82c602. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,
@@ -11191,8 +11202,9 @@ const machine_t machines[] = {
.default_jumpered_ecp_dma = -1,
.kbc_device = &kbc_at_device,
.kbc_params = KBC_VEN_PHOENIX | 0x00021400, /* Guess. */
.nvr_device = &nvr_at_device,
.nvr_params = NVR_AT,
/* The NVR is on the OPTi 82c602. */
.nvr_device = NULL,
.nvr_params = 0x00000000,
.sio_device = NULL,
.sio_params = 0x00000000,
.kbc_p1 = 0x00000cf0,

BIN
src/qt/assets/86Box-green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
src/qt/assets/86box-rb.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

BIN
src/qt/assets/86box-red.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB

BIN
src/qt/assets/86box-wizard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
src/qt/assets/86box-yellow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
src/qt/assets/86box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 846 B

BIN
src/qt/icons/86Box-gray.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 KiB

After

Width:  |  Height:  |  Size: 393 KiB

BIN
src/qt/icons/new_vm.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

BIN
src/qt/icons/other_removable_devices.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

6
src/qt/qt_settingsotherremovable.cpp
View File

@@ -119,13 +119,15 @@ SettingsOtherRemovable::setRDiskType(QAbstractItemModel *model, const QModelInde
break;
}
auto i = idx.siblingAtColumn(1);
auto i = idx.siblingAtColumn(0);
model->setData(i, icon, Qt::DecorationRole);
i = idx.siblingAtColumn(1);
if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == RDISK_BUS_DISABLED)
model->setData(i, QCoreApplication::translate("", "None"));
else
model->setData(i, rdiskDriveTypeName(type));
model->setData(i, type, Qt::UserRole);
model->setData(i, icon, Qt::DecorationRole);
}
SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)

4
src/qt_resources.qrc
View File

@@ -88,10 +88,6 @@
<file alias="/texture_frag.spv">qt/texture_frag.spv</file>
</qresource>
<qresource prefix="/assets">
<file alias="86Box-green.png">qt/assets/86Box-green.png</file>
<file alias="86box-rb.png">qt/assets/86box-rb.png</file>
<file alias="86box-red.png">qt/assets/86box-red.png</file>
<file alias="86box-yellow.png">qt/assets/86box-yellow.png</file>
<file alias="86box.png">qt/assets/86box.png</file>
<file alias="86box-wizard.png">qt/assets/86box-wizard.png</file>
<file alias="addvm-logo.png">qt/assets/addvm-logo.png</file>

5
src/sound/snd_mpu401.c
View File

@@ -316,8 +316,9 @@ MPU401_Reset(mpu_t *mpu)
mpu->ch_toref[i] = 4; /* Dummy reftable. */
}
mpu->state.irq_pending = 0;
MPU401_UpdateIRQ(mpu, 0);
/* SB 16 only? */
if (!mpu->intelligent)
MPU401_ClrQueue(mpu);
mpu->state.data_onoff = -1;

BIN
src/unix/assets/128x128/net.86box.86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/unix/assets/16x16/net.86box.86Box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 B

BIN
src/unix/assets/192x192/net.86box.86Box.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
src/unix/assets/20x20/net.86box.86Box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 275 B

BIN
src/unix/assets/24x24/net.86box.86Box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
src/unix/assets/256x256/net.86box.86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
src/unix/assets/32x32/net.86box.86Box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 451 B

BIN
src/unix/assets/40x40/net.86box.86Box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 546 B

BIN
src/unix/assets/48x48/net.86box.86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 626 B

BIN
src/unix/assets/512x512/net.86box.86Box.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 77 KiB

BIN
src/unix/assets/64x64/net.86box.86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 776 B

BIN
src/unix/assets/72x72/net.86box.86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 802 B

2
src/unix/assets/86Box.spec
View File

@@ -88,7 +88,7 @@ Collection of ROMs for use with 86Box.
%cmake_install
# install icons
for i in 48 64 72 96 128 192 256 512; do
for i in 16 20 24 32 40 48 64 72 128 256; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
cp src/unix/assets/${i}x${i}/net.86box.86Box.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
done

BIN
src/unix/assets/96x96/net.86box.86Box.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
src/unix/assets/screenshots/86Box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 38 KiB

1
src/video/vid_cl54xx.c
View File

@@ -1879,7 +1879,6 @@ gd54xx_recalctimings(svga_t *svga)
svga->interlace = 0;
}
pclog("CRTC1a=%x, interlace=%x.\n", svga->crtc[0x1a] & 0x01, svga->interlace);
clocksel = (svga->miscout >> 2) & 3;
if (!gd54xx->vclk_n[clocksel] || !gd54xx->vclk_d[clocksel])