Merge pull request #5557 from borisvolk117/master

No AGP slot on Delhi III and internal device note for 2 machines
This commit is contained in:
Miran Grča
2025-05-06 18:44:31 +02:00
committed by GitHub

View File

@@ -14035,7 +14035,7 @@ const machine_t machines[] = {
.min_multi = 1.5, .min_multi = 1.5,
.max_multi = 5.5 .max_multi = 5.5
}, },
.bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB, .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Has internal video: ATI 3D Rage IIc AGP (Rage 2) */
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_SOUND | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_SOUND | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
@@ -14860,7 +14860,7 @@ const machine_t machines[] = {
.min_multi = 1.5, .min_multi = 1.5,
.max_multi = 8.0 .max_multi = 8.0
}, },
.bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB, /* Has internal video: SGS Thompson Riva 128 AGP, network: NEC PK-UG-X006 (Intel 82558B chip) and sound: OAK Audia 3D (OTI-610) */
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,