Added the IBM 5161 ISA expansion for PC and XT;
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port; Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX); Finished the 586MC1; Added 8087 emulation; Moved Cyrix 6x86'es to the Dev branch; Sanitized/cleaned up memregs.c/h and intel.c/h; Split the chipsets from machines and sanitized Port 92 emulation; Added support for the 15bpp mode to the Compaq ATI 28800; Moved the MR 386DX and 486 machines to the Dev branch; Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00; Ported the new timer code from PCem; Cleaned up the CPU table of unused stuff and better optimized its structure; Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch; Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem; Added the AHA-1540A and the BusTek BT-542B; Moved the Sumo SCSI-AT to the Dev branch; Minor IDE, FDC, and floppy drive code clean-ups; Made NCR 5380/53C400-based cards' BIOS address configurable; Got rid of the legacy romset variable; Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit; Added the Amstead PPC512 per PCem patch by John Elliott; Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages); Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing; Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem; Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit; Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement; Amstrad MegaPC does now works correctly with non-internal graphics card; The SLiRP code no longer casts a packed struct type to a non-packed struct type; The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present; The S3 Virge on BeOS is no longer broken (was broken by build #1591); OS/2 2.0 build 6.167 now sees key presses again; Xi8088 now work on CGA again; 86F images converted from either the old or new variants of the HxC MFM format now work correctly; Hardware interrupts with a vector of 0xFF are now handled correctly; OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct; Fixed VNC keyboard input bugs; Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g / 81 MIDI play no longer hangs with the build's own VTD driver; Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly; Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4; Compaq Portable now works with all graphics cards; Fixed various MDSI Genius bugs; Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly; Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355; OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400. Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391. Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389. Fixed a minor IDE timing bug, fixes #388. Fixed Toshiba T1000 RAM issues, fixes #379. Fixed EGA/(S)VGA overscan border handling, fixes #378; Got rid of the now long useless IDE channel 2 auto-removal, fixes #370; Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366; Ported the Unicode CD image file name fix from VARCem, fixes #365; Fixed high density floppy disks on the Xi8088, fixes #359; Fixed some bugs in the Hercules emulation, fixes #346, fixes #358; Fixed the SCSI hard disk mode sense pages, fixes #356; Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349; Fixed bugs in the serial mouse emulation, fixes #344; Compiled 86Box binaries now include all the required .DLL's, fixes #341; Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
129
src/pc.c
129
src/pc.c
@@ -29,17 +29,26 @@
|
||||
#define HAVE_STDARG_H
|
||||
#include "86box.h"
|
||||
#include "config.h"
|
||||
#include "mem.h"
|
||||
#ifdef USE_NEW_DYNAREC
|
||||
#ifdef USE_DYNAREC
|
||||
#include "cpu_new/cpu.h"
|
||||
# include "cpu_new/codegen.h"
|
||||
#endif
|
||||
#include "cpu_new/x86_ops.h"
|
||||
#else
|
||||
#include "cpu/cpu.h"
|
||||
#ifdef USE_DYNAREC
|
||||
# include "cpu/codegen.h"
|
||||
#endif
|
||||
#include "cpu/x86_ops.h"
|
||||
#endif
|
||||
#include "io.h"
|
||||
#include "mem.h"
|
||||
#include "rom.h"
|
||||
#include "dma.h"
|
||||
#include "pci.h"
|
||||
#include "pic.h"
|
||||
#include "timer.h"
|
||||
#include "pit.h"
|
||||
#include "random.h"
|
||||
#include "timer.h"
|
||||
@@ -108,7 +117,6 @@ int vid_cga_contrast = 0, /* (C) video */
|
||||
enable_overscan = 0, /* (C) video */
|
||||
force_43 = 0; /* (C) video */
|
||||
int serial_enabled[SERIAL_MAX] = {0,0}, /* (C) enable serial ports */
|
||||
lpt_enabled = 0, /* (C) enable LPT ports */
|
||||
bugger_enabled = 0, /* (C) enable ISAbugger */
|
||||
isamem_type[ISAMEM_MAX] = { 0,0,0,0 }, /* (C) enable ISA mem cards */
|
||||
isartc_type = 0; /* (C) enable ISA RTC card */
|
||||
@@ -136,7 +144,6 @@ int fps, framecount; /* emulator % */
|
||||
int CPUID;
|
||||
int output;
|
||||
int atfullspeed;
|
||||
int cpuspeed2;
|
||||
int clockrate;
|
||||
|
||||
wchar_t exe_path[1024]; /* path (dir) of executable */
|
||||
@@ -146,7 +153,6 @@ FILE *stdlog = NULL; /* file to log output to */
|
||||
int scrnsz_x = SCREEN_RES_X, /* current screen size, X */
|
||||
scrnsz_y = SCREEN_RES_Y; /* current screen size, Y */
|
||||
int config_changed; /* config has changed */
|
||||
int romset; /* current machine ID */
|
||||
int title_update;
|
||||
int64_t main_time;
|
||||
|
||||
@@ -465,9 +471,6 @@ usage:
|
||||
wcscpy(usr_path, cfg);
|
||||
else
|
||||
wcscat(usr_path, cfg);
|
||||
|
||||
/* Make sure we have a trailing backslash. */
|
||||
plat_path_slash(usr_path);
|
||||
}
|
||||
|
||||
/* At this point, we can safely create the full path name. */
|
||||
@@ -507,26 +510,23 @@ usage:
|
||||
|
||||
|
||||
void
|
||||
pc_full_speed(void)
|
||||
pc_speed_changed(void)
|
||||
{
|
||||
cpuspeed2 = cpuspeed;
|
||||
|
||||
if (! atfullspeed) {
|
||||
pc_log("Set fullspeed - %i %i %i\n", is386, AT, cpuspeed2);
|
||||
setpitclock(machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].rspeed);
|
||||
}
|
||||
atfullspeed = 1;
|
||||
|
||||
nvr_period_recalc();
|
||||
if (machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type >= CPU_286)
|
||||
pit_set_clock(machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].rspeed);
|
||||
else
|
||||
pit_set_clock(14318184.0);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
pc_speed_changed(void)
|
||||
pc_full_speed(void)
|
||||
{
|
||||
setpitclock(machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].rspeed);
|
||||
|
||||
nvr_period_recalc();
|
||||
if (! atfullspeed) {
|
||||
pc_log("Set fullspeed - %i %i\n", is386, AT);
|
||||
pc_speed_changed();
|
||||
}
|
||||
atfullspeed = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -534,12 +534,13 @@ pc_speed_changed(void)
|
||||
int
|
||||
pc_init_modules(void)
|
||||
{
|
||||
int c, i;
|
||||
int c, m;
|
||||
|
||||
pc_log("Scanning for ROM images:\n");
|
||||
for (c=0,i=0; i<ROM_MAX; i++) {
|
||||
romspresent[i] = rom_load_bios(i);
|
||||
c += romspresent[i];
|
||||
c = m = 0;
|
||||
while (machine_get_internal_name_ex(m) != NULL) {
|
||||
c += machine_available(m);
|
||||
m++;
|
||||
}
|
||||
if (c == 0) {
|
||||
/* No usable ROMs found, aborting. */
|
||||
@@ -548,54 +549,45 @@ pc_init_modules(void)
|
||||
pc_log("A total of %d ROM sets have been loaded.\n", c);
|
||||
|
||||
/* Load the ROMs for the selected machine. */
|
||||
again:
|
||||
if (! rom_load_bios(romset)) {
|
||||
/* Whoops, ROMs not found. */
|
||||
if (romset != -1)
|
||||
ui_msgbox(MBX_INFO, (wchar_t *)IDS_2063);
|
||||
|
||||
/*
|
||||
* Select another machine to use.
|
||||
*
|
||||
* FIXME:
|
||||
* We should not do that here. If something turns out
|
||||
* to be wrong with the configuration (such as missing
|
||||
* ROM images, we should just display a fatal message
|
||||
* in the render window's center, let them click OK,
|
||||
* and then exit so they can remedy the situation.
|
||||
*/
|
||||
for (c=0; c<ROM_MAX; c++) {
|
||||
if (romspresent[c]) {
|
||||
romset = c;
|
||||
machine = machine_getmachine(romset);
|
||||
if (! machine_available(machine)) {
|
||||
c = 0;
|
||||
while (machine_get_internal_name_ex(c) != NULL) {
|
||||
machine = -1;
|
||||
if (machine_available(c)) {
|
||||
ui_msgbox(MBX_INFO, (wchar_t *)IDS_2063);
|
||||
machine = c;
|
||||
config_save();
|
||||
|
||||
/* This can loop if all ROMs are now bad.. */
|
||||
goto again;
|
||||
break;
|
||||
}
|
||||
c++;
|
||||
}
|
||||
if (machine == -1) {
|
||||
fatal("No available machines\n");
|
||||
exit(-1);
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Make sure we have a usable video card. */
|
||||
again2:
|
||||
if (! video_card_available(gfxcard)) {
|
||||
if (romset != -1) {
|
||||
ui_msgbox(MBX_INFO, (wchar_t *)IDS_2064);
|
||||
}
|
||||
c = 0;
|
||||
while (video_get_internal_name(c) != NULL) {
|
||||
gfxcard = -1;
|
||||
if (video_card_available(c)) {
|
||||
ui_msgbox(MBX_INFO, (wchar_t *)IDS_2064);
|
||||
gfxcard = c;
|
||||
config_save();
|
||||
|
||||
/* This can loop if all cards now bad.. */
|
||||
goto again2;
|
||||
break;
|
||||
}
|
||||
c++;
|
||||
}
|
||||
if (gfxcard == -1) {
|
||||
fatal("No available video cards\n");
|
||||
exit(-1);
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
|
||||
cpuspeed2 = (machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type >= CPU_286) ? 2 : 1;
|
||||
atfullspeed = 0;
|
||||
|
||||
random_init();
|
||||
@@ -617,6 +609,8 @@ again2:
|
||||
|
||||
hdc_init();
|
||||
|
||||
video_reset_close();
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
@@ -665,9 +659,13 @@ pc_reset_hard_close(void)
|
||||
{
|
||||
ui_sb_set_ready(0);
|
||||
|
||||
/* Turn off timer processing to avoid potential segmentation faults. */
|
||||
timer_close();
|
||||
|
||||
suppress_overscan = 0;
|
||||
|
||||
nvr_save();
|
||||
nvr_close();
|
||||
|
||||
mouse_close();
|
||||
|
||||
@@ -686,6 +684,8 @@ pc_reset_hard_close(void)
|
||||
scsi_disk_close();
|
||||
|
||||
closeal();
|
||||
|
||||
video_reset_close();
|
||||
}
|
||||
|
||||
|
||||
@@ -706,7 +706,9 @@ pc_reset_hard_init(void)
|
||||
|
||||
/* Reset the general machine support modules. */
|
||||
io_init();
|
||||
timer_reset();
|
||||
|
||||
/* Turn on and (re)initialize timer processing. */
|
||||
timer_init();
|
||||
|
||||
device_init();
|
||||
|
||||
@@ -765,9 +767,9 @@ pc_reset_hard_init(void)
|
||||
if (joystick_type != 7)
|
||||
gameport_update_joystick_type();
|
||||
|
||||
if (config_changed) {
|
||||
ui_sb_update_panes();
|
||||
ui_sb_update_panes();
|
||||
|
||||
if (config_changed) {
|
||||
config_save();
|
||||
|
||||
config_changed = 0;
|
||||
@@ -784,9 +786,8 @@ pc_reset_hard_init(void)
|
||||
pic_reset();
|
||||
cpu_cache_int_enabled = cpu_cache_ext_enabled = 0;
|
||||
|
||||
atfullspeed = 0;
|
||||
pc_full_speed();
|
||||
|
||||
setpitclock(machines[machine].cpu[cpu_manufacturer].cpus[cpu_effective].rspeed);
|
||||
}
|
||||
|
||||
|
||||
@@ -838,12 +839,18 @@ pc_close(thread_t *ptr)
|
||||
plat_delay_ms(200);
|
||||
}
|
||||
|
||||
#ifdef USE_NEW_DYNAREC
|
||||
codegen_close();
|
||||
#endif
|
||||
|
||||
nvr_save();
|
||||
|
||||
config_save();
|
||||
|
||||
plat_mouse_capture(0);
|
||||
|
||||
timer_close();
|
||||
|
||||
lpt_devices_close();
|
||||
|
||||
for (i=0; i<FDD_NUM; i++)
|
||||
|
||||
Reference in New Issue
Block a user