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

Another major change round. VNC moved to top level. More cleanups of global data, all VM processing now handled in pc.c (out of the platforms, yay!), and some video cleanups. This build MAY have issues with window sizes, resizing, and fullscreen will not work until the next build- sorry.

Browse Source
This commit is contained in:
waltje
2017-10-19 04:27:04 -04:00
parent bcffcb4d22
commit 1d60a99ea3
36 changed files with 1244 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/machine/machine_at_scat.c
View File

@@ -10,7 +10,7 @@
*
* Re-worked version based on the 82C235 datasheet and errata.
*
* Version: @(#)at_scat.c 1.0.3 2017/10/16
* Version: @(#)at_scat.c 1.0.4 2017/10/18
*
* Authors: Original by GreatPsycho for PCem.
* Fred N. van Kempen, <decwiz@yahoo.com>
@@ -30,7 +30,7 @@
#include "machine.h"
#define SCAT_DEBUG 2
#define SCAT_DEBUG 1
#define SCAT_DMA_WS_CTL 0x01
#define SCAT_VERSION 0x40
@@ -177,12 +177,10 @@ set_xms_bound(uint8_t val)
0x160000 - scat_xms_bound,
MEM_READ_EXTERNAL | MEM_WRITE_EXTERNAL);
} else {
#if 0
for (i=0; i<6; i++)
mem_mapping_disable(&scat_shadowram_mapping[i]);
if (mem_size > 1024)
mem_mapping_enable(&ram_high_mapping);
#endif
if (scat_xms_bound > max_xms)
scat_xms_bound = max_xms;
@@ -280,10 +278,8 @@ ems_state(int state)
} else {
mem_mapping_set_exec(&scat_mapping[i], ram+base_addr);
mem_mapping_disable(&scat_mapping[i]);
#if 0
if (i < 24)
mem_mapping_enable(&scat_top_mapping[i]);
#endif
}
}
}
@@ -491,7 +487,6 @@ ics_write(uint8_t idx, uint8_t val)
break;
case SCAT_EMS_CTL:
pclog("SCAT: EMSctrl(%02x)\n", val);
if (val & 0x40) {
if (val & 1) {
io_sethandler(0x0218, 3,
@@ -527,24 +522,18 @@ pclog("SCAT: EMSctrl(%02x)\n", val);
case SCAT_DRAM_CONFIG:
if ((scat_regs[SCAT_EXT_BOUNDARY] & 0x40) == 0) {
pclog("SCAT: 0\n");
if ((val & 0x0f) == 3) {
pclog("SCAT: 3\n");
if (mem_size > 1024)
mem_mapping_disable(&ram_high_mapping);
for (idx=0; idx<6; idx++)
mem_mapping_enable(&scat_shadowram_mapping[idx]);
} else {
pclog("SCAT: 0\n");
for (idx=0; idx<6; idx++)
mem_mapping_disable(&scat_shadowram_mapping[idx]);
#if 0
if (mem_size > 1024)
mem_mapping_enable(&ram_high_mapping);
#endif
}
} else {
pclog("SCAT: 1\n");
for (idx=0; idx<6; idx++)
mem_mapping_disable(&scat_shadowram_mapping[idx]);
if (mem_size > 1024)
@@ -688,8 +677,6 @@ scat_init(void)
*/
pclog("SCAT: mem_size=%d\n", mem_size);
#if 0
/* Create the 32 EMS page frame mappings for 256-640K. */
for (i=0; i<24; i++) {
mem_mapping_add(&scat_top_mapping[i],
@@ -698,12 +685,9 @@ scat_init(void)
ems_pgwr, NULL, NULL,
mem_size > 256+(i<<4) ? ram+0x40000+(i<<14) : NULL,
MEM_MAPPING_INTERNAL, NULL);
// mem_mapping_enable(&scat_top_mapping[i]);
mem_mapping_disable(&scat_top_mapping[i]);
mem_mapping_enable(&scat_top_mapping[i]);
}
#endif
#if 0
/* Re-map the 128K at A0000 (video BIOS) to above 16MB+top. */
mem_mapping_add(&scat_A000_mapping,
0xA0000, 0x20000,
@@ -712,9 +696,7 @@ scat_init(void)
ram+0xA0000,
MEM_MAPPING_INTERNAL, NULL);
mem_mapping_disable(&scat_A000_mapping);
#endif
#if 0
/* Create 32 page frames for EMS, each 16K. */
for (i=0; i<32; i++) {
scat_ems[i].regs_2x8 = 0xff;
@@ -727,9 +709,8 @@ scat_init(void)
0, &scat_ems[i]);
mem_mapping_disable(&scat_mapping[i]);
}
#endif
// for (i=4; i<10; i++) isram[i] = 0;
for (i=4; i<10; i++) isram[i] = 0;
/* Re-map the BIOS ROM (C0000-FFFFF) area. */
for (i=12; i<16; i++) {
@@ -741,7 +722,6 @@ scat_init(void)
0, NULL);
}
#if 0
for (i=0; i<6; i++) {
mem_mapping_add(&scat_shadowram_mapping[i],
0x100000 + (i<<16), 0x10000,
@@ -750,7 +730,6 @@ scat_init(void)
mem_size >= 1024 ? ram+get_addr(0x100000+(i<<16), NULL) : NULL,
MEM_MAPPING_INTERNAL, NULL);
}
#endif
set_xms_bound(0);
shadow_state_update();