Whoops, and moved the config variables to pc.c.
This commit is contained in:
24
src/config.c
24
src/config.c
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* Configuration file handler.
|
* Configuration file handler.
|
||||||
*
|
*
|
||||||
* Version: @(#)config.c 1.0.24 2017/10/18
|
* Version: @(#)config.c 1.0.25 2017/10/19
|
||||||
*
|
*
|
||||||
* Authors: Sarah Walker,
|
* Authors: Sarah Walker,
|
||||||
* Miran Grca, <mgrca8@gmail.com>
|
* Miran Grca, <mgrca8@gmail.com>
|
||||||
@@ -101,28 +101,6 @@ typedef struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Commandline options. */
|
|
||||||
int dump_on_exit = 0; /* (O) dump regs on exit */
|
|
||||||
int start_in_fullscreen = 0; /* (O) start in fullscreen */
|
|
||||||
|
|
||||||
/* Configuration values. */
|
|
||||||
int window_w, window_h, /* (C) window size and */
|
|
||||||
window_x, window_y, /* position info */
|
|
||||||
window_remember,
|
|
||||||
vid_resize, /* (C) allow resizing */
|
|
||||||
invert_display, /* (C) invert the display */
|
|
||||||
suppress_overscan = 0; /* (C) suppress overscans */
|
|
||||||
int scale = 0; /* (C) screen scale factor */
|
|
||||||
int vid_api = 0; /* (C) video renderer */
|
|
||||||
int vid_cga_contrast = 0, /* (C) video */
|
|
||||||
video_fullscreen = 0, /* (C) video */
|
|
||||||
video_fullscreen_scale = 0, /* (C) video */
|
|
||||||
video_fullscreen_first = 0, /* (C) video */
|
|
||||||
enable_overscan = 0, /* (C) video */
|
|
||||||
force_43 = 0, /* (C) video */
|
|
||||||
video_speed = 0; /* (C) video */
|
|
||||||
|
|
||||||
|
|
||||||
wchar_t config_file_default[256];
|
wchar_t config_file_default[256];
|
||||||
|
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
* NOTE: The file will also implement an NE1000 for 8-bit ISA systems.
|
* NOTE: The file will also implement an NE1000 for 8-bit ISA systems.
|
||||||
*
|
*
|
||||||
* Version: @(#)net_ne2000.c 1.0.19 2017/10/16
|
* Version: @(#)net_ne2000.c 1.0.20 2017/10/19
|
||||||
*
|
*
|
||||||
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
|
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
|
||||||
* Peter Grehan, grehan@iprg.nokia.com>
|
* Peter Grehan, grehan@iprg.nokia.com>
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
* it should be malloc'ed and then linked to the NETCARD def.
|
* it should be malloc'ed and then linked to the NETCARD def.
|
||||||
* Will be done later.
|
* Will be done later.
|
||||||
*
|
*
|
||||||
* Version: @(#)network.c 1.0.16 2017/10/19
|
* Version: @(#)network.c 1.0.17 2017/10/19
|
||||||
*
|
*
|
||||||
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
|
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
|
||||||
*
|
*
|
||||||
|
33
src/pc.c
33
src/pc.c
@@ -6,9 +6,9 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the 86Box distribution.
|
* This file is part of the 86Box distribution.
|
||||||
*
|
*
|
||||||
* Emulation core dispatcher.
|
* Main emulator module where most things are controlled.
|
||||||
*
|
*
|
||||||
* Version: @(#)pc.c 1.0.29 2017/10/18
|
* Version: @(#)pc.c 1.0.29 2017/10/19
|
||||||
*
|
*
|
||||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||||
* Miran Grca, <mgrca8@gmail.com>
|
* Miran Grca, <mgrca8@gmail.com>
|
||||||
@@ -77,13 +77,34 @@
|
|||||||
#include "plat_mouse.h"
|
#include "plat_mouse.h"
|
||||||
|
|
||||||
|
|
||||||
/* Statistics. */
|
/* Commandline options. */
|
||||||
extern int mmuflush,
|
int dump_on_exit = 0; /* (O) dump regs on exit */
|
||||||
readlnum,
|
int start_in_fullscreen = 0; /* (O) start in fullscreen */
|
||||||
writelnum;
|
|
||||||
|
/* Configuration values. */
|
||||||
|
int window_w, window_h, /* (C) window size and */
|
||||||
|
window_x, window_y, /* position info */
|
||||||
|
window_remember,
|
||||||
|
vid_resize, /* (C) allow resizing */
|
||||||
|
invert_display, /* (C) invert the display */
|
||||||
|
suppress_overscan = 0; /* (C) suppress overscans */
|
||||||
|
int scale = 0; /* (C) screen scale factor */
|
||||||
|
int vid_api = 0; /* (C) video renderer */
|
||||||
|
int vid_cga_contrast = 0, /* (C) video */
|
||||||
|
video_fullscreen = 0, /* (C) video */
|
||||||
|
video_fullscreen_scale = 0, /* (C) video */
|
||||||
|
video_fullscreen_first = 0, /* (C) video */
|
||||||
|
enable_overscan = 0, /* (C) video */
|
||||||
|
force_43 = 0, /* (C) video */
|
||||||
|
video_speed = 0; /* (C) video */
|
||||||
|
|
||||||
|
|
||||||
/* Statistics. */
|
/* Statistics. */
|
||||||
|
extern int
|
||||||
|
mmuflush,
|
||||||
|
readlnum,
|
||||||
|
writelnum;
|
||||||
|
|
||||||
int sndcount = 0;
|
int sndcount = 0;
|
||||||
int sreadlnum,
|
int sreadlnum,
|
||||||
swritelnum,
|
swritelnum,
|
||||||
|
Reference in New Issue
Block a user