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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2020-07-14 22:25:11 -03:00
parent a1e273b13b 39726915d3
commit 9eb4577101
42 changed files with 659 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/machine/m_at_286_386sx.c
View File

@@ -65,9 +65,9 @@ machine_at_headland_common_init(int ht386)
device_add(&fdc_at_device);
if (ht386)
device_add(&headland_386_device);
device_add(&headland_ht18b_device);
else
device_add(&headland_device);
device_add(&headland_gc10x_device);
}
@@ -139,6 +139,7 @@ machine_at_ama932j_init(const machine_t *model)
return ret;
}
int
machine_at_quadt286_init(const machine_t *model)
{
@@ -154,11 +155,12 @@ machine_at_quadt286_init(const machine_t *model)
machine_at_common_ide_init(model);
device_add(&keyboard_at_device);
device_add(&fdc_at_device);
device_add(&headland_device);
device_add(&headland_gc10x_device);
return ret;
}
int
machine_at_neat_init(const machine_t *model)
{
@@ -200,6 +202,7 @@ machine_at_neat_ami_init(const machine_t *model)
return ret;
}
int
machine_at_px286_init(const machine_t *model)
{
@@ -214,7 +217,7 @@ machine_at_px286_init(const machine_t *model)
machine_at_common_init(model);
device_add(&keyboard_at_device);
device_add(&fdc_at_device);
device_add(&neat_device);
device_add(&neat_device);
return ret;
}
@@ -260,6 +263,7 @@ machine_at_micronics386_init(const machine_t *model)
return ret;
}
static void
machine_at_scat_init(const machine_t *model, int is_v4)
{
@@ -404,6 +408,7 @@ machine_at_kmxc02_init(const machine_t *model)
return ret;
}
int
machine_at_deskmaster286_init(const machine_t *model)
{
@@ -420,6 +425,7 @@ machine_at_deskmaster286_init(const machine_t *model)
return ret;
}
int
machine_at_shuttle386sx_init(const machine_t *model)
{
@@ -441,6 +447,7 @@ machine_at_shuttle386sx_init(const machine_t *model)
return ret;
}
int
machine_at_adi386sx_init(const machine_t *model)
{
@@ -462,6 +469,7 @@ machine_at_adi386sx_init(const machine_t *model)
return ret;
}
int
machine_at_wd76c10_init(const machine_t *model)
{
@@ -486,12 +494,14 @@ machine_at_wd76c10_init(const machine_t *model)
return ret;
}
const device_t *
at_commodore_sl386sx_get_device(void)
{
return &gd5402_onboard_device;
}
int
machine_at_commodore_sl386sx_init(const machine_t *model)
{
@@ -515,6 +525,8 @@ machine_at_commodore_sl386sx_init(const machine_t *model)
return ret;
}
int
machine_at_awardsx_init(const machine_t *model)
{

2
src/machine/machine_table.c
View File

@@ -164,7 +164,7 @@ const machine_t machines[] = {
/* 386SX machines */
{ "[ISA] IBM PS/1 model 2121", "ibmps1_2121", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO | MACHINE_VIDEO_FIXED, 2, 6, 1, 63, machine_ps1_m2121_init, NULL },
{ "[ISA] IBM PS/1 m.2121+ISA", "ibmps1_2121_isa", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 2, 6, 1, 63, machine_ps1_m2121_init, NULL },
{ "[HT18] AMA-932J", "ama932j", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 512, 8192, 128, 127, machine_at_ama932j_init, at_ama932j_get_device },
{ "[GC103] AMA-932J", "ama932j", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 512, 8192, 128, 127, machine_at_ama932j_init, at_ama932j_get_device },
#if defined(DEV_BRANCH) && defined(USE_AMI386SX)
{ "[HT18] AMI Unknown 386SX", "ami386", MACHINE_TYPE_386SX, {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 127, machine_at_headland_init, NULL },
#endif