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

Machine flag cleanups round 1: 286

Browse Source
This commit is contained in:
cartifanwlr
2024-01-29 16:48:42 +03:00
parent 9fcc59e2ca
commit 6c4ca44d56
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/m_at_286_386sx.c
View File

@@ -304,6 +304,8 @@ machine_at_award286_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL) if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&ide_isa_device);
return ret; return ret;
} }
@@ -406,6 +408,8 @@ machine_at_spc4200p_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL) if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&ide_isa_device);
return ret; return ret;
} }
@@ -449,6 +453,8 @@ machine_at_spc4620p_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL) if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&ide_isa_device);
return ret; return ret;
} }
@@ -483,6 +489,8 @@ machine_at_deskmaster286_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL) if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device); device_add(&fdc_at_device);
device_add(&ide_isa_device);
return ret; return ret;
} }

5
src/machine/m_at_compaq.c
View File

@@ -795,11 +795,6 @@ machine_at_compaq_init(const machine_t *model, int type)
break; break;
case COMPAQ_PORTABLEIII: case COMPAQ_PORTABLEIII:
if (gfxcard[0] == VID_INTERNAL)
device_add(&compaq_plasma_device);
machine_at_init(model);
break;
case COMPAQ_PORTABLEIII386: case COMPAQ_PORTABLEIII386:
if (hdc_current == 1) if (hdc_current == 1)
device_add(&ide_isa_device); device_add(&ide_isa_device);

16
src/machine/machine_table.c
View File

@@ -2737,7 +2737,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_AT, .bus_flags = MACHINE_AT,
.flags = MACHINE_FLAGS_NONE, .flags = MACHINE_FLAGS_NONE, /* Has internal video: Paradise PVGA1A */
.ram = { .ram = {
.min = 640, .min = 640,
.max = 16384, .max = 16384,
@@ -2817,7 +2817,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_AT, .bus_flags = MACHINE_AT,
.flags = MACHINE_VIDEO, .flags = MACHINE_IDE | MACHINE_VIDEO,
.ram = { .ram = {
.min = 640, .min = 640,
.max = 16384, .max = 16384,
@@ -3341,7 +3341,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_AT, .bus_flags = MACHINE_AT,
.flags = MACHINE_VIDEO, .flags = MACHINE_IDE | MACHINE_VIDEO,
.ram = { .ram = {
.min = 512, .min = 512,
.max = 16384, .max = 16384,
@@ -3501,7 +3501,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_AT, .bus_flags = MACHINE_AT,
.flags = MACHINE_FLAGS_NONE, .flags = MACHINE_IDE,
.ram = { .ram = {
.min = 512, .min = 512,
.max = 16384, .max = 16384,
@@ -3581,7 +3581,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_PS2, .bus_flags = MACHINE_PS2,
.flags = MACHINE_FLAGS_NONE, .flags = MACHINE_IDE, /* Has internal video: C&T VGA 411 */
.ram = { .ram = {
.min = 512, .min = 512,
.max = 2048, .max = 2048,
@@ -3661,7 +3661,7 @@ const machine_t machines[] = {
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_PS2, .bus_flags = MACHINE_PS2,
.flags = MACHINE_VIDEO, .flags = MACHINE_IDE | MACHINE_VIDEO,
.ram = { .ram = {
.min = 1024, .min = 1024,
.max = 5120, .max = 5120,
@@ -3700,8 +3700,8 @@ const machine_t machines[] = {
.min_multi = 0, .min_multi = 0,
.max_multi = 0 .max_multi = 0
}, },
.bus_flags = MACHINE_AT, .bus_flags = MACHINE_PS2,
.flags = MACHINE_FLAGS_NONE, .flags = MACHINE_IDE, /* Has internal video: C&T VGA 411 */
.ram = { .ram = {
.min = 512, .min = 512,
.max = 16384, .max = 16384,