16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index f7927dbc020a1195cf3ce127fb8d15f8a115d9a0..c5e89a2b2869eaac574c18e4dc4e09612e0bc4f8 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -18,21 +18,18 @@
 \r
 // ID_MM.H\r
 \r
-#ifndef __16_EXMM__\r
-#define __16_EXMM__\r
+#ifndef __16_MM__\r
+#define __16_MM__\r
 \r
 #include <string.h>\r
-#include <malloc.h>\r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_hc.h"\r
 #include "src/lib/16_tail.h"\r
-//++++mh       #include "src/lib/16_in.h"\r
 \r
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final\r
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"\r
-extern boolean dbg_debugpm;\r
 #else\r
-#define OUT_OF_MEM_MSG "\npee\n"\r
+#define OUT_OF_MEM_MSG "\n"\r
 #endif\r
 \r
 //#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}\r
@@ -41,18 +38,18 @@ extern boolean dbg_debugpm;
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}\r
 \r
 #define SAVENEARHEAP   0x200           // space to leave in data segment\r
-#define SAVEFARHEAP    0//x400                 // space to leave in far heap\r
+#define SAVEFARHEAP    0x400                   // space to leave in far heap\r
 \r
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer\r
 \r
-//moved to typdefst\r
+//moved to 16_tdef.h\r
 //#define MAXBLOCKS            1024\r
 \r
 \r
-\r
 //--------\r
 \r
 #define        EMS_INT                 0x67\r
+#define        EMM_INT                 0x21\r
 \r
 #define        EMS_STATUS              0x40\r
 #define        EMS_GETFRAME    0x41\r
@@ -107,6 +104,7 @@ extern      void            (* beforesort) (void);
 extern void            (* aftersort) (void);\r
 extern void            (* XMSaddr) (void);             // far pointer to XMS driver\r
 extern dword   XMSDriver;\r
+extern word            XMSVer;\r
 \r
 //==========================================================================\r
 \r
@@ -135,7 +133,6 @@ extern      dword   XMSDriver;
        word    blob;   //for data larger than 64k\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
-       //huge struct mmblockstruct huge *next;\r
        struct mmblockstruct far *next;\r
 } mmblocktype;\r
 \r
@@ -144,7 +141,6 @@ typedef struct
 {\r
        memptr bufferseg;\r
        boolean         mmstarted, bombonerror, mmerror;\r
-       //huge void huge        *farheap;\r
        void far        *farheap;\r
 #ifdef __BORLANDC__\r
        void    *nearheap;\r
@@ -157,7 +153,6 @@ typedef struct
        unsigned int EMSVer;\r
        word numUMBs,UMBbase[MAXUMBS];\r
        //dword numUMBs,UMBbase[MAXUMBS];\r
-       //huge mmblocktype      huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;\r
        mmblocktype     far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;\r
 } mminfo_t;*/\r
 \r