mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-27 17:34:25 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-06 23:16:32 -05:00
parent 3717f282e1 8910c10d94
commit 2315e0a4b0
128 changed files with 2887 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/86box.h
View File

@@ -107,7 +107,7 @@ extern int vid_cga_contrast, /* (C) video */
video_filter_method, /* (C) video */
video_vsync, /* (C) video */
video_framerate, /* (C) video */
gfxcard; /* (C) graphics/video card */
gfxcard[2]; /* (C) graphics/video card */
extern char video_shader[512]; /* (C) video */
extern int bugger_enabled, /* (C) enable ISAbugger */
postcard_enabled, /* (C) enable POST card */

10
src/include/86box/acpi.h
View File

@@ -18,7 +18,11 @@
#define ACPI_H
#ifdef __cplusplus
#include <atomic>
using atomic_int = std::atomic_int;
extern "C" {
#else
#include <stdatomic.h>
#endif
#include <86box/tco.h>
@@ -94,7 +98,7 @@ typedef struct
slot, irq_mode,
irq_pin, irq_line,
mirq_is_level;
pc_timer_t timer, resume_timer;
pc_timer_t timer, resume_timer, pwrbtn_timer;
nvr_t *nvr;
apm_t *apm;
tco_t *tco;
@@ -103,7 +107,9 @@ typedef struct
} acpi_t;
/* Global variables. */
extern int acpi_rtc_status;
extern int acpi_rtc_status;
extern atomic_int acpi_pwrbut_pressed;
extern int acpi_enabled;
extern const device_t acpi_ali_device;
extern const device_t acpi_intel_device;

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

@@ -614,6 +614,7 @@ extern int machine_at_presario4500_init(const machine_t *);
extern int machine_at_p55va_init(const machine_t *);
extern int machine_at_brio80xx_init(const machine_t *);
extern int machine_at_pb680_init(const machine_t *);
extern int machine_at_pb810_init(const machine_t *);
extern int machine_at_mb520n_init(const machine_t *);
extern int machine_at_i430vx_init(const machine_t *);
@@ -712,6 +713,7 @@ extern int machine_at_cuv4xls_init(const machine_t *);
extern int machine_at_6via90ap_init(const machine_t *);
extern int machine_at_s1857_init(const machine_t *);
extern int machine_at_p6bap_init(const machine_t *);
extern int machine_at_p6bat_init(const machine_t *);
extern int machine_at_cusl2c_init(const machine_t *);
extern int machine_at_j815epda_init(const machine_t *);
extern int machine_at_m6tsl_init(const machine_t *);

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

@@ -412,20 +412,27 @@
#define IDM_VID_SCALE_2X 40056
#define IDM_VID_SCALE_3X 40057
#define IDM_VID_SCALE_4X 40058
#define IDM_VID_HIDPI 40059
#define IDM_VID_FULLSCREEN 40060
#define IDM_VID_FS_FULL 40061
#define IDM_VID_FS_43 40062
#define IDM_VID_FS_KEEPRATIO 40063
#define IDM_VID_FS_INT 40064
#define IDM_VID_SPECIFY_DIM 40065
#define IDM_VID_FORCE43 40066
#define IDM_VID_OVERSCAN 40067
#define IDM_VID_INVERT 40069
#define IDM_VID_CGACON 40070
#define IDM_VID_GRAYCT_601 40075
#define IDM_VID_GRAYCT_709 40076
#define IDM_VID_GRAYCT_AVE 40077
#define IDM_VID_SCALE_5X 40059
#define IDM_VID_SCALE_6X 40060
#define IDM_VID_SCALE_7X 40061
#define IDM_VID_SCALE_8X 40062
#define IDM_VID_SCALE_9X 40063
#define IDM_VID_SCALE_10X 40064
#define IDM_VID_HIDPI 40065
#define IDM_VID_FULLSCREEN 40066
#define IDM_VID_FS_FULL 40067
#define IDM_VID_FS_43 40068
#define IDM_VID_FS_KEEPRATIO 40069
#define IDM_VID_FS_INT 40070
#define IDM_VID_SPECIFY_DIM 40071
#define IDM_VID_FORCE43 40072
#define IDM_VID_OVERSCAN 40073
#define IDM_VID_INVERT 40074
#define IDM_VID_CGACON 40075
#define IDM_VID_GRAYCT_601 40076
#define IDM_VID_GRAYCT_709 40077
#define IDM_VID_GRAYCT_AVE 40078
#define IDM_VID_GRAY_RGB 40080
#define IDM_VID_GRAY_MONO 40081
#define IDM_VID_GRAY_AMBER 40082

1
src/include/86box/video.h
View File

@@ -132,7 +132,6 @@ extern monitor_t monitors[MONITORS_NUM];
extern monitor_settings_t monitor_settings[MONITORS_NUM];
extern atomic_bool doresize_monitors[MONITORS_NUM];
extern int monitor_index_global;
extern int gfxcard_2;
extern int show_second_monitors;
extern int video_fullscreen_scale_maximized;