Merge branch '86Box:master' into master

.github/workflows/c-cpp.yml

@@ -16,6 +16,8 @@ on:
 
 jobs:
  msys2:
+ # Negative condition disables the job
+ if: false
  name: "Win32 GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
  runs-on: windows-2022

.github/workflows/cmake_windows_msys2.yml

@@ -57,9 +57,6 @@ jobs:
  new: on
  slug: -NDR
  ui:
- - name: Win32 GUI
- qt: off
- static: on
  - name: Qt GUI
  qt: on
  static: on

CMakeLists.txt

@@ -153,8 +153,10 @@ cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"
 cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF)
+cmake_dependent_option(MGA2 "Matrox Millennium II and Productiva G100" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
+cmake_dependent_option(OPL4ML "OPL4-ML daughterboard" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(PAS16 "Pro Audio Spectrum 16" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF)
 cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF)

src/86box.c

@@ -30,10 +30,10 @@
 #include <time.h>
 #include <wchar.h>
 #include <stdatomic.h>
+#include <unistd.h>
 
 #ifndef _WIN32
 # include <pwd.h>
-# include <unistd.h>
 #endif
 #ifdef __APPLE__
 # include <string.h>
@@ -1051,6 +1051,7 @@ pc_send_ca(uint16_t sc)
  keyboard_input(1, 0x1D); /* Ctrl key pressed */
  keyboard_input(1, 0x38); /* Alt key pressed */
  keyboard_input(1, sc);
+ usleep(50000);
  keyboard_input(0, sc);
  keyboard_input(0, 0x38); /* Alt key released */
  keyboard_input(0, 0x1D); /* Ctrl key released */

src/acpi.c

@@ -1669,6 +1669,10 @@ acpi_reset(void *priv)
  acpi_power_on = 0;
  }
 
+ /* The Gateway Tomahawk requires the LID polarity bit to be set. */
+ if (!strcmp(machine_get_internal_name(), "tomahawk"))
+ dev->regs.glbctl |= 0x02000000;
+
  acpi_rtc_status = 0;
 
  acpi_update_irq(dev);

src/cdrom/cdrom.c

@@ -442,7 +442,7 @@ cdrom_audio_callback(cdrom_t *dev, int16_t *output, int len)
 {
  int ret = 1;
 
- if (!dev->sound_on || (dev->cd_status != CD_STATUS_PLAYING)) {
+ if (!dev->sound_on || (dev->cd_status != CD_STATUS_PLAYING) || dev->audio_muted_soft) {
  cdrom_log("CD-ROM %i: Audio callback while not playing\n", dev->id);
  if (dev->cd_status == CD_STATUS_PLAYING)
  dev->seek_pos += (len >> 11);
@@ -557,6 +557,7 @@ cdrom_audio_play(cdrom_t *dev, uint32_t pos, uint32_t len, int ismsf)
  len += pos;
  }
 
+ dev->audio_muted_soft = 0;
  /* Do this at this point, since it's at this point that we know the
  actual LBA position to start playing from. */
  if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
@@ -578,6 +579,7 @@ cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit)
  int m = 0;
  int s = 0;
  int f = 0;
+ uint32_t pos2 = 0;
 
  if (dev->cd_status == CD_STATUS_DATA_ONLY)
  return 0;
@@ -614,14 +616,21 @@ cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit)
  break;
  }
 
+ pos2 = pos - 1;
+ if (pos2 == 0xffffffff)
+ pos2 = pos + 1;
+
  /* Do this at this point, since it's at this point that we know the
  actual LBA position to start playing from. */
- if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
- cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
- cdrom_stop(dev);
- return 0;
- }
+ if (!(dev->ops->track_type(dev, pos2) & CD_TRACK_AUDIO)) {
+ cdrom_log("CD-ROM %i: Track Search: LBA %08X not on an audio track\n", dev->id, pos);
+ dev->audio_muted_soft = 1;
+ if (dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)
+ dev->audio_muted_soft = 0;
+ } else
+ dev->audio_muted_soft = 0;
 
+ cdrom_log("Track Search Toshiba: Muted?=%d, LBA=%08X.\n", dev->audio_muted_soft, pos);
  dev->cd_buflen = 0;
  dev->cd_status = playbit ? CD_STATUS_PLAYING : CD_STATUS_PAUSED;
  return 1;
@@ -647,6 +656,7 @@ cdrom_audio_track_search_pioneer(cdrom_t *dev, uint32_t pos, uint8_t playbit)
 
  dev->seek_pos = pos;
 
+ dev->audio_muted_soft = 0;
  /* Do this at this point, since it's at this point that we know the
  actual LBA position to start playing from. */
  if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
@@ -676,6 +686,7 @@ cdrom_audio_play_pioneer(cdrom_t *dev, uint32_t pos)
  pos = MSFtoLBA(m, s, f) - 150;
  dev->cd_end = pos;
 
+ dev->audio_muted_soft = 0;
  dev->cd_buflen = 0;
  dev->cd_status = CD_STATUS_PLAYING;
  return 1;
@@ -717,16 +728,7 @@ cdrom_audio_play_toshiba(cdrom_t *dev, uint32_t pos, int type)
  break;
  }
 
- cdrom_log("Toshiba/NEC Play Audio: MSF = %06x, type = %02x, cdstatus = %02x\n", pos, type, dev->cd_status);
-
- /* Do this at this point, since it's at this point that we know the
- actual LBA position to start playing from. */
- if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
- cdrom_log("CD-ROM %i: LBA %08X not on an audio track\n", dev->id, pos);
- cdrom_stop(dev);
- return 0;
- }
-
+ cdrom_log("Toshiba Play Audio: Muted?=%d, LBA=%08X.\n", dev->audio_muted_soft, pos);
  dev->cd_buflen = 0;
  dev->cd_status = CD_STATUS_PLAYING;
  return 1;
@@ -770,6 +772,7 @@ cdrom_audio_scan(cdrom_t *dev, uint32_t pos, int type)
  break;
  }
 
+ dev->audio_muted_soft = 0;
  /* Do this at this point, since it's at this point that we know the
  actual LBA position to start playing from. */
  if (!(dev->ops->track_type(dev, pos) & CD_TRACK_AUDIO)) {
@@ -1007,6 +1010,11 @@ cdrom_get_current_subcodeq_playstatus(cdrom_t *dev, uint8_t *b)
  else
  ret = (dev->cd_status == CD_STATUS_PLAYING) ? 0x00 : dev->audio_op;
 
+ /*If a valid audio track is detected with audio on, unmute it.*/
+ if (dev->ops->track_type(dev, dev->seek_pos) & CD_TRACK_AUDIO)
+ dev->audio_muted_soft = 0;
+
+ cdrom_log("SubCodeQ: Play Status: Seek LBA=%08x, CDEND=%08x, mute=%d.\n", dev->seek_pos, dev->cd_end, dev->audio_muted_soft);
  b[0] = subc.attr;
  b[1] = bin2bcd(subc.track);
  b[2] = bin2bcd(subc.index);

src/chipset/contaq_82c59x.c

@@ -311,8 +311,10 @@ contaq_82c59x_close(void *priv)
 {
  contaq_82c59x_t *dev = (contaq_82c59x_t *) priv;
 
- smram_del(dev->smram[1]);
- smram_del(dev->smram[0]);
+ if (dev->green) {
+ smram_del(dev->smram[1]);
+ smram_del(dev->smram[0]);
+ }
 
  free(dev);
 }

src/chipset/intel_4x0.c

@@ -1522,6 +1522,8 @@ i4x0_read(int func, int addr, void *priv)
  with the addition of bits 3 and 0. */
  if ((func == 0) && (addr == 0x93) && ((dev->type == INTEL_440FX) || (dev->type == INTEL_440LX) || (dev->type == INTEL_440EX)))
  ret = (ret & 0xf9) | (pci_read(0x0cf9, NULL) & 0x06);
+ else if ((func == 0) && (addr == 0x52) && (dev->type == INTEL_430TX) && !strcmp(machine_get_internal_name(), "tomahawk"))
+ ret = 0xb2;
  }
 
  return ret;

src/chipset/intel_i450kx.c

@@ -8,19 +8,14 @@
  *
  * Implementation of the Intel 450KX Mars Chipset.
  *
+ * i450GX is way more popular of an option but needs more stuff.
  *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ * Tiseno100,
  *
- * Authors: Tiseno100
- *
+ * Copyright 2021-2024 Miran Grca.
  * Copyright 2021 Tiseno100.
  */
-
-/*
-Note: i450KX PB manages PCI memory access with MC manages DRAM memory access.
-Due to 86Box limitations we can't manage them seperately thus it is dev branch till then.
-
-i450GX is way more popular of an option but needs more stuff.
-*/
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -97,17 +92,18 @@ i450kx_smram_recalc(i450kx_t *dev, int bus)
  const uint8_t *regs = bus ? dev->pb_pci_conf : dev->mc_pci_conf;
  uint32_t addr;
  uint32_t size;
+ int enable = bus ? !(regs[0x57] & 0x08) : (regs[0x57] & 0x08);
 
  smram_disable(dev->smram[bus]);
 
  addr = ((uint32_t) regs[0xb8] << 16) | ((uint32_t) regs[0xb9] << 24);
  size = (((uint32_t) ((regs[0xbb] >> 4) & 0x0f)) << 16) + 0x00010000;
 
- if ((addr != 0x00000000) && !!(regs[0x57] & 0x08)) {
+ if ((addr != 0x00000000) && enable) {
  if (bus)
- smram_enable_ex(dev->smram[bus], addr, addr, size, 0, !!(regs[0x57] & 8), 0, 1);
+ smram_enable_ex(dev->smram[bus], addr, addr, size, 0, 0, 0, enable);
  else
- smram_enable_ex(dev->smram[bus], addr, addr, size, !!(regs[0x57] & 8), 0, 1, 0);
+ smram_enable_ex(dev->smram[bus], addr, addr, size, 0, 0, enable, 0);
  }
 
  flushmmucache();
@@ -118,10 +114,8 @@ i450kx_vid_buf_recalc(i450kx_t *dev, int bus)
 {
  const uint8_t *regs = bus ? dev->pb_pci_conf : dev->mc_pci_conf;
 
-#if 0
- // int state = (regs[0x58] & 0x02) ? (MEM_READ_EXTANY | MEM_WRITE_EXTANY) : (MEM_READ_DISABLED | MEM_WRITE_DISABLED);
-#endif
- int state = (regs[0x58] & 0x02) ? (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
+ int state = (regs[0x58] & 0x02) ? (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) :
+ (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
 
  if (bus)
  mem_set_mem_state_bus_both(0x000a0000, 0x00020000, state);
@@ -136,10 +130,10 @@ pb_write(int func, int addr, uint8_t val, void *priv)
 {
  i450kx_t *dev = (i450kx_t *) priv;
 
- // pclog("i450KX-PB: [W] dev->pb_pci_conf[%02X] = %02X POST: %02X\n", addr, val, inb(0x80));
- i450kx_log("i450KX-PB: [W] dev->pb_pci_conf[%02X] = %02X POST: %02X\n", addr, val, inb(0x80));
+ if (func == 0) {
+ i450kx_log("[%04X:%08X] i450KX-PB: [W] dev->pb_pci_conf[%02X] = %02X\n", CS, cpu_state.pc,
+ addr, val);
 
- if (func == 0)
  switch (addr) {
  case 0x04:
  dev->pb_pci_conf[addr] = (dev->pb_pci_conf[addr] & 0x04) | (val & 0x53);
@@ -373,6 +367,7 @@ pb_write(int func, int addr, uint8_t val, void *priv)
  default:
  break;
  }
+ }
 }
 
 static uint8_t
@@ -381,10 +376,12 @@ pb_read(int func, int addr, void *priv)
  const i450kx_t *dev = (i450kx_t *) priv;
  uint8_t ret = 0xff;
 
- if (func == 0)
+ if (func == 0) {
  ret = dev->pb_pci_conf[addr];
 
- // pclog("i450KX-PB: [R] dev->pb_pci_conf[%02X] = %02X POST: %02X\n", addr, ret, inb(0x80));
+ i450kx_log("[%04X:%08X] i450KX-PB: [R] dev->pb_pci_conf[%02X] = %02X\n", CS, cpu_state.pc,
+ addr, ret);
+ }
 
  return ret;
 }
@@ -407,10 +404,10 @@ mc_write(int func, int addr, uint8_t val, void *priv)
 {
  i450kx_t *dev = (i450kx_t *) priv;
 
- // pclog("i450KX-MC: [W] dev->mc_pci_conf[%02X] = %02X POST: %02X\n", addr, val, inb(0x80));
- i450kx_log("i450KX-MC: [W] dev->mc_pci_conf[%02X] = %02X POST: %02X\n", addr, val, inb(0x80));
+ if (func == 0) {
+ i450kx_log("[%04X:%08X] i450KX-MC: [W] dev->mc_pci_conf[%02X] = %02X\n", CS, cpu_state.pc,
+ addr, val);
 
- if (func == 0)
  switch (addr) {
  case 0x4c:
  dev->mc_pci_conf[addr] = val & 0xdf;
@@ -600,6 +597,7 @@ mc_write(int func, int addr, uint8_t val, void *priv)
  default:
  break;
  }
+ }
 }
 
 static uint8_t
@@ -608,10 +606,12 @@ mc_read(int func, int addr, void *priv)
  const i450kx_t *dev = (i450kx_t *) priv;
  uint8_t ret = 0xff;
 
- if (func == 0)
+ if (func == 0) {
  ret = dev->mc_pci_conf[addr];
 
- // pclog("i450KX-MC: [R] dev->mc_pci_conf[%02X] = %02X POST: %02X\n", addr, ret, inb(0x80));
+ i450kx_log("[%04X:%08X] i450KX-MC: [R] dev->mc_pci_conf[%02X] = %02X\n", CS, cpu_state.pc,
+ addr, ret);
+ }
 
  return ret;
 }
@@ -622,10 +622,6 @@ i450kx_reset(void *priv)
  i450kx_t *dev = (i450kx_t *) priv;
  uint32_t i;
 
-#if 0
- // pclog("i450KX: i450kx_reset()\n");
-#endif
-
  /* Defaults PB */
  dev->pb_pci_conf[0x00] = 0x86;
  dev->pb_pci_conf[0x01] = 0x80;

src/chipset/intel_piix.c

@@ -1578,7 +1578,16 @@ piix_init(const device_t *info)
  dev->acpi = device_add(&acpi_intel_device);
  acpi_set_slot(dev->acpi, dev->pci_slot);
  acpi_set_nvr(dev->acpi, dev->nvr);
- acpi_set_gpireg2_default(dev->acpi, (dev->type > 4) ? 0xf1 : 0xdd);
+ /*
+ TriGem Richmond:
+ - Bit 5: Manufacturing jumper, must be set;
+ - Bit 4: CMOS clear jumper, must be clear;
+ - Bit 0: Password switch, must be clear.
+ */
+ if (!strcmp(machine_get_internal_name(), "richmond"))
+ acpi_set_gpireg2_default(dev->acpi, 0xee);
+ else
+ acpi_set_gpireg2_default(dev->acpi, (dev->type > 4) ? 0xf1 : 0xdd);
  acpi_set_trap_update(dev->acpi, piix_trap_update, dev);
 
  dev->ddma = device_add(&ddma_device);

src/chipset/sis_85c496.c

@@ -123,7 +123,7 @@ sis_85c497_isa_read(uint16_t port, void *priv)
  const sis_85c496_t *dev = (sis_85c496_t *) priv;
  uint8_t ret = 0xff;
 
- if (port == 0x23)
+ if ((port == 0x23) && (dev->cur_reg < 0xc0))
  ret = dev->regs[dev->cur_reg];
  else if (port == 0x33)
  ret = 0x3c /*random_generate()*/;