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

Replaced the S2DGE with the GA-6DXU

Browse Source 
More stable and has everything we emulate other than it's On-Board SCSI. Works as intended.
This commit is contained in:
tiseno100
2020-06-09 00:38:00 +03:00
committed by GitHub
parent 6bbceab8a4
commit d02af0a43c
3 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/machine.h
View File

@@ -356,9 +356,7 @@ extern const device_t *at_tsunamiatx_get_device(void);
#endif #endif
/* m_at_slot2.c */ /* m_at_slot2.c */
#if defined(DEV_BRANCH) && defined(NO_SIO) extern int machine_at_6gxu_init(const machine_t *);
extern int machine_at_s2dge_init(const machine_t *);
#endif
/* m_at_socket370.c */ /* m_at_socket370.c */
extern int machine_at_s370slm_init(const machine_t *); extern int machine_at_s370slm_init(const machine_t *);

49
src/machine/m_at_slot2.c
View File

@@ -31,6 +31,7 @@
#include <86box/hdc_ide.h> #include <86box/hdc_ide.h>
#include <86box/keyboard.h> #include <86box/keyboard.h>
#include <86box/intel_flash.h> #include <86box/intel_flash.h>
#include <86box/sst_flash.h>
#include <86box/intel_sio.h> #include <86box/intel_sio.h>
#include <86box/piix.h> #include <86box/piix.h>
#include <86box/sio.h> #include <86box/sio.h>
@@ -41,20 +42,12 @@
#include "cpu.h" #include "cpu.h"
#include <86box/machine.h> #include <86box/machine.h>
#if defined(DEV_BRANCH) && defined(NO_SIO)
int int
machine_at_s2dge_init(const machine_t *model) machine_at_6gxu_init(const machine_t *model)
{ {
/*
440GX AMI Slot 2 motherboard
This board under a i686 CPU freezes on POST code D0.
Works fine under a VIA C3.
*/
int ret; int ret;
ret = bios_load_linear(L"roms/machines/s2dge/2gu7301.rom", ret = bios_load_linear(L"roms/machines/6gxu/6gxu.f1c",
0x000c0000, 262144, 0); 0x000c0000, 262144, 0);
if (bios_only || !ret) if (bios_only || !ret)
@@ -65,33 +58,32 @@ machine_at_s2dge_init(const machine_t *model)
pci_init(PCI_CONFIG_TYPE_1); pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4); pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1); pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2); pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x14, PCI_CARD_NORMAL, 4, 1, 2, 3); pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 2, 3, 4); /* On-Board SCSI. Not emulated at the moment */
pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4); pci_register_slot(0x01, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
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(&keyboard_ps2_pci_device);
device_add(&w83977tf_device); device_add(&w83977ef_device);
device_add(&intel_flash_bxt_device); device_add(&sst_flash_39sf020_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 256); spd_register(SPD_TYPE_SDRAM, 0xF, 512);
hwm_values_t machine_hwm = { hwm_values_t machine_hwm = {
{ /* fan speeds */ { /* fan speeds */
3000, /* CPU1 */ 3000, /* Chassis */
0, /* CPU2 */ 3000, /* CPU */
3000 /* Thermal Control */ 3000 /* Power */
}, { /* temperatures */ }, { /* temperatures */
30, /* MB */
0, /* unused */ 0, /* unused */
30, /* CPU1 */ 27 /* CPU */
20 /* unused (CPU2?) */
}, { /* voltages */ }, { /* voltages */
2050, /* CPU1 (2.05V by default) */ 2050, /* VCORE (2.05V by default) */
0, /* CPU2 */ 0, /* unused */
3300, /* +3.3V */ 3300, /* +3.3V */
RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */ RESISTOR_DIVIDER(5000, 11, 16), /* +5V (divider values bruteforced) */
RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */ RESISTOR_DIVIDER(12000, 28, 10), /* +12V (28K/10K divider suggested in the W83781D datasheet) */
@@ -106,4 +98,3 @@ machine_at_s2dge_init(const machine_t *model)
return ret; return ret;
} }
#endif

7
src/machine/machine_table.c
View File

@@ -161,7 +161,7 @@ const machine_t machines[] = {
{ "[386DX ISA] Compaq Portable III (386)", "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_portableiii386_init, at_cpqiii_get_device }, { "[386DX ISA] Compaq Portable III (386)", "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_portableiii386_init, at_cpqiii_get_device },
{ "[386DX ISA] AMI 386DX clone", "acc386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 16384, 128, 127, machine_at_acc386_init, NULL }, { "[386DX ISA] AMI 386DX clone", "acc386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 16384, 128, 127, machine_at_acc386_init, NULL },
{ "[386DX ISA] ASUS 386DX ISA", "asus386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 16384, 128, 127, machine_at_asus386_init, NULL }, { "[386DX ISA] ASUS 386DX ISA", "asus386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 16384, 128, 127, machine_at_asus386_init, NULL },
{ "[386DX ISA] ECS 386/32", "ecs386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 1, 32, 1, 127, machine_at_ecs386_init, NULL }, { "[386DX ISA] ECS 386/32", "ecs386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 1, 16, 1, 127, machine_at_ecs386_init, NULL },
{ "[386DX ISA] Micronics 386 clone", "micronics386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_micronics386_init, NULL }, { "[386DX ISA] Micronics 386 clone", "micronics386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_micronics386_init, NULL },
/* 386DX machines which utilize the VLB bus */ /* 386DX machines which utilize the VLB bus */
@@ -312,9 +312,8 @@ const machine_t machines[] = {
/* Slot 2 machines */ /* Slot 2 machines */
/* 440GX */ /* 440GX */
#if defined(DEV_BRANCH) && defined(NO_SIO) /* Till the Heap limit issue is resolved. This board will use 1GB max instead of 2GB */
{ "[Slot 2 GX] Supermicro S2DGE", "s2dge", {{"Intel", cpus_Xeon}, {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 255, machine_at_s2dge_init, NULL }, { "[Slot 2 GX] Gigabyte GA-6GXU", "6gxu", {{"Intel", cpus_Xeon}, {"", NULL},{"", NULL},{"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 16, 1024, 16, 511, machine_at_6gxu_init, NULL },
#endif
/* PGA370 machines */ /* PGA370 machines */
/* 440LX */ /* 440LX */