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

Major commit, cleaning a lot of old stuff.

Browse Source 
IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized.
Machines that have their own video, mouse and/or keyboard now have all this in their machine file.
Fixed and other cleanups here and there.
This commit is contained in:
waltje
2017-11-05 01:57:04 -05:00
parent f5d4436672
commit 7c67e867c8
238 changed files with 5139 additions and 7832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.70 2017/10/28
# Version: @(#)Makefile.mingw 1.0.71 2017/11/04
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -262,7 +262,7 @@ ifndef SERIAL
SERIAL := serial.o
endif
ifndef EUROPC
EUROPC := machine_europc.o
EUROPC := m_europc.o
endif
@@ -271,28 +271,28 @@ MAINOBJ := pc.o config.o random.o timer.o io.o dma.o nmi.o pic.o \
device.o nvr.o nvr_at.o nvr_ps2.o $(VNCOBJ) $(RDPOBJ) \
intel.o intel_flash.o intel_sio.o
CPUOBJ := cpu.o 386.o 386_dynarec.o 808x.o \
x86seg.o x87.o \
$(DYNARECOBJ)
CPUOBJ := cpu.o cpu_table.o \
808x.o 386.o x86seg.o x87.o \
386_dynarec.o $(DYNARECOBJ)
MCHOBJ := machine.o \
machine_common.o \
machine_amstrad.o $(EUROPC) \
machine_olivetti_m24.o \
machine_pcjr.o \
machine_tandy.o \
machine_xt.o machine_xt_laserxt.o \
machine_at.o \
machine_at_ali1429.o machine_at_commodore.o \
machine_at_neat.o machine_at_headland.o \
machine_at_opti495.o machine_at_scat.o \
machine_at_wd76c10.o \
machine_at_sis_85c471.o machine_at_sis_85c496.o \
machine_at_430lx_nx.o machine_at_430fx.o \
machine_at_430hx.o machine_at_430vx.o \
machine_at_440fx.o \
machine_ps1.o \
machine_ps2_isa.o machine_ps2_mca.o
m_common.o \
m_amstrad.o $(EUROPC) \
m_olivetti_m24.o \
m_pcjr.o \
m_tandy.o \
m_xt.o m_xt_laserxt.o \
m_at.o \
m_at_ali1429.o m_at_commodore.o \
m_at_neat.o m_at_headland.o \
m_at_opti495.o m_at_scat.o \
m_at_wd76c10.o \
m_at_sis_85c471.o m_at_sis_85c496.o \
m_at_430lx_nx.o m_at_430fx.o \
m_at_430hx.o m_at_430vx.o \
m_at_440fx.o \
m_ps1.o \
m_ps2_isa.o m_ps2_mca.o
DEVOBJ := bugger.o lpt.o $(SERIAL) \
tandy_eeprom.o tandy_rom.o \
@@ -303,8 +303,7 @@ DEVOBJ := bugger.o lpt.o $(SERIAL) \
sio_um8669f.o \
piix.o \
keyboard.o \
keyboard_xt.o keyboard_at.o keyboard_pcjr.o \
keyboard_amstrad.o keyboard_olim24.o \
keyboard_xt.o keyboard_at.o \
gameport.o \
joystick_standard.o joystick_ch_flightstick_pro.o \
joystick_sw_pad.o joystick_tm_fcs.o \
@@ -385,13 +384,7 @@ VIDOBJ := video.o \
vid_sdac_ramdac.o \
vid_stg_ramdac.o \
vid_wy700.o \
vid_voodoo.o \
vid_pcjr.o \
vid_ps1_svga.o \
vid_olivetti_m24.o \
vid_pc1512.o vid_pc1640.o \
vid_pc200.o \
vid_tandy.o vid_tandysl.o
vid_voodoo.o
PLATOBJ := win.o \
win_ddraw.o win_ddraw_fs.o win_d3d.o win_d3d_fs.o \

3
src/win/win.c
View File

@@ -8,7 +8,7 @@
*
* Platform main support module for Windows.
*
* Version: @(#)win.c 1.0.31 2017/11/01
* Version: @(#)win.c 1.0.32 2017/11/04
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -37,7 +37,6 @@
#include <wchar.h>
#include "../86box.h"
#include "../config.h"
#include "../ibm.h"
#include "../machine/machine.h"
#include "../mem.h" // because of load_config
#include "../rom.h" // because of load_config

3
src/win/win_cdrom_ioctl.c
View File

@@ -9,7 +9,7 @@
* Implementation of the CD-ROM host drive IOCTL interface for
* Windows using SCSI Passthrough Direct.
*
* Version: @(#)cdrom_ioctl.c 1.0.6 2017/10/16
* Version: @(#)cdrom_ioctl.c 1.0.7 2017/11/04
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -27,7 +27,6 @@
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../device.h"
#include "../scsi/scsi.h"
#include "../cdrom/cdrom.h"

25
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
*
* Windows 86Box Settings dialog handler.
*
* Version: @(#)win_settings.c 1.0.22 2017/10/28
* Version: @(#)win_settings.c 1.0.23 2017/11/04
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -26,7 +26,6 @@
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../config.h"
#include "../cpu/cpu.h"
#include "../mem.h"
@@ -719,7 +718,10 @@ static BOOL CALLBACK win_settings_machine_proc(HWND hdlg, UINT message, WPARAM w
{
temp_mem_size *= 1024;
}
if (machines[temp_machine].flags & MACHINE_VIDEO)
{
gfxcard = GFX_INTERNAL;
}
free(stransi);
free(lptsTemp);
@@ -743,6 +745,12 @@ static void recalc_vid_list(HWND hdlg)
while (1)
{
/* Skip "internal" if machine doesn't have it. */
if (c==1 && !(machines[temp_machine].flags&MACHINE_VIDEO)) {
c++;
continue;
}
char *s = video_card_getname(c);
if (!s[0])
@@ -907,15 +915,12 @@ static int mouse_valid(int type, int machine)
{
type &= MOUSE_TYPE_MASK;
if ((type == MOUSE_TYPE_INTERNAL) &&
!(machines[machine].flags & MACHINE_MOUSE)) return(0);
if ((type == MOUSE_TYPE_PS2) &&
!(machines[machine].flags & MACHINE_PS2)) return(0);
if ((type == MOUSE_TYPE_AMSTRAD) &&
!(machines[machine].flags & MACHINE_AMSTRAD)) return(0);
if ((type == MOUSE_TYPE_OLIM24) &&
!(machines[machine].flags & MACHINE_OLIM24)) return(0);
return(1);
}
@@ -1435,7 +1440,7 @@ static void recalc_hdc_list(HWND hdlg, int machine, int use_selected_hdc)
{
break;
}
if (c==1 && !(machines[temp_machine].flags&MACHINE_HAS_HDC))
if (c==1 && !(machines[temp_machine].flags&MACHINE_HDC))
{
/* Skip "Internal" if machine doesn't have one. */
c++;

2
src/win/win_status.c
View File

@@ -10,9 +10,9 @@
#include <string.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../pit.h"
#include "../mem.h"
#include "../cpu/cpu.h"
#include "../cpu/x86_ops.h"
#ifdef USE_DYNAREC
# include "../cpu/codegen.h"

5
src/win/win_stbar.c
View File

@@ -8,7 +8,7 @@
*
* Implement the application's Status Bar.
*
* Version: @(#)win_stbar.c 1.0.5 2017/11/01
* Version: @(#)win_stbar.c 1.0.6 2017/11/04
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -30,7 +30,6 @@
#include <wchar.h>
#include "../86box.h"
#include "../config.h"
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../machine/machine.h"
@@ -514,7 +513,7 @@ ui_sb_update_panes(void)
sb_ready = 0;
hdint = (machines[machine].flags & MACHINE_HAS_HDC) ? 1 : 0;
hdint = (machines[machine].flags & MACHINE_HDC) ? 1 : 0;
c_mfm = hdd_count(HDD_BUS_MFM);
c_esdi = hdd_count(HDD_BUS_ESDI);
c_xtide = hdd_count(HDD_BUS_XTIDE);