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

Several fixes - the Samsung SPC4200P works again, as do VLB graphics cards.

Browse Source
This commit is contained in:
OBattler
2017-11-19 20:33:25 +01:00
parent b97aacdc70
commit 7dbb5e1642
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/808x.c
View File

@@ -601,7 +601,6 @@ void resetx86()
if(AT) if(AT)
{ {
loadcs(0xF000); loadcs(0xF000);
_cs.base = cpu_16bitbus ? 0xFF0000 : 0xFFFF0000;
cpu_state.pc=0xFFF0; cpu_state.pc=0xFFF0;
rammask = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF; rammask = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF;
} }
@@ -648,7 +647,6 @@ void softresetx86()
if(AT) if(AT)
{ {
loadcs(0xF000); loadcs(0xF000);
_cs.base = cpu_16bitbus ? 0xFF0000 : 0xFFFF0000;
cpu_state.pc=0xFFF0; cpu_state.pc=0xFFF0;
rammask = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF; rammask = cpu_16bitbus ? 0xFFFFFF : 0xFFFFFFFF;
} }

3
src/keyboard_at.c
View File

@@ -1171,7 +1171,8 @@ kbd_reset(void *priv)
kbd->dtrans = 0; kbd->dtrans = 0;
kbd->first_write = 1; kbd->first_write = 1;
kbd->status = STAT_LOCK | STAT_CD; kbd->status = STAT_LOCK | STAT_CD;
kbd->mem[0] = 0x31; // kbd->mem[0] = 0x31;
kbd->mem[0] = 0x11;
kbd->default_mode = 0x02; kbd->default_mode = 0x02;
kbd->wantirq = 0; kbd->wantirq = 0;
kbd->output_port = 0xcf; kbd->output_port = 0xcf;

11
src/pc.c
View File

@@ -726,6 +726,7 @@ pc_reset_hard_init(void)
/* Reset keyboard and/or mouse. */ /* Reset keyboard and/or mouse. */
// FIXME: do we really have to reset the *AT* keyboard?? --FvK // FIXME: do we really have to reset the *AT* keyboard?? --FvK
shadowbios = 0;
keyboard_at_reset(); keyboard_at_reset();
/* Reset the video card. */ /* Reset the video card. */
@@ -783,15 +784,15 @@ pc_reset_hard_init(void)
device_add(&bugger_device); device_add(&bugger_device);
/* Reset the CPU module. */ /* Reset the CPU module. */
cpu_update_waitstates();
cpu_cache_int_enabled = cpu_cache_ext_enabled = 0;
resetx86(); resetx86();
dma_reset(); dma_reset();
pic_reset(); pic_reset();
cpu_cache_int_enabled = cpu_cache_ext_enabled = 0;
shadowbios = 0; if (AT)
setpitclock(machines[machine].cpu[cpu_manufacturer].cpus[cpu].rspeed);
pc_speed_changed(); else
setpitclock(14318184.0);
} }