From f3c21c71444277afd8389f577439ab655620ce51 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 27 Sep 2016 13:49:49 -0500 Subject: [PATCH] ====PM WORKS! XMS PORTING IS NEXT! BCEXMM is broke==== --- src/lib/16_mm.c | 3 +-- src/lib/16_pm.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 8d93438a..561c67f1 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -345,7 +345,6 @@ byte MM_MapEMS(global_game_variables_t *gvar) } } gvar->mmi.EMSmem = (i)*0x4000lu; - //printf(" gvar->mmi.EMSmem=%lu\n", gvar->mmi.EMSmem); return 0; } @@ -1628,7 +1627,7 @@ void MM_Report_(global_game_variables_t *gvar) printf(" XMSaddr: %X\n", *XMSaddr); } printf("near: %lu ", gvar->mmi.nearheap); printf("far: %lu\n", gvar->mmi.farheap); if(MML_CheckForEMS()) - printf("EMSmem: %lu ", gvar->pm.emm.EMSAvail/*gvar->mmi.EMSmem*/); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); + printf("EMSmem: %lu ", gvar->mmi.EMSmem); if(MML_CheckForXMS(gvar)) printf("XMSmem: %lu", gvar->mmi.XMSmem); printf("\n"); //printf("mainmem: %lu\n", gvar->mmi.mainmem); printf("Total convmem: %lu ", gvar->mmi.mainmem); printf("TotalFree: %lu ", MM_TotalFree(gvar)); printf("TotalUsed: %lu\n", gvar->mmi.mainmem+gvar->mmi.EMSmem+gvar->mmi.XMSmem+gvar->mmi.XMSmem); printf(" UnusedMemory: %lu\n", MM_UnusedMemory(gvar)); diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 848af9c8..75ad2aae 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -150,6 +150,7 @@ PML_StartupEMS(global_game_variables_t *gvar) totalEMSpages = freeEMSpages = EMSPageFrame = 0; gvar->pm.emm.EMSPresent = false; // Assume that we'll fail gvar->pm.emm.EMSAvail = 0; + gvar->mmi.EMSmem = 0; __asm { mov dx,OFFSET emmname //fix by andrius4669 -- 2.39.5