it displays the actual error now~

[16.git] / src / lib / 16_mm.h

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 794865c35a207f580954f31121b6f0a3486ce7de..a665b22436c5c128bc21d7d6b38a8ae2c6f03880 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -35,7 +35,6 @@
 #define OUT_OF_MEM_MSG "\npee\n"
 #endif
 
-//#define VIDMEMP2                     12800   // size of 2nd video memory blob
 
 #define SAVENEARHEAP   0x200           // space to leave in data segment
 #define SAVEFARHEAP            0                       // space to leave in far heap
@@ -45,6 +44,7 @@
 #define MAXBLOCKS              600
 
 
+
 //--------
 
 #define        EMS_INT                 0x67
@@ -114,7 +114,7 @@ extern void         (* XMSaddr) (void);             // far pointer to XMS driver
 #define BASEATTRIBUTES 0       // unlocked, non purgable
 
 #define MAXUMBS                12
-#define MAPPAGES               4/*mm->EMSpagesmapped*/
+#define MAPPAGES               mm->EMSpagesmapped
 
 typedef struct mmblockstruct
 {
@@ -135,7 +135,7 @@ typedef struct
        boolean         mmstarted, bombonerror, mmerror;
        void huge       *farheap;
        void            *nearheap;
-       byte            EMSstatus;
+       //byte          EMS_status;
        unsigned        totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
        unsigned int EMSVer;
        word numUMBs,UMBbase[MAXUMBS];
@@ -163,9 +163,9 @@ typedef struct
 //==========================================================================
 
 boolean MML_CheckForEMS(void);
-unsigned MML_SetupEMS(mminfo_t *mm);
+byte MML_SetupEMS(mminfo_t *mm);
 void MML_ShutdownEMS(mminfo_t *mm);
-unsigned MM_MapEMS(mminfo_t *mm);
+byte MM_MapEMS(mminfo_t *mm);
 boolean MML_CheckForXMS(mminfo_t *mm);
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);
 void MML_ShutdownXMS(mminfo_t *mm);