diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c
index 7be1d0bd1..059e8da8a 100644
--- a/src/chipset/opti895.c
+++ b/src/chipset/opti895.c
@@ -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;
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 2b8a41f83..2c22e4079 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -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,
diff --git a/src/qt/assets/86Box-green.png b/src/qt/assets/86Box-green.png
deleted file mode 100644
index c1af649a1..000000000
Binary files a/src/qt/assets/86Box-green.png and /dev/null differ
diff --git a/src/qt/assets/86box-rb.png b/src/qt/assets/86box-rb.png
deleted file mode 100644
index a29748b8d..000000000
Binary files a/src/qt/assets/86box-rb.png and /dev/null differ
diff --git a/src/qt/assets/86box-red.png b/src/qt/assets/86box-red.png
deleted file mode 100644
index 0ddf9d3a4..000000000
Binary files a/src/qt/assets/86box-red.png and /dev/null differ
diff --git a/src/qt/assets/86box-wizard.png b/src/qt/assets/86box-wizard.png
index 19ecda8c7..e1cbdea9c 100644
Binary files a/src/qt/assets/86box-wizard.png and b/src/qt/assets/86box-wizard.png differ
diff --git a/src/qt/assets/86box-yellow.png b/src/qt/assets/86box-yellow.png
deleted file mode 100644
index d8c74def7..000000000
Binary files a/src/qt/assets/86box-yellow.png and /dev/null differ
diff --git a/src/qt/assets/86box.png b/src/qt/assets/86box.png
index a29748b8d..a90f63040 100644
Binary files a/src/qt/assets/86box.png and b/src/qt/assets/86box.png differ
diff --git a/src/qt/icons/86Box-gray.ico b/src/qt/icons/86Box-gray.ico
index 52fe1c49b..11280fd7f 100644
Binary files a/src/qt/icons/86Box-gray.ico and b/src/qt/icons/86Box-gray.ico differ
diff --git a/src/qt/icons/new_vm.ico b/src/qt/icons/new_vm.ico
index 27e4a2606..bbd7f92fd 100644
Binary files a/src/qt/icons/new_vm.ico and b/src/qt/icons/new_vm.ico differ
diff --git a/src/qt/icons/other_removable_devices.ico b/src/qt/icons/other_removable_devices.ico
index d26fb7918..c9ef8d66a 100644
Binary files a/src/qt/icons/other_removable_devices.ico and b/src/qt/icons/other_removable_devices.ico differ
diff --git a/src/qt/qt_settingsotherremovable.cpp b/src/qt/qt_settingsotherremovable.cpp
index 0deaf2904..ca74ec6ea 100644
--- a/src/qt/qt_settingsotherremovable.cpp
+++ b/src/qt/qt_settingsotherremovable.cpp
@@ -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)
diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc
index 5d2a6a662..fc55fc76c 100644
--- a/src/qt_resources.qrc
+++ b/src/qt_resources.qrc
@@ -88,10 +88,6 @@
qt/texture_frag.spv
- qt/assets/86Box-green.png
- qt/assets/86box-rb.png
- qt/assets/86box-red.png
- qt/assets/86box-yellow.png
qt/assets/86box.png
qt/assets/86box-wizard.png
qt/assets/addvm-logo.png
diff --git a/src/sound/snd_mpu401.c b/src/sound/snd_mpu401.c
index 2562f16cc..742552a29 100644
--- a/src/sound/snd_mpu401.c
+++ b/src/sound/snd_mpu401.c
@@ -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;
diff --git a/src/unix/assets/128x128/net.86box.86Box.png b/src/unix/assets/128x128/net.86box.86Box.png
index bf521d3ec..08bbe6b0f 100644
Binary files a/src/unix/assets/128x128/net.86box.86Box.png and b/src/unix/assets/128x128/net.86box.86Box.png differ
diff --git a/src/unix/assets/16x16/net.86box.86Box.png b/src/unix/assets/16x16/net.86box.86Box.png
new file mode 100644
index 000000000..d84ba3da5
Binary files /dev/null and b/src/unix/assets/16x16/net.86box.86Box.png differ
diff --git a/src/unix/assets/192x192/net.86box.86Box.png b/src/unix/assets/192x192/net.86box.86Box.png
deleted file mode 100644
index 4bed7df13..000000000
Binary files a/src/unix/assets/192x192/net.86box.86Box.png and /dev/null differ
diff --git a/src/unix/assets/20x20/net.86box.86Box.png b/src/unix/assets/20x20/net.86box.86Box.png
new file mode 100644
index 000000000..f4c066a44
Binary files /dev/null and b/src/unix/assets/20x20/net.86box.86Box.png differ
diff --git a/src/unix/assets/24x24/net.86box.86Box.png b/src/unix/assets/24x24/net.86box.86Box.png
new file mode 100644
index 000000000..e7f1b0f98
Binary files /dev/null and b/src/unix/assets/24x24/net.86box.86Box.png differ
diff --git a/src/unix/assets/256x256/net.86box.86Box.png b/src/unix/assets/256x256/net.86box.86Box.png
index 4ef8b2120..2ee69dd68 100644
Binary files a/src/unix/assets/256x256/net.86box.86Box.png and b/src/unix/assets/256x256/net.86box.86Box.png differ
diff --git a/src/unix/assets/32x32/net.86box.86Box.png b/src/unix/assets/32x32/net.86box.86Box.png
new file mode 100644
index 000000000..c9c352960
Binary files /dev/null and b/src/unix/assets/32x32/net.86box.86Box.png differ
diff --git a/src/unix/assets/40x40/net.86box.86Box.png b/src/unix/assets/40x40/net.86box.86Box.png
new file mode 100644
index 000000000..5e1634df8
Binary files /dev/null and b/src/unix/assets/40x40/net.86box.86Box.png differ
diff --git a/src/unix/assets/48x48/net.86box.86Box.png b/src/unix/assets/48x48/net.86box.86Box.png
index 75411ba16..b861aee7e 100644
Binary files a/src/unix/assets/48x48/net.86box.86Box.png and b/src/unix/assets/48x48/net.86box.86Box.png differ
diff --git a/src/unix/assets/512x512/net.86box.86Box.png b/src/unix/assets/512x512/net.86box.86Box.png
deleted file mode 100644
index 2fef558d6..000000000
Binary files a/src/unix/assets/512x512/net.86box.86Box.png and /dev/null differ
diff --git a/src/unix/assets/64x64/net.86box.86Box.png b/src/unix/assets/64x64/net.86box.86Box.png
index 24d668e0c..775af6294 100644
Binary files a/src/unix/assets/64x64/net.86box.86Box.png and b/src/unix/assets/64x64/net.86box.86Box.png differ
diff --git a/src/unix/assets/72x72/net.86box.86Box.png b/src/unix/assets/72x72/net.86box.86Box.png
index e01c47829..08b0acbf9 100644
Binary files a/src/unix/assets/72x72/net.86box.86Box.png and b/src/unix/assets/72x72/net.86box.86Box.png differ
diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec
index aefac7a4f..43dc8c386 100644
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -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
diff --git a/src/unix/assets/96x96/net.86box.86Box.png b/src/unix/assets/96x96/net.86box.86Box.png
deleted file mode 100644
index ee24db6ea..000000000
Binary files a/src/unix/assets/96x96/net.86box.86Box.png and /dev/null differ
diff --git a/src/unix/assets/screenshots/86Box.png b/src/unix/assets/screenshots/86Box.png
index 5f72485f3..02a77f8f3 100644
Binary files a/src/unix/assets/screenshots/86Box.png and b/src/unix/assets/screenshots/86Box.png differ
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index edf49fe88..91ec82912 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -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])