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

Merge branch 'master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-10 14:44:37 -04:00
parent 6fde4879bb f16c59fc95
commit fafb1e6f03
49 changed files with 637 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,10 @@ extern uint64_t source_hwnd;
extern char rom_path[1024]; /* (O) full path to ROMs */
extern char log_path[1024]; /* (O) full path of logfile */
extern char vm_name[1024]; /* (O) display name of the VM */
#ifdef USE_INSTRUMENT
extern uint8_t instru_enabled;
extern uint64_t instru_run_ms;
#endif
#define window_x monitor_settings[0].mon_window_x
#define window_y monitor_settings[0].mon_window_y

3
src/include/86box/chipset.h
View File

@@ -56,9 +56,12 @@ extern const device_t gc100a_device;
/* Headland */
extern const device_t headland_gc10x_device;
extern const device_t headland_gc113_device;
extern const device_t headland_ht18a_device;
extern const device_t headland_ht18b_device;
extern const device_t headland_ht18c_device;
extern const device_t headland_ht21c_d_device;
extern const device_t headland_ht21e_device;
/* IMS */
extern const device_t ims8848_device;

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

@@ -20,7 +20,7 @@
#ifndef MACHINE_AMSTRAD_H
#define MACHINE_AMSTRAD_H
extern int amstrad_latch;
extern uint32_t amstrad_latch;
enum {
AMSTRAD_NOLATCH,

27
src/include/86box/timer.h
View File

@@ -198,30 +198,12 @@ extern pc_timer_t * timer_head;
extern int timer_inited;
static __inline void
timer_remove_head_inline(void)
{
pc_timer_t *timer;
if (timer_inited && timer_head) {
timer = timer_head;
timer_head = timer->next;
if (timer_head) {
timer_head->prev = NULL;
timer->next->prev = NULL;
}
timer->next = timer->prev = NULL;
timer->flags &= ~TIMER_ENABLED;
}
}
static __inline void
timer_process_inline(void)
{
pc_timer_t *timer;
if (!timer_inited || !timer_head)
if (!timer_head)
return;
while(1) {
@@ -230,7 +212,12 @@ timer_process_inline(void)
if (!TIMER_LESS_THAN_VAL(timer, (uint32_t)tsc))
break;
timer_remove_head_inline();
timer_head = timer->next;
if (timer_head)
timer_head->prev = NULL;
timer->next = timer->prev = NULL;
timer->flags &= ~TIMER_ENABLED;
if (timer->flags & TIMER_SPLIT)
timer_advance_ex(timer, 0); /* We're splitting a > 1 s period into multiple <= 1 s periods. */

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

@@ -92,7 +92,7 @@ typedef struct xga_t {
int on;
int op_mode_reset, linear_endian_reverse;
int sprite_pos, sprite_pos_prefetch, cursor_data_on;
int pal_test;
int pal_test, a5_test;
int type, bus;
uint32_t linear_base, linear_size, banked_mask;

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

@@ -133,6 +133,7 @@ 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;
typedef rgb_t PALETTE[256];