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

Fixes to the two recently NSC Super I/O chips and the two boards that use the PC87309 (Tyan Tsunami ATX and the Freeway).

Browse Source
This commit is contained in:
OBattler
2025-05-22 06:20:04 +02:00
parent f6dd42ca87
commit c8fbee1b62
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/machine/m_at_slot1.c
View File

@@ -585,7 +585,6 @@ machine_at_s1846_init(const machine_t *model)
device_add(&i440bx_device); device_add(&i440bx_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add_params(&pc87309_device, (void *) (PCX730X_AMI | PC87309_PC87309)); device_add_params(&pc87309_device, (void *) (PCX730X_AMI | PC87309_PC87309));
device_add(&keyboard_ps2_ami_pci_device);
device_add(&intel_flash_bxt_device); device_add(&intel_flash_bxt_device);
spd_register(SPD_TYPE_SDRAM, 0x7, 256); spd_register(SPD_TYPE_SDRAM, 0x7, 256);

1
src/machine/m_at_slot2.c
View File

@@ -140,7 +140,6 @@ machine_at_fw6400gx_init(const machine_t *model)
device_add(&i440gx_device); device_add(&i440gx_device);
device_add(&piix4e_device); device_add(&piix4e_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add_params(&pc87309_device, (void *) (PCX730X_15C | PCX730X_AMI | PC87309_PC87309)); device_add_params(&pc87309_device, (void *) (PCX730X_15C | PCX730X_AMI | PC87309_PC87309));
device_add(ics9xxx_get(ICS9250_08)); device_add(ics9xxx_get(ICS9250_08));
device_add(&sst_flash_29ee020_device); device_add(&sst_flash_29ee020_device);

4
src/sio/sio_pc87307.c
View File

@@ -12,11 +12,13 @@
* *
* Copyright 2020-2025 Miran Grca. * Copyright 2020-2025 Miran Grca.
*/ */
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/io.h> #include <86box/io.h>
#include <86box/timer.h> #include <86box/timer.h>
@@ -400,7 +402,7 @@ pc87307_write(uint16_t port, uint8_t val, void *priv)
break; break;
case 0x21: case 0x21:
dev->regs[dev->cur_reg] = val; dev->regs[dev->cur_reg] = val;
fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !!(val & 0x04)); fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !(val & 0x04));
break; break;
case 0x22: case 0x22:
dev->regs[dev->cur_reg] = val; dev->regs[dev->cur_reg] = val;

6
src/sio/sio_pc87309.c
View File

@@ -12,11 +12,13 @@
* *
* Copyright 2020-2025 Miran Grca. * Copyright 2020-2025 Miran Grca.
*/ */
#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/io.h> #include <86box/io.h>
#include <86box/timer.h> #include <86box/timer.h>
@@ -249,7 +251,7 @@ superio_handler(pc87309_t *dev)
pc87309_read, NULL, NULL, pc87309_read, NULL, NULL,
pc87309_write, NULL, NULL, dev); pc87309_write, NULL, NULL, dev);
switch (dev->regs[0x22] & 0x0b) { switch (dev->regs[0x21] & 0x0b) {
default: default:
dev->superio_base = 0x0000; dev->superio_base = 0x0000;
break; break;
@@ -300,7 +302,7 @@ pc87309_write(uint16_t port, uint8_t val, void *priv)
break; break;
case 0x21: case 0x21:
dev->regs[dev->cur_reg] = val; dev->regs[dev->cur_reg] = val;
fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !!(val & 0x04)); fdc_toggle_flag(dev->fdc, FDC_FLAG_PS2_MCA, !(val & 0x04));
superio_handler(dev); superio_handler(dev);
break; break;
case 0x22: case 0x22: