X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.h;h=47c6118188fc31f6099a30f3f248b89de30de4ca;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=587e8800ea9f72c2781c93b0ceb7ae92e1f17477;hpb=181c6beee3d42da41fc53f44f0aa3e9315016ad2;p=16.git

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 587e8800..47c61181 100755
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -41,8 +41,8 @@
 
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}
 
-#define SAVENEARHEAP	0x200		// space to leave in data segment
-#define SAVEFARHEAP	0x400			// space to leave in far heap
+#define SAVENEARHEAP	0x400		// space to leave in data segment
+#define SAVEFARHEAP	0		// space to leave in far heap
 
 #define	BUFFERSIZE		0x1000		// miscelanious, allways available buffer
 
@@ -96,17 +96,18 @@
 
 //==========================================================================
 
-//moved to typdefst
+//typedef void _seg * memptr;	//moved to 16_t.h
+
 /*typedef struct
 {
 	dword	nearheap,farheap,EMSmem,XMSmem,mainmem;
-} mminfotype;*/
+} mminfotype;*/	//moved to 16_tdef.h
 
 //==========================================================================
 
 extern	void		(* beforesort) (void);
 extern	void		(* aftersort) (void);
-extern	void		(* XMSaddr) (void);		// far pointer to XMS driver
+//extern	void		(* XMSaddr) (void);		// far pointer to XMS driver
 extern	dword	XMSDriver;
 extern	word		XMSVer;
 
@@ -179,35 +180,37 @@ typedef struct
 
 //==========================================================================
 
-boolean MML_CheckForEMS(void);
+boolean MML_CheckForEMS (void);
 //byte MML_SetupEMS(mminfo_t *mm);
 //void MML_ShutdownEMS(mminfo_t *mm);
 //byte MM_MapEMS(global_game_variables_t *gvar);
 //byte MM_MapXEMS(global_game_variables_t *gvar);
-boolean MML_CheckForXMS(void);
+boolean MML_CheckForXMS (void);
 //void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);
 //void MML_ShutdownXMS(mminfo_t *mm);
-void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar);
+void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar);
 void MML_ClearBlock (global_game_variables_t *gvar);
 
-void MM_Startup(global_game_variables_t *gvar);
-void MM_Shutdown(global_game_variables_t *gvar);
-
-void MM_GetPtr(memptr *baseptr,dword size, global_game_variables_t *gvar);
-void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar);
-void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar);
-void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar);
-void MM_SortMem(global_game_variables_t *gvar);
-void MM_ShowMemory(global_game_variables_t *gvar);
-void MM_DumpData(global_game_variables_t *gvar);
-dword MM_UnusedMemory(global_game_variables_t *gvar);
-dword MM_TotalFree(global_game_variables_t *gvar);
-void MM_Report_(global_game_variables_t *gvar);
-/*static */void MM_EMSerr(byte *stri, byte err);
-void MM_BombOnError(boolean bomb, global_game_variables_t *gvar);
+void MM_Reset (global_game_variables_t *gvar);
+void MM_Startup (global_game_variables_t *gvar);
+void MM_Shutdown (global_game_variables_t *gvar);
+
+void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar);
+void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar);
+void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar);
+void MM_SetLock (memptr *baseptr, boolean locked, global_game_variables_t *gvar);
+void MM_SortMem (global_game_variables_t *gvar);
+void MM_ShowMemory (global_game_variables_t *gvar);
+//void MM_ShowMemoryDetail (unsigned x, unsigned y, unsigned w, unsigned q, sdword end, mmshowmemoryinfo_t *scaninfo, global_game_variables_t *gvar);
+void MM_DumpData (global_game_variables_t *gvar);
+dword MM_UnusedMemory (global_game_variables_t *gvar);
+dword MM_TotalFree (global_game_variables_t *gvar);
+void MM_Report_ (global_game_variables_t *gvar);
+/*static */void MM_EMSerr (byte *stri, byte err);
+void MM_BombOnError (boolean bomb, global_game_variables_t *gvar);
 //void MM_GetNewBlock(mminfo_t *mm);
 //void MM_FreeBlock(mmblocktype *x, mminfo_t *mm);
-void xms_call(byte v, global_game_variables_t *gvar);
+void xms_call (byte v, global_game_variables_t *gvar);
 
 //==========================================================================