From 20579a2286ae23766972addef33e535d7a2f1cf9 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 15 Oct 2023 19:47:29 +0200 Subject: [PATCH] Some future-proofing flags. --- src/include/86box/device.h | 53 ++++++++++++++++++++----------------- src/include/86box/machine.h | 17 ++++++------ 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/include/86box/device.h b/src/include/86box/device.h index 57cf7c849..a297abd1b 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -41,20 +41,23 @@ #ifndef EMU_DEVICE_H #define EMU_DEVICE_H -#define CONFIG_END -1 -#define CONFIG_STRING 0 -#define CONFIG_INT 1 -#define CONFIG_BINARY 2 -#define CONFIG_SELECTION 3 -#define CONFIG_MIDI_OUT 4 -#define CONFIG_FNAME 5 -#define CONFIG_SPINNER 6 -#define CONFIG_HEX16 7 -#define CONFIG_HEX20 8 -#define CONFIG_MAC 9 -#define CONFIG_MIDI_IN 10 -#define CONFIG_BIOS 11 -#define CONFIG_SERPORT 12 +#define CONFIG_END -1 +#define CONFIG_STRING 0 +#define CONFIG_INT 1 +#define CONFIG_BINARY 2 +#define CONFIG_SELECTION 3 +#define CONFIG_MIDI_OUT 4 +#define CONFIG_FNAME 5 +#define CONFIG_SPINNER 6 +#define CONFIG_HEX16 7 +#define CONFIG_HEX20 8 +#define CONFIG_MAC 9 +#define CONFIG_MIDI_IN 10 +#define CONFIG_BIOS 11 +#define CONFIG_SERPORT 12 + +#define CONFIG_ONBOARD 256 /* only avaialble on the on-board variant */ +#define CONFIG_STANDALONE 257 /* not available on the on-board variant */ enum { DEVICE_PCJR = 2, /* requires an IBM PCjr */ @@ -68,17 +71,19 @@ enum { DEVICE_MCA = 0x200, /* requires the MCA bus */ DEVICE_HIL = 0x400, /* requires the HP HIL bus */ DEVICE_EISA = 0x800, /* requires the EISA bus */ - DEVICE_OLB = 0x1000, /* requires the OPTi local bus */ - DEVICE_VLB = 0x2000, /* requires the VLB bus */ - DEVICE_PCI = 0x4000, /* requires the PCI bus */ - DEVICE_CARDBUS = 0x8000, /* requires the CardBus bus */ - DEVICE_USB = 0x10000, /* requires the USB bus */ - DEVICE_AGP = 0x20000, /* requires the AGP bus */ - DEVICE_AC97 = 0x40000, /* requires the AC'97 bus */ - DEVICE_COM = 0x80000, /* requires a serial port */ - DEVICE_LPT = 0x100000, /* requires a parallel port */ - DEVICE_KBC = 0x200000, /* is a keyboard controller */ + DEVICE_AT32 = 0x1000, /* requires the Mylex AT/32 local bus */ + DEVICE_OLB = 0x2000, /* requires the OPTi local bus */ + DEVICE_VLB = 0x4000, /* requires the VLB bus */ + DEVICE_PCI = 0x8000, /* requires the PCI bus */ + DEVICE_CARDBUS = 0x10000, /* requires the CardBus bus */ + DEVICE_USB = 0x20000, /* requires the USB bus */ + DEVICE_AGP = 0x40000, /* requires the AGP bus */ + DEVICE_AC97 = 0x80000, /* requires the AC'97 bus */ + DEVICE_COM = 0x100000, /* requires a serial port */ + DEVICE_LPT = 0x200000, /* requires a parallel port */ + DEVICE_KBC = 0x400000, /* is a keyboard controller */ + DEVICE_ONBOARD = 0x20000000, /* is on-board */ DEVICE_EXTPARAMS = 0x40000000, /* accepts extended parameters */ DEVICE_ALL = 0xffffffff /* match all devices */ diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 8af7f65ea..cf46715ff 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -39,14 +39,15 @@ #define MACHINE_BUS_PS2 (MACHINE_BUS_PS2_LATCH | MACHINE_BUS_PS2_PORTS) #define MACHINE_BUS_HIL 0x00000400 /* system has HP HIL keyboard and mouse ports */ #define MACHINE_BUS_EISA 0x00000800 /* sys has EISA bus */ -#define MACHINE_BUS_OLB 0x00001000 /* sys has OPTi local bus */ -#define MACHINE_BUS_VLB 0x00002000 /* sys has VL bus */ -#define MACHINE_BUS_MCA 0x00004000 /* sys has MCA bus */ -#define MACHINE_BUS_PCI 0x00008000 /* sys has PCI bus */ -#define MACHINE_BUS_CARDBUS 0x00010000 /* sys has CardBus bus */ -#define MACHINE_BUS_USB 0x00020000 /* sys has USB bus */ -#define MACHINE_BUS_AGP 0x00040000 /* sys has AGP bus */ -#define MACHINE_BUS_AC97 0x00080000 /* sys has AC97 bus (ACR/AMR/CNR slot) */ +#define MACHINE_BUS_AT32 0x00001000 /* sys has OPTi local bus */ +#define MACHINE_BUS_OLB 0x00002000 /* sys has OPTi local bus */ +#define MACHINE_BUS_VLB 0x00004000 /* sys has VL bus */ +#define MACHINE_BUS_MCA 0x00008000 /* sys has MCA bus */ +#define MACHINE_BUS_PCI 0x00010000 /* sys has PCI bus */ +#define MACHINE_BUS_CARDBUS 0x00020000 /* sys has CardBus bus */ +#define MACHINE_BUS_USB 0x00040000 /* sys has USB bus */ +#define MACHINE_BUS_AGP 0x00080000 /* sys has AGP bus */ +#define MACHINE_BUS_AC97 0x00100000 /* sys has AC97 bus (ACR/AMR/CNR slot) */ /* Aliases. */ #define MACHINE_CASSETTE (MACHINE_BUS_CASSETTE) /* sys has cassette port */ #define MACHINE_CARTRIDGE (MACHINE_BUS_CARTRIDGE) /* sys has two cartridge bays */