X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=858bd4b9fe121208edf5393ae64f714c4596978a;hb=ce3c236194323bcbc331bad4a059ea95fb6c7947;hp=f4e150822cfcbd2de679684a4a82fa23705a2315;hpb=dfbeccb03ffc0950d412e283c64a50b1aa49230c;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index f4e15082..858bd4b9 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -153,6 +153,9 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 //		If there's more than our minimum (2 pages) available, allocate it (up
 //			to the maximum we need)
 //
+//	Please call MML_CheckForEMS() before calling this function.
+//	MML_CheckForEMS is not local despite the name wwww.
+//
 
 boolean
 PML_StartupEMS(global_game_variables_t *gvar)
@@ -164,7 +167,6 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	byte	err=0, str[64];
 
 	boolean errorflag=false;
-	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
 	unsigned	EMSVer;
 	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;
 	totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0;	// set all to 0~
@@ -172,31 +174,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0;
 
 	__asm {
-		mov	dx,OFFSET emmname	//fix by andrius4669
-		mov	ax,0x3d00
-		int	EMM_INT		// try to open EMMXXXX0 device
-		jc	error1
-
-		mov	bx,ax
-		mov	ax,0x4400
-
-		int	EMM_INT		// get device info
-		jc	error1
-
-		and	dx,0x80
-		jz	error1
-
-		mov	ax,0x4407
-
-		int	EMM_INT		// get status
-		jc	error1
-		or	al,al
-		jz	error1
-
-		mov	ah,0x3e
-		int	EMM_INT		// close handle
-		jc	error1
-
+		//MML_CheckForEMS() takes care of what the code did here
 		mov	ah,EMS_STATUS
 		int	EMS_INT
 		jc	error1			// make sure EMS hardware is present
@@ -529,7 +507,6 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 	if (!addr)
 	{
 		Quit (gvar, "PML_XMSCopy: zero address\n");
-		//return;
 	}
 
 	xoffset = (dword)xmspage * PMPageSize;
@@ -643,8 +620,10 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 	for (i = 0;i < PMMaxMainMem;i++)
 	{
 #ifdef __DEBUG_PM__
+#ifdef __DEBUG_PM_MAIN__
 		printf("PM_SetMainMemPurge()	info of gvar->pm.mm.MainMemPages[i]\n");
 		printf("&	%Fp,	%Fp\n", &gvar->pm.mm.MainMemPages[i],	&(gvar->pm.mm.MainMemPages[i]));
+#endif
 #endif
 		if (gvar->pm.mm.MainMemPages[i])
 			MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);
@@ -825,8 +804,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 {
 	int				i;
 	long			size;
-				//__SEGA buf;
-	memptr		buf;
+	void			_seg *buf;
 	dword		far *offsetptr;
 	word			far *lengthptr;
 	PageListStruct	far *page;
@@ -845,14 +823,14 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 
 	// Allocate and clear the page list
 	gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;
-	MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);
-	MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);
+	MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);
+	MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar);
 	gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;
 	_fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);
 
 	// Read in the chunk offsets
 	size = sizeof(dword) * gvar->pm.fi.ChunksInFile;
-	MM_GetPtr(&buf, size, gvar);
+	MM_GetPtr((memptr *)&buf, size, gvar);
 	if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))
 	{
 		Quit (gvar, "PML_OpenPageFile: Offset read failed");
@@ -861,7 +839,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	offsetptr = (dword far *)buf;
 	for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)
 		page->offset = *offsetptr++;
-	MM_FreePtr(&buf, gvar);
+	MM_FreePtr((memptr *)&buf, gvar);
 
 	// Read in the chunk lengths
 	size = sizeof(word) * gvar->pm.fi.ChunksInFile;
@@ -874,7 +852,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 	lengthptr = (word far *)buf;
 	for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)
 		page->length = *lengthptr++;
-	MM_FreePtr(&buf, gvar);
+	MM_FreePtr((memptr *)&buf, gvar);
 }
 
 //
@@ -887,8 +865,8 @@ PML_ClosePageFile(global_game_variables_t *gvar)
 		close(gvar->pm.fi.PageFile);
 	if (gvar->pm.PMSegPages)
 	{
-		MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);
-		MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);
+		MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);
+		MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);
 	}
 }
 
@@ -1230,7 +1208,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 	if (pagenum >= gvar->pm.fi.ChunksInFile)
 		Quit (gvar, "PM_GetPage: Invalid page request");
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm {
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1240,7 +1218,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
 		mov	al,10	// bright green
 		out	dx,al
 	}
-#endif
+//#endif
 
 	if (!(result = PM_GetPageAddress(pagenum, gvar)))
 	{
@@ -1258,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 	}
 	gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;
 
-#ifdef __DEBUG_2__	// for debugging
+//#ifdef __DEBUG_2__	// for debugging
 	__asm{
 		mov	dx,STATUS_REGISTER_1
 		in	al,dx
@@ -1269,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 		out	dx,al
 		mov	al,0x20	// normal
 		out	dx,al
-#endif
+	}
+//#endif
 
 	return(result);
 }
@@ -1553,7 +1532,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	//PML_ClosePageFile(gvar);
+	//0000+=+=PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }