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

Merge branch 'master' of github.com:OBattler/86Box into tc1995

Browse Source 
# Conflicts:
#	src/isamem.c
This commit is contained in:
TC1995
2018-09-04 13:25:02 +02:00
parent 4ae0363bbc e60c4e9615
commit b99ed8840d
4 changed files with 127 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/isamem.c
View File

@@ -32,7 +32,7 @@
* TODO: The EV159 is supposed to support 16b EMS transfers, but the
* EMM.sys driver for it doesn't seem to want to do that..
*
* Version: @(#)isamem.c 1.0.2 2018/09/04
* Version: @(#)isamem.c 1.0.3 2018/09/04
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -131,6 +131,27 @@ typedef struct {
emsreg_t ems[EMS_MAXPAGE]; /* EMS controller registers */
} memdev_t;
#ifdef ENABLE_ISAMEM_LOG
int isamem_do_log = ENABLE_ISAMEM_LOG;
#endif
static void
isamem_log(const char *fmt, ...)
{
#ifdef ENABLE_ISAMEM_LOG
va_list ap;
if (isamem_do_log)
{
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif
}
/* Read one byte from onboard RAM. */
static uint8_t
ram_readb(uint32_t addr, void *priv)
@@ -278,8 +299,13 @@ ems_read(uint16_t port, void *priv)
break;
}
<<<<<<< HEAD
#if ISAMEM_DEBUG
pclog("ISAMEM: read(%04x) = %02x)\n", port, ret);
=======
#if 0
isamem_log("ISAMEM: read(%04x) = %02x)\n", port, ret);
>>>>>>> e60c4e96156542ac06e50372af7269da966854e7
#endif
return(ret);
@@ -297,8 +323,13 @@ ems_write(uint16_t port, uint8_t val, void *priv)
vpage = (port / EMS_PGSIZE);
port &= (EMS_PGSIZE - 1);
<<<<<<< HEAD
#if ISAMEM_DEBUG
pclog("ISAMEM: write(%04x, %02x) page=%d\n", port, val, vpage);
=======
#if 0
isamem_log("ISAMEM: write(%04x, %02x) page=%d\n", port, val, vpage);
>>>>>>> e60c4e96156542ac06e50372af7269da966854e7
#endif
switch(port - dev->base_addr) {
@@ -425,18 +456,18 @@ dev->frame_addr = 0xE0000;
dev->start_addr <<= 10;
/* Say hello! */
pclog("ISAMEM: %s (%iKB", info->name, dev->total_size);
if (dev->total_size != tot) pclog(", %iKB for RAM", tot);
if (dev->flags & FLAG_FAST) pclog(", FAST");
if (dev->flags & FLAG_WIDE) pclog(", 16BIT");
pclog(")\n");
isamem_log("ISAMEM: %s (%iKB", info->name, dev->total_size);
if (dev->total_size != tot) isamem_log(", %iKB for RAM", tot);
if (dev->flags & FLAG_FAST) isamem_log(", FAST");
if (dev->flags & FLAG_WIDE) isamem_log(", 16BIT");
isamem_log(")\n");
/* Force (back to) 8-bit bus if needed. */
if (AT) {
if (! cpu_16bitbus)
pclog("ISAMEM: *WARNING* this board will slow down your PC!\n");
isamem_log("ISAMEM: *WARNING* this board will slow down your PC!\n");
} else {
pclog("ISAMEM: not AT+ system, forcing 8-bit mode!\n");
isamem_log("ISAMEM: not AT+ system, forcing 8-bit mode!\n");
dev->flags &= ~FLAG_WIDE;
}
@@ -472,7 +503,7 @@ dev->frame_addr = 0xE0000;
*/
if (t > tot)
t = tot;
pclog("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
isamem_log("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
/* Create, initialize and enable the low-memory mapping. */
mem_mapping_add(&dev->low_mapping, addr, t,
@@ -505,7 +536,7 @@ dev->frame_addr = 0xE0000;
*/
t = RAM_UMAMEM; /* 384KB */
pclog("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
isamem_log("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
/* Update and enable the remap. */
mem_mapping_del(&ram_remapped_mapping);
@@ -539,7 +570,7 @@ dev->frame_addr = 0xE0000;
*/
if (AT && addr > 0 && tot > 0) {
t = tot;
pclog("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
isamem_log("ISAMEM: RAM at %05iKB (%iKB)\n", addr>>10, t>>10);
/* Create, initialize and enable the high-memory mapping. */
mem_mapping_add(&dev->high_mapping, addr, t,
@@ -568,11 +599,11 @@ dev->frame_addr = 0xE0000;
dev->ems_start = ptr - dev->ram;
dev->ems_size = t >> 10;
dev->ems_pages = t / EMS_PGSIZE;
pclog("ISAMEM: EMS enabled, I/O=%04xH, %iKB (%i pages)",
isamem_log("ISAMEM: EMS enabled, I/O=%04xH, %iKB (%i pages)",
dev->base_addr, dev->ems_size, dev->ems_pages);
if (dev->frame_addr > 0)
pclog(", Frame=%05XH", dev->frame_addr);
pclog("\n");
isamem_log(", Frame=%05XH", dev->frame_addr);
isamem_log("\n");
/*
* For each supported page (we can have a maximum of 4),