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

Replaced the Unknown Micronics Board with Goldstar 386.

Browse Source
This commit is contained in:
tiseno100
2019-12-19 16:35:39 +02:00
committed by GitHub
parent 384405ab28
commit 2f76c899f1
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/m_at_286_386sx.c
View File

@@ -201,14 +201,14 @@ machine_at_neat_ami_init(const machine_t *model)
return ret;
}
#if defined(DEV_BRANCH) && defined(USE_MICRONICS386)
#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
int
machine_at_micronics386_init(const machine_t *model)
{
int ret;
ret = bios_load_interleaved(L"roms/machines/micronics386/386-Micronics 09-00021-LO.BIN",
L"roms/machines/micronics386/386-Micronics 09-00021-HI.BIN",
ret = bios_load_interleaved(L"roms/machines/goldstar386/386-Goldstar-E.BIN",
L"roms/machines/goldstar386/386-Goldstar-O.BIN",
0x000f0000, 131072, 0);
if (bios_only || !ret)

4
src/machine/machine.h
View File

@@ -184,8 +184,8 @@ extern int machine_at_g212hs_init(const machine_t *);
extern int machine_at_neat_init(const machine_t *);
extern int machine_at_neat_ami_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_MICRONICS386)
extern int machine_at_micronics386_init(const machine_t *); //Neat based Phoenix 80386 board. It has memory related issues.
#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
extern int machine_at_goldstar386_init(const machine_t *); //Neat based Phoenix 80386 board. It has memory related issues.
#endif
extern int machine_at_award286_init(const machine_t *);

4
src/machine/machine_table.c
View File

@@ -127,8 +127,8 @@ const machine_t machines[] = {
{ "[386SX MCA] IBM PS/2 model 55SX", "ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 8, 1, 63, machine_ps2_model_55sx_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_MICRONICS386)
{ "[386SX ISA] Unknown Micronics 386 Board", "micronics386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_micronics386_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
{ "[386SX ISA] Goldstar 386", "goldstar386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_goldstar386_init, NULL },
#endif
{ "[386DX ISA] AMI 386DX clone", "ami386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 32, 1, 127, machine_at_opti495_ami_init, NULL },

4
src/machine/machine_table_new.c
View File

@@ -112,8 +112,8 @@ const machine_t machines[] = {
{ "[386SX ISA] IBM PS/1 m.2121+ISA", "ibmps1_2121_isa", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 6, 1, 63, machine_ps1_m2121_init, NULL },
{ "[386SX ISA] KMX-C-02", "kmxc02", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 512, 127, machine_at_kmxc02_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_MICRONICS386)
{ "[386SX ISA] Unknown Micronics 386 Board", "micronics386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_micronics386_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_GOLDSTAR386)
{ "[386SX ISA] Goldstar 386", "goldstar386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_goldstar386_init, NULL },
#endif
{ "[386SX MCA] IBM PS/2 model 55SX", "ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 8, 1, 63, machine_ps2_model_55sx_init, NULL },

12
src/win/Makefile.mingw
View File

@@ -83,8 +83,8 @@ ifeq ($(DEV_BUILD), y)
ifndef VECTRA54
VECTRA54 := y
endif
ifndef MICRONICS386
MICRONICS386 := y
ifndef GOLDSTAR386
GOLDSTAR386 := y
endif
ifndef VGAWONDER
VGAWONDER := y
@@ -147,8 +147,8 @@ else
ifndef VECTRA54
VECTRA54 := n
endif
ifndef MICRONICS386
MICRONICS386 := n
ifndef GOLDSTAR386
GOLDSTAR386 := n
endif
ifndef VGAWONDER
VGAWONDER := n
@@ -506,8 +506,8 @@ ifeq ($(VECTRA54), y)
OPTS += -DUSE_VECTRA54
endif
ifeq ($(MICRONICS386), y)
OPTS += -DUSE_MICRONICS386
ifeq ($(GOLDSTAR386), y)
OPTS += -DUSE_GOLDSTAR386
endif
ifeq ($(VGAWONDER), y)

12
src/win/Makefile_ndr.mingw
View File

@@ -83,8 +83,8 @@ ifeq ($(DEV_BUILD), y)
ifndef VECTRA54
VECTRA54 := y
endif
ifndef MICRONICS386
MICRONICS386 := y
ifndef GOLDSTAR386
GOLDSTAR386 := y
endif
ifndef VGAWONDER
VGAWONDER := y
@@ -147,8 +147,8 @@ else
ifndef VECTRA54
VECTRA54 := n
endif
ifndef MICRONICS386
MICRONICS386 := n
ifndef GOLDSTAR386
GOLDSTAR386 := n
endif
ifndef VGAWONDER
VGAWONDER := n
@@ -512,8 +512,8 @@ ifeq ($(VECTRA54), y)
OPTS += -DUSE_VECTRA54
endif
ifeq ($(MICRONICS386), y)
OPTS += -DUSE_MICRONICS386
ifeq ($(GOLDSTAR386), y)
OPTS += -DUSE_GOLDSTAR386
endif
ifeq ($(VGAWONDER), y)