From 0659f5fe6a82c022047963179e6abcf2769d210c Mon Sep 17 00:00:00 2001 From: waltje Date: Thu, 19 Oct 2017 21:26:02 -0400 Subject: [PATCH] Whoops, and moved the config variables to pc.c. --- src/config.c | 24 +----------------------- src/network/net_ne2000.c | 2 +- src/network/network.c | 2 +- src/pc.c | 33 +++++++++++++++++++++++++++------ 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/config.c b/src/config.c index 39acf183c..97b99055c 100644 --- a/src/config.c +++ b/src/config.c @@ -8,7 +8,7 @@ * * Configuration file handler. * - * Version: @(#)config.c 1.0.24 2017/10/18 + * Version: @(#)config.c 1.0.25 2017/10/19 * * Authors: Sarah Walker, * Miran Grca, @@ -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]; diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index d6ae42cd1..9b2876af2 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -10,7 +10,7 @@ * * 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, * Peter Grehan, grehan@iprg.nokia.com> diff --git a/src/network/network.c b/src/network/network.c index aef01ce85..0bb9091bc 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -12,7 +12,7 @@ * it should be malloc'ed and then linked to the NETCARD def. * 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, * diff --git a/src/pc.c b/src/pc.c index f7e3fd3a5..fa5b28520 100644 --- a/src/pc.c +++ b/src/pc.c @@ -6,9 +6,9 @@ * * 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, * Miran Grca, @@ -77,13 +77,34 @@ #include "plat_mouse.h" -/* Statistics. */ -extern int mmuflush, - readlnum, - writelnum; +/* 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 */ /* Statistics. */ +extern int + mmuflush, + readlnum, + writelnum; + int sndcount = 0; int sreadlnum, swritelnum,