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

The Settings dialogs now categorizes the machines to declutter the list.

Browse Source
This commit is contained in:
OBattler
2020-06-16 01:58:07 +02:00
parent c2dad63613
commit cfd10447e0
5 changed files with 319 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/include/86box/machine.h
View File

@@ -62,10 +62,38 @@
#define IS_ARCH(m, a) (machines[(m)].flags & (a)) ? 1 : 0;
enum {
MACHINE_TYPE_NONE = 0,
MACHINE_TYPE_8088,
MACHINE_TYPE_8086,
MACHINE_TYPE_286,
MACHINE_TYPE_386SX,
MACHINE_TYPE_386DX,
MACHINE_TYPE_486,
MACHINE_TYPE_SOCKET4,
MACHINE_TYPE_SOCKET5,
MACHINE_TYPE_SOCKET7_3V,
MACHINE_TYPE_SOCKET7,
MACHINE_TYPE_SOCKETS7,
MACHINE_TYPE_SOCKET8,
MACHINE_TYPE_SLOT1,
MACHINE_TYPE_SLOT2,
MACHINE_TYPE_SOCKET370,
MACHINE_TYPE_MAX
};
typedef struct _machine_type_ {
const char *name;
const char id;
} machine_type_t;
#ifdef NEW_STRUCT
typedef struct _machine_ {
const char *name;
const char *internal_name;
const char type;
#ifdef EMU_DEVICE_H
const device_t *device;
#else
@@ -88,6 +116,7 @@ typedef struct _machine_ {
typedef struct _machine_ {
const char *name;
const char *internal_name;
const char type;
struct {
const char *name;
#ifdef EMU_CPU_H
@@ -111,10 +140,11 @@ typedef struct _machine_ {
/* Global variables. */
extern const machine_t machines[];
extern int bios_only;
extern int machine;
extern int AT, PCI;
extern const machine_type_t machine_types[];
extern const machine_t machines[];
extern int bios_only;
extern int machine;
extern int AT, PCI;
/* Core functions. */

20
src/include/86box/resource.h
View File

@@ -50,6 +50,7 @@
#define IDT_1705 1705 /* MB == IDC_TEXT_MB */
#define IDT_1706 1706 /* Memory: */
#define IDT_1707 1707 /* Video: */
#define IDT_1708 1708 /* Machine type: */
#define IDT_1709 1709 /* Mouse: */
#define IDT_1710 1710 /* Joystick: */
#define IDT_1711 1711 /* Sound card: */
@@ -116,17 +117,18 @@
#define IDC_COMBO_LANG 1009
#endif
#define IDC_COMBO_MACHINE 1010 /* machine/cpu config */
#define IDC_CONFIGURE_MACHINE 1011
#define IDC_COMBO_CPU_TYPE 1012
#define IDC_COMBO_CPU 1013
#define IDC_COMBO_FPU 1014
#define IDC_COMBO_WS 1015
#define IDC_COMBO_MACHINE_TYPE 1010
#define IDC_COMBO_MACHINE 1011 /* machine/cpu config */
#define IDC_CONFIGURE_MACHINE 1012
#define IDC_COMBO_CPU_TYPE 1013
#define IDC_COMBO_CPU 1014
#define IDC_COMBO_FPU 1015
#define IDC_COMBO_WS 1016
#ifdef USE_DYNAREC
#define IDC_CHECK_DYNAREC 1016
#define IDC_CHECK_DYNAREC 1017
#endif
#define IDC_MEMTEXT 1017
#define IDC_MEMSPIN 1018
#define IDC_MEMTEXT 1018
#define IDC_MEMSPIN 1019
#define IDC_TEXT_MB IDT_1705
#define IDC_VIDEO 1030 /* video config */