80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

device/isamem.c: Fix the two bugs reported by lemondrops.

Browse Source
This commit is contained in:
OBattler
2024-06-07 18:21:55 +02:00
parent 86de260b24
commit dc7b93dc04
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/device/isamem.c
View File

@@ -478,6 +478,8 @@ isamem_init(const device_t *info)
uint32_t t; uint32_t t;
uint32_t addr; uint32_t addr;
uint32_t tot; uint32_t tot;
/* EMS 3.2 cannot have more than 2048KB per board. */
uint32_t ems_max = EMS_MAXSIZE;
uint8_t *ptr; uint8_t *ptr;
/* Find our device and create an instance. */ /* Find our device and create an instance. */
@@ -527,6 +529,8 @@ isamem_init(const device_t *info)
break; break;
case ISAMEM_EV159_CARD: /* Everex EV-159 RAM 3000 */ case ISAMEM_EV159_CARD: /* Everex EV-159 RAM 3000 */
/* The EV-159 cannot have more than 3072KB per board. */
ems_max = EMS_EV159_MAXSIZE;
dev->base_addr[0] = device_get_config_hex16("base"); dev->base_addr[0] = device_get_config_hex16("base");
dev->base_addr[1] = device_get_config_hex16("base2"); dev->base_addr[1] = device_get_config_hex16("base2");
dev->total_size = device_get_config_int("size"); dev->total_size = device_get_config_int("size");
@@ -575,13 +579,16 @@ isamem_init(const device_t *info)
dev->flags |= FLAG_FAST; dev->flags |= FLAG_FAST;
break; break;
case ISAMEM_BRXT_CARD: /* BocaRAM/XT */
case ISAMEM_LOTECH_CARD: /* Lotech EMS */ case ISAMEM_LOTECH_CARD: /* Lotech EMS */
/* The Lotech EMS cannot have more than 4096KB per board. */
ems_max = EMS_LOTECH_MAXSIZE;
case ISAMEM_BRXT_CARD: /* BocaRAM/XT */
dev->base_addr[0] = device_get_config_hex16("base"); dev->base_addr[0] = device_get_config_hex16("base");
dev->total_size = device_get_config_int("size"); dev->total_size = device_get_config_int("size");
dev->start_addr = 0; dev->start_addr = 0;
dev->frame_addr[0] = device_get_config_hex20("frame"); dev->frame_addr[0] = device_get_config_hex20("frame");
dev->flags |= (FLAG_EMS | FLAG_CONFIG); dev->flags |= (FLAG_EMS | FLAG_CONFIG);
break;
default: default:
break; break;
@@ -733,19 +740,13 @@ isamem_init(const device_t *info)
/* If EMS is enabled, use the remainder for EMS. */ /* If EMS is enabled, use the remainder for EMS. */
if (dev->flags & FLAG_EMS) { if (dev->flags & FLAG_EMS) {
t = k; t = k;
if ((dev->board == ISAMEM_LOTECH_CARD) && (t > EMS_LOTECH_MAXSIZE))
/* The Lotech EMS cannot have more than 4096KB per board. */ if (t > ems_max)
t = EMS_LOTECH_MAXSIZE; t = ems_max;
else if ((dev->board == ISAMEM_EV159_CARD) && (t > EMS_EV159_MAXSIZE))
/* The EV-159 cannot have more than 3072KB per board. */
t = EMS_EV159_MAXSIZE;
else if (t > EMS_MAXSIZE)
/* EMS 3.2 cannot have more than 2048KB per board. */
t = EMS_MAXSIZE;
/* Set up where EMS begins in local RAM, and how much we have. */ /* Set up where EMS begins in local RAM, and how much we have. */
dev->ems_start[0] = ptr - dev->ram; dev->ems_start[0] = ptr - dev->ram;
if ((dev->board == ISAMEM_EV159_CARD) && (t > 2048)) { if ((dev->board == ISAMEM_EV159_CARD) && (t > (2 << 20))) {
dev->ems_size[0] = 2 << 10; dev->ems_size[0] = 2 << 10;
dev->ems_pages[0] = (2 << 20) / EMS_PGSIZE; dev->ems_pages[0] = (2 << 20) / EMS_PGSIZE;
} else { } else {