80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
F10
2020-10-16 08:58:02 +03:00
committed by GitHub
parent 246ec0c168 8d1092688a
commit bda8b9848b
4 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/machine/m_at_socket7_s7.c → src/machine/m_at_socket7.c
View File

@@ -860,13 +860,8 @@ machine_at_tx97_init(const machine_t *model)
{
int ret;
#if 0
ret = bios_load_linear(L"roms/machines/tx97/0112.001",
0x000e0000, 131072, 0);
#else
ret = bios_load_linear(L"roms/machines/tx97/0112.001",
0x000c0000, 262144, 0);
#endif
if (bios_only || !ret)
return ret;
@@ -875,7 +870,6 @@ machine_at_tx97_init(const machine_t *model)
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
#if 0
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
@@ -883,22 +877,11 @@ machine_at_tx97_init(const machine_t *model)
pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
#else
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x09, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 0, 0, 0);
pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); /* PIIX4 */
#endif
device_add(&i430tx_device);
// device_add(&piix4_device);
device_add(&piix4e_device);
device_add(&piix4_device);
device_add(&keyboard_ps2_ami_pci_device);
// device_add(&w83877tf_acorp_device);
device_add(&pc87307_15c_device);
// device_add(&intel_flash_bxt_device);
device_add(&sst_flash_29ee020_device);
device_add(&w83877tf_acorp_device);
device_add(&intel_flash_bxt_device);
spd_register(SPD_TYPE_SDRAM, 0x3, 128);
hwm_values_t machine_hwm = {

6
src/sio/sio_detect.c
View File

@@ -74,7 +74,7 @@ sio_detect_init(const device_t *info)
device_add(&fdc_at_smc_device);
io_sethandler(0x0024, 0x0004,
io_sethandler(0x0022, 0x0006,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x002e, 0x0002,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
@@ -86,10 +86,14 @@ sio_detect_init(const device_t *info)
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x0250, 0x0003,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x026e, 0x0002,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x0279, 0x0001,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x0370, 0x0002,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x0398, 0x0002,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x03e3, 0x0001,
sio_detect_read, NULL, NULL, sio_detect_write, NULL, NULL, dev);
io_sethandler(0x03f0, 0x0002,

1
src/video/vid_s3.c
View File

@@ -2581,7 +2581,6 @@ static uint8_t
s3_accel_in(uint16_t port, void *p)
{
s3_t *s3 = (s3_t *)p;
svga_t *svga = &s3->svga;
int temp;
if (!s3->enable_8514)

27
src/win/Makefile.mingw
View File

@@ -45,6 +45,9 @@ ifeq ($(DEV_BUILD), y)
ifndef CYRIX_6X86
CYRIX_6X86 := y
endif
ifndef GUSMAX
GUSMAX := y
endif
ifndef HEDAKA
HEDAKA := y
endif
@@ -54,6 +57,9 @@ ifeq ($(DEV_BUILD), y)
ifndef MGA
MGA := y
endif
ifndef NO_SIO
NO_SIO := y
endif
ifndef OPEN_AT
OPEN_AT := y
endif
@@ -81,6 +87,9 @@ ifeq ($(DEV_BUILD), y)
ifndef SIEMENS
SIEMENS := y
endif
ifndef SIO_DETECT
SIO_DETECT := y
endif
ifndef STPC
STPC := y
endif
@@ -126,7 +135,10 @@ else
endif
ifndef CYRIX_6X86
CYRIX_6X86 := n
endif
endif
ifndef GUSMAX
GUSMAX := n
endif
ifndef HEDAKA
HEDAKA := n
endif
@@ -136,6 +148,9 @@ else
ifndef MGA
MGA := n
endif
ifndef NO_SIO
NO_SIO := n
endif
ifndef OPEN_AT
OPEN_AT := n
endif
@@ -163,6 +178,9 @@ else
ifndef SIEMENS
SIEMENS := n
endif
ifndef SIO_DETECT
SIO_DETECT := n
endif
ifndef STPC
STPC := y
endif
@@ -568,6 +586,11 @@ ifeq ($(SIEMENS), y)
OPTS += -DUSE_SIEMENS
endif
ifeq ($(SIO_DETECT), y)
OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o
endif
ifeq ($(STPC), y)
OPTS += -DUSE_STPC
DEVBROBJ += stpc.o
@@ -656,7 +679,7 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
m_at_socket4_5.o m_at_socket7.o m_at_sockets7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \
m_at_misc.o