X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=9fabd9be60af74cd1001c5c27c695c6d0435ebe6;hb=52fab2ff9ef6a39ed9303b0df1ce0ad9c9180ef1;hp=03df02377c4c8e6c20d801e6b12ccfcefc5f811d;hpb=c9ea53d56f793c6abcf528c20590c02804dde275;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 03df0237..9fabd9be 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -153,62 +153,28 @@ 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)
 {
 	int		i;
-	//long	size;
+#ifdef __PM__NOHOGEMS__
+	long	size;
+#endif
 	byte	err=0, str[64];
 
 	boolean errorflag=false;
-	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
-	unsigned int EMSVer = 0;
-	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0;
-#ifdef __DEBUG_PM__
-	word e=0;
-#endif
-	totalEMSpages = freeEMSpages = EMSPageFrame = 0;
+	unsigned	EMSVer;
+	unsigned	totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;
+	totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0;	// set all to 0~
 	gvar->pm.emm.EMSPresent = false;			// Assume that we'll fail
-	gvar->pm.emm.EMSAvail = 0;
-	gvar->mmi.EMSmem = 0;
+	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
-#ifdef __DEBUG_PM__
-		add	e,1
-#endif
-		mov	bx,ax
-		mov	ax,0x4400
-
-		int	EMM_INT		// get device info
-		jc	error1
-#ifdef __DEBUG_PM__
-		add	e,1
-#endif
-		and	dx,0x80
-		jz	error1
-#ifdef __DEBUG_PM__
-		add	e,1
-#endif
-		mov	ax,0x4407
-
-		int	EMM_INT		// get status
-		jc	error1
-		or	al,al
-		jz	error1
-#ifdef __DEBUG_PM__
-		add	e,1
-#endif
-		mov	ah,0x3e
-		int	EMM_INT		// close handle
-		jc	error1
-#ifdef __DEBUG_PM__
-		add	e,1
-#endif
+		//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
@@ -217,7 +183,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		int	EMS_INT			// only work on EMS 3.2 or greater (silly, but...)
 		or	ah,ah
 		jnz	error1
-		mov	[EMSVer],ax		//	set EMSVer
+		mov	[EMSVer],ax		// set EMSVer
 		cmp	al,0x32			// only work on ems 3.2 or greater
 		jb	error1
 
@@ -238,20 +204,17 @@ PML_StartupEMS(global_game_variables_t *gvar)
 		mov	[totalEMSpages],dx
 		mov	[freeEMSpages],bx
 		mov	[EMSAvail],bx
-		jmp End1
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
 	error1:
 #ifdef __BORLANDC__
 	__asm {
-#endif
-#ifdef __DEBUG_PM__
-		mov	e,1
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp End1
+		jmp	End1
 #ifdef __BORLANDC__
 	}
 #endif
@@ -260,7 +223,7 @@ End1:
 #ifdef __WATCOMC__
 	}
 #endif
-/*
+#ifdef __PM__NOHOGEMS__
 	if(errorflag==false)
 	{
 		// Don't hog all available EMS
@@ -271,7 +234,7 @@ End1:
 			gvar->pm.emm.EMSAvail = size / EMSPageSize;
 		}
 	}
-*/
+#endif
 	__asm {
 		mov	ah,EMS_ALLOCPAGES
 		mov	bx,[EMSAvail];
@@ -286,41 +249,29 @@ End1:
 	error2:
 #ifdef __BORLANDC__
 	__asm {
-#endif
-#ifdef __DEBUG_PM__
-		mov	e,1
 #endif
 		mov	err,ah
 		mov	errorflag,1
-		jmp End2
+		jmp	End2
 #ifdef __BORLANDC__
-	}
+	}//end of assembly
 #endif
 End2:
 #ifdef __WATCOMC__
-	}
+	}//end of assembly
 #endif
-
-	if(errorflag==false)
-	{
-	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
-
-	// Initialize EMS mapping cache
-	for (i = 0;i < EMSFrameCount;i++)
-		gvar->pm.emm.EMSList[i].baseEMSPage = -1;
-
-	}
-	else
+	if(errorflag==true)
 	{
 		strcpy(str,"PML_StartupEMS: EMS error ");
 		MM_EMSerr(str, err);
 		printf("%s\n",str);
-#ifdef __DEBUG_PM__
-		printf("e=%u\n", e);
-		getch();
-#endif
 		return(gvar->pm.emm.EMSPresent);
 	}
+	gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;
+
+	// Initialize EMS mapping cache
+	for (i = 0;i < EMSFrameCount;i++)
+		gvar->pm.emm.EMSList[i].baseEMSPage = -1;
 
 	gvar->pm.emm.EMSPresent = true;			// We have EMS
 	gvar->pm.emm.EMSPageFrame = EMSPageFrame;
@@ -852,8 +803,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;
@@ -872,14 +822,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");
@@ -888,7 +838,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;
@@ -901,7 +851,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);
 }
 
 //
@@ -914,8 +864,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);
 	}
 }
 
@@ -1257,7 +1207,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
@@ -1267,7 +1217,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)))
 	{
@@ -1285,7 +1235,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
@@ -1296,7 +1246,8 @@ if (!gvar->pm.PMPages[pagenum].offset)	// JDC: sparse page
 		out	dx,al
 		mov	al,0x20	// normal
 		out	dx,al
-#endif
+	}
+//#endif
 
 	return(result);
 }
@@ -1580,7 +1531,7 @@ PM_Shutdown(global_game_variables_t *gvar)
 	if (!gvar->pm.PMStarted)
 		return;
 
-	//PML_ClosePageFile(gvar);
+	//0000+=+=PML_ClosePageFile(gvar);
 
 	PML_ShutdownMainMem(gvar);
 }