diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 62da55c9b..1a9b424dc 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -83,38 +83,38 @@ #define MACHINE_FLAGS_NONE 0x00000000 /* sys has no int devices */ #define MACHINE_SOFTFLOAT_ONLY 0x00000001 /* sys requires SoftFloat FPU */ #define MACHINE_VIDEO 0x00000002 /* sys has int video */ -#define MACHINE_VIDEO_ONLY 0x00000004 /* sys has fixed video */ -#define MACHINE_MOUSE 0x00000008 /* sys has int mouse */ -#define MACHINE_FDC 0x00000010 /* sys has int FDC */ -#define MACHINE_LPT_PRI 0x00000020 /* sys has int pri LPT */ -#define MACHINE_LPT_SEC 0x00000040 /* sys has int sec LPT */ -#define MACHINE_LPT_TER 0x00000080 /* sys has int ter LPT */ -#define MACHINE_LPT_QUA 0x00000100 /* sys has int qua LPT */ -#define MACHINE_UART_PRI 0x00000200 /* sys has int pri UART */ -#define MACHINE_UART_SEC 0x00000400 /* sys has int sec UART */ -#define MACHINE_UART_TER 0x00000800 /* sys has int ter UART */ -#define MACHINE_UART_QUA 0x00001000 /* sys has int qua UART */ -#define MACHINE_GAMEPORT 0x00002000 /* sys has int game port */ -#define MACHINE_SOUND 0x00004000 /* sys has int sound */ -#define MACHINE_NIC 0x00008000 /* sys has int NIC */ -#define MACHINE_MODEM 0x00010000 /* sys has int modem */ +#define MACHINE_VIDEO_8514A 0x00000004 /* sys has int video */ +#define MACHINE_VIDEO_XGA 0x00000008 /* sys has int video */ +#define MACHINE_VIDEO_ONLY 0x00000010 /* sys has fixed video */ +#define MACHINE_MOUSE 0x00000020 /* sys has int mouse */ +#define MACHINE_FDC 0x00000040 /* sys has int FDC */ +#define MACHINE_LPT_PRI 0x00000080 /* sys has int pri LPT */ +#define MACHINE_LPT_SEC 0x00000100 /* sys has int sec LPT */ +#define MACHINE_LPT_TER 0x00000200 /* sys has int ter LPT */ +#define MACHINE_LPT_QUA 0x00000400 /* sys has int qua LPT */ +#define MACHINE_UART_PRI 0x00000800 /* sys has int pri UART */ +#define MACHINE_UART_SEC 0x00001000 /* sys has int sec UART */ +#define MACHINE_UART_TER 0x00002000 /* sys has int ter UART */ +#define MACHINE_UART_QUA 0x00004000 /* sys has int qua UART */ +#define MACHINE_GAMEPORT 0x00008000 /* sys has int game port */ +#define MACHINE_SOUND 0x00010000 /* sys has int sound */ +#define MACHINE_NIC 0x00020000 /* sys has int NIC */ +#define MACHINE_MODEM 0x00040000 /* sys has int modem */ /* Feature flags for advanced devices. */ -#define MACHINE_APM 0x00020000 /* sys has APM */ -#define MACHINE_ACPI 0x00040000 /* sys has ACPI */ -#define MACHINE_HWM 0x00080000 /* sys has hw monitor */ -#define MACHINE_COREBOOT 0x00100000 /* sys has coreboot BIOS */ +#define MACHINE_APM 0x00080000 /* sys has APM */ +#define MACHINE_ACPI 0x00100000 /* sys has ACPI */ +#define MACHINE_HWM 0x00200000 /* sys has hw monitor */ +#define MACHINE_COREBOOT 0x00400000 /* sys has coreboot BIOS */ /* Feature flags for internal storage controllers. */ -#define MACHINE_MFM 0x00200000 /* sys has int MFM/RLL */ -#define MACHINE_XTA 0x00400000 /* sys has int XTA */ -#define MACHINE_ESDI 0x00800000 /* sys has int ESDI */ -#define MACHINE_IDE_PRI 0x01000000 /* sys has int pri IDE/ATAPI */ -#define MACHINE_IDE_SEC 0x02000000 /* sys has int sec IDE/ATAPI */ -#define MACHINE_IDE_TER 0x04000000 /* sys has int ter IDE/ATAPI */ -#define MACHINE_IDE_QUA 0x08000000 /* sys has int qua IDE/ATAPI */ -#define MACHINE_SCSI_PRI 0x10000000 /* sys has int pri SCSI */ -#define MACHINE_SCSI_SEC 0x20000000 /* sys has int sec SCSI */ -#define MACHINE_USB_PRI 0x40000000 /* sys has int pri USB */ -#define MACHINE_USB_SEC 0x80000000 /* sys has int sec USB */ +#define MACHINE_MFM 0x00800000 /* sys has int MFM/RLL */ +#define MACHINE_XTA 0x01000000 /* sys has int XTA */ +#define MACHINE_ESDI 0x02000000 /* sys has int ESDI */ +#define MACHINE_IDE_PRI 0x04000000 /* sys has int pri IDE/ATAPI */ +#define MACHINE_IDE_SEC 0x08000000 /* sys has int sec IDE/ATAPI */ +#define MACHINE_IDE_TER 0x10000000 /* sys has int ter IDE/ATAPI */ +#define MACHINE_IDE_QUA 0x20000000 /* sys has int qua IDE/ATAPI */ +#define MACHINE_SCSI 0x40000000 /* sys has int SCSI */ +#define MACHINE_USB 0x80000000 /* sys has int USB */ /* Combined flags. */ #define MACHINE_LPT (MACHINE_LPT-PRI | MACHINE_LPT_SEC | \ MACHINE_LPT_TER | MACHINE_LPT_QUA) @@ -132,13 +132,9 @@ #define MACHINE_IDE_DUAL (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */ #define MACHINE_IDE_DUALTQ (MACHINE_IDE_TER | MACHINE_IDE_QUA) #define MACHINE_IDE_QUAD (MACHINE_IDE_DUAL | MACHINE_IDE_DUALTQ) /* sys has int quad IDE/ATAPI - mark as dual + both ter and and qua IDE/ATAPI */ -#define MACHINE_SCSI (MACHINE_SCSI_PRI) /* sys has int single SCSI - mark as pri SCSI */ -#define MACHINE_SCSI_DUAL (MACHINE_SCSI_PRI | MACHINE_SCSI_SEC) /* sys has int dual SCSI - mark as both pri and sec SCSI */ -#define MACHINE_USB (MACHINE_USB_PRI) -#define MACHINE_USB_DUAL (MACHINE_USB_PRI | MACHINE_USB_SEC) #define MACHINE_HDC (MACHINE_MFM | MACHINE_XTA | \ MACHINE_ESDI | MACHINE_IDE_QUAD | \ - MACHINE_SCSI_DUAL | MACHINE_USB_DUAL) + MACHINE_SCSI | MACHINE_USB) /* Special combined flags. */ #define MACHINE_PIIX (MACHINE_IDE_DUAL) #define MACHINE_PIIX3 (MACHINE_PIIX | MACHINE_USB) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 8a242d984..7a0b3efdb 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -7752,7 +7752,7 @@ const machine_t machines[] = { .max_multi = MACHINE_MULTIPLIER_FIXED }, .bus_flags = MACHINE_PS2_PCI, - .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM | MACHINE_ACPI, + .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_VIDEO_8514A | MACHINE_APM | MACHINE_ACPI, .ram = { .min = 2048, .max = 131072, diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp index e667ae4eb..bb3002df2 100644 --- a/src/qt/qt_machinestatus.cpp +++ b/src/qt/qt_machinestatus.cpp @@ -278,7 +278,7 @@ MachineStatus::hasIDE() bool MachineStatus::hasSCSI() { - return machine_has_flags(machine, MACHINE_SCSI_DUAL) > 0; + return machine_has_flags(machine, MACHINE_SCSI) > 0; } void