X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=de35b428b6197884a9ead179cce0d1e9c0e388ad;hb=9f7214fd9c7455cdde58349d0be24c4bd0343ab5;hp=ab35ce6071c05ed1d6f6a943a90e9eef25110354;hpb=54e82e70b7b402a7aa8e08cf99844c10bc9e89c3;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
old mode 100644
new mode 100755
index ab35ce60..de35b428
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -26,7 +26,6 @@
 #include "src/lib/16_head.h"
 #include "src/lib/16_hc.h"
 //#include "src/lib/modex16.h"
-//#include "src/lib/16_ca.h"
 //++++mh	#include "src/lib/16_in.h"
 
 #ifdef __DEBUG__		// 1 == Debug/Dev  ;  0 == Production/final
@@ -36,19 +35,9 @@
 #endif
 
 //#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}
-#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;mm->endid++;}
+#define GETNEWBLOCK {if(!mm->mmfree)MML_ClearBlock(mm);mm->mmnew=mm->mmfree;mm->mmfree=mm->mmfree->next;}
 
-#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;mm->endid--;}
-
-#define AARED		"\x1b[41;31m"
-#define AABLUE		"\x1b[44;34m"
-#define AAGREEN	"\x1b[42;32m"
-#define AAYELLOW	"\x1b[43;33m"
-#define AAGREY		"\x1b[47;37m"
-#define AABLACK	"\x1b[40;30m"
-#define AAWHITE		"\x1b[47;37m"
-#define AAMAGENTA	"\x1b[45;35m"
-#define AARESET	"\x1b[0m"
+#define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
 
 #define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP	0//x400			// space to leave in far heap
@@ -130,12 +119,13 @@ extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 
 typedef struct mmblockstruct
 {
-	//word	start,length;
-	word	start;	dword length;
-	word	blob;	//fore data larger than 64k
+	word	start,length;
+	//word	start;	dword length;
+	word	blob;	//for data larger than 64k
 	unsigned	attributes;
 	memptr		*useptr;	// pointer to the segment start
-	struct mmblockstruct huge *next;
+	//huge struct mmblockstruct huge *next;
+	struct mmblockstruct far *next;
 } mmblocktype;
 
 
@@ -143,7 +133,8 @@ typedef struct
 {
 	memptr bufferseg;
 	boolean		mmstarted, bombonerror, mmerror;
-	void huge	*farheap;
+	//huge void huge	*farheap;
+	void far	*farheap;
 #ifdef __BORLANDC__
 	void	*nearheap;
 #endif
@@ -154,9 +145,9 @@ typedef struct
 	unsigned	totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;
 	unsigned int EMSVer;
 	word numUMBs,UMBbase[MAXUMBS];
-	word	endid;	//end of list
 	//dword	numUMBs,UMBbase[MAXUMBS];
-	mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
+	//huge mmblocktype	huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;
+	mmblocktype	far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;
 } mminfo_t;
 
 /*
@@ -186,7 +177,7 @@ byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi);
 boolean MML_CheckForXMS(mminfo_t *mm);
 void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);
 void MML_ShutdownXMS(mminfo_t *mm);
-void MML_UseSpace(/*d*/word segstart, dword seglength, mminfo_t *mm);
+void MML_UseSpace(word segstart, dword seglength, mminfo_t *mm);
 void MML_ClearBlock(mminfo_t *mm);
 
 void MM_Startup(mminfo_t *mm, mminfotype *mmi);