X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=963eb3a45ef98129ccb46ea87890ca03cd5f5bfc;hb=f1cf981c40115d1c81698fe156905ef25fd80c3f;hp=7425fc93b89c9affa2a8b5a9e0df79ae3493283c;hpb=e0806081573e79828c100893f396dadc9d909f99;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
old mode 100644
new mode 100755
index 7425fc93..963eb3a4
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -23,11 +23,9 @@
 
 #include <string.h>
 #include <malloc.h>
-//#include <bios.h>
 #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
@@ -41,13 +39,13 @@
 
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=mm->mmfree;mm->mmfree=x;}
 
-
-#define SAVENEARHEAP	0//_memavl()/4		// space to leave in data segment
+#define SAVENEARHEAP	0x200		// space to leave in data segment
 #define SAVEFARHEAP	0//x400			// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
 
-#define MAXBLOCKS		720
+//moved to typdefst
+//#define MAXBLOCKS		1024
 
 
 
@@ -91,11 +89,11 @@
 
 //==========================================================================
 
-typedef struct
+//moved to typdefst
+/*typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
-	//__segment segu;
-} mminfotype;
+} mminfotype;*/
 
 //==========================================================================
 
@@ -118,16 +116,20 @@ extern void		(* XMSaddr) (void);		// far pointer to XMS driver
 #define PURGEMASK	0xfffc
 #define BASEATTRIBUTES	0	// unlocked, non purgable
 
-#define MAXUMBS		12
+//moved to typedefst
+//#define MAXUMBS		12
 #define MAPPAGES		4//mm->EMSpagesmapped
 
-typedef struct mmblockstruct
+//moved to typdefst
+/*typedef struct mmblockstruct
 {
-	//word	start,length;
-	word	start;	dword length;
+	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;
 
 
@@ -135,16 +137,22 @@ typedef struct
 {
 	memptr bufferseg;
 	boolean		mmstarted, bombonerror, mmerror;
-	void huge	*farheap;
+	//huge void huge	*farheap;
+	void far	*farheap;
+#ifdef __BORLANDC__
+	void	*nearheap;
+#endif
+#ifdef __WATCOMC__
 	void __near	*nearheap;
+#endif
 	//byte		EMS_status;
 	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;
-} mminfo_t;
+	//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;*/
 
 /*
 =============================================================================
@@ -173,7 +181,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);
@@ -184,7 +192,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm);
 void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm);
 void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm);
 void MM_SortMem(mminfo_t *mm);
-void MM_ShowMemory(/*page_t *page, */mminfo_t *mm);
+void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm);
 void MM_DumpData(mminfo_t *mm);
 dword MM_UnusedMemory(mminfo_t *mm);
 dword MM_TotalFree(mminfo_t *mm);