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

Merge pull request #1525 from 86Box/master

Browse Source 
GW286 GEAR fixes.
This commit is contained in:
Miran Grča
2021-07-04 16:57:14 +02:00
committed by GitHub
parent f579ddafe3 6604a29d7e
commit 5102d211cf
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/machine/m_at_286_386sx.c
View File

@@ -274,9 +274,6 @@ machine_at_scat_init(const machine_t *model, int is_v4)
machine_at_common_init(model);
device_add(&keyboard_at_ami_device);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
if (is_v4)
device_add(&scat_4_device);
else
@@ -311,6 +308,9 @@ machine_at_award286_init(const machine_t *model)
machine_at_scat_init(model, 0);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}
@@ -327,6 +327,9 @@ machine_at_gdc212m_init(const machine_t *model)
machine_at_scat_init(model, 0);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
device_add(&ide_isa_device);
return ret;
@@ -347,6 +350,8 @@ machine_at_gw286ct_init(const machine_t *model)
machine_at_scat_init(model, 1);
device_add(&ide_isa_device);
return ret;
}
@@ -364,6 +369,9 @@ machine_at_super286tr_init(const machine_t *model)
machine_at_scat_init(model, 0);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}
@@ -381,6 +389,9 @@ machine_at_spc4200p_init(const machine_t *model)
machine_at_scat_init(model, 0);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}
@@ -399,6 +410,9 @@ machine_at_spc4216p_init(const machine_t *model)
machine_at_scat_init(model, 1);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}
@@ -424,6 +438,9 @@ machine_at_spc4620p_init(const machine_t *model)
machine_at_scat_init(model, 1);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
if (gfxcard == VID_INTERNAL)
device_add(&ati28800k_spc4620p_device);
@@ -461,6 +478,9 @@ machine_at_deskmaster286_init(const machine_t *model)
machine_at_scat_init(model, 0);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}

2
src/machine/machine_table.c
View File

@@ -207,7 +207,7 @@ const machine_t machines[] = {
/* Has IBM AT KBC firmware. */
{ "[NEAT] Phoenix 286 clone", "px286", MACHINE_TYPE_286, CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT, 512, 16384, 128, 127, machine_at_px286_init, NULL },
/* Has Chips & Technologies KBC firmware. */
{ "[SCAT] GW-286CT GEAR", "gw286ct", MACHINE_TYPE_286, CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT, 512, 16384, 128, 127, machine_at_gw286ct_init, NULL },
{ "[SCAT] GW-286CT GEAR", "gw286ct", MACHINE_TYPE_286, CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_IDE, 512, 16384, 128, 127, machine_at_gw286ct_init, NULL },
/* Has IBM PS/2 Type 1 KBC firmware. */
{ "[SCAT] Goldstar GDC-212M", "gdc212m", MACHINE_TYPE_286, CPU_PKG_286, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_IDE | MACHINE_BUS_PS2, 512, 4096, 512, 127, machine_at_gdc212m_init, NULL },
/* Has a VIA VT82C42N KBC. */