X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_pm.c;h=0d1e2bf9a60694f9c2c145f3eb960d3a918c0194;hb=ea48ceb9434adf5d2316adf51964582579e773d5;hp=9cbed569789fe81f98190ab2eb152af924206064;hpb=2fd9b2ce1016f4774c1e21d7432e6b95c02ad378;p=16.git

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 9cbed569..0d1e2bf9 100755
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -48,7 +48,8 @@ boolean dbg_debugpm=0;
 //	XMS specific variables
 	//boolean			XMSPresent;
 	//word			gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;
-	dword		XMSDriver;
+	dword			XMSDriver;	//hard to put in gvar
+	word				XMSVer;	//hard to put in gvar
 /*	int				gvar->pm.xmm.XMSProtectPage = -1;
 
 //	File specific variables
@@ -154,13 +155,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 	__asm {
 		mov	dx,OFFSET emmname	//fix by andrius4669
 		mov	ax,0x3d00
-		int	EMS_INT		// try to open EMMXXXX0 device
+		int	EMM_INT		// try to open EMMXXXX0 device
 		jc	error1
 
 		mov	bx,ax
 		mov	ax,0x4400
 
-		int	EMS_INT		// get device info
+		int	EMM_INT		// get device info
 		jc	error1
 
 		and	dx,0x80
@@ -168,13 +169,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 
 		mov	ax,0x4407
 
-		int	EMS_INT		// get status
+		int	EMM_INT		// get status
 		jc	error1
 		or	al,al
 		jz	error1
 
 		mov	ah,0x3e
-		int	EMS_INT		// close handle
+		int	EMM_INT		// close handle
 		jc	error1
 
 		mov	ah,EMS_STATUS
@@ -357,8 +358,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
 //TODO: translate the _REG into working assembly
 //#define STARTUPXMSASM
 	byte err;
-	word XMSAvail, XMSHandle;
-//++++	word XMSVer;
+	word XMSAvail, XMSHandle;//, XMSVer;
 	boolean errorflag=false;
 	word e=0;
 	gvar->pm.xmm.XMSPresent = false;					// Assume failure
@@ -375,14 +375,15 @@ PML_StartupXMS(global_game_variables_t *gvar)
 		int	XMS_INT							// Get address of XMS driver
 		mov	[WORD PTR XMSDriver],bx
 		mov	[WORD PTR XMSDriver+2],es		// function pointer to XMS driver
-//++++		mov	ah,0
-//++++		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
-//++++		mov	[XMSVer],ax
+
+		mov	ah,XMS_VERSION
+		call	[DWORD PTR XMSDriver]						//; Get XMS Version Number
+		mov	[XMSVer],ax
 		mov	e,2
 
 #ifdef STARTUPXMSASM
 		mov	ah,XMS_QUERYFREE			// Find out how much XMS is available
-		call	[DWORD PTR XMSDriver]//DWORD PTR
+		call	[DWORD PTR XMSDriver]
 		mov	XMSAvail,ax
 		or	ax,ax				// AJR: bugfix 10/8/92
 		jz	error1
@@ -420,8 +421,9 @@ End1:
 #endif
 
 #ifdef __DEBUG_PM__
-//++++	printf("XMSVer=%02X	", XMSVer);
+	printf("XMSVer=%02X	", XMSVer);
 	printf("XMSAvail=%u\n", XMSAvail);
+	getch();
 #endif
 	XMSAvail &= ~(PMPageSizeKB - 1);	// Round off to nearest page size
 	if (XMSAvail < (PMPageSizeKB * 2))	// Need at least 2 pages
@@ -433,7 +435,7 @@ End1:
 	__asm {
 		mov	dx,XMSAvail
 		mov	ah,XMS_ALLOC				// And do the allocation
-		call	[DWORD PTR XMSDriver]//DWORD PTR
+		call	[DWORD PTR XMSDriver]
 		mov	XMSHandle,dx
 		or	ax,ax				// AJR: bugfix 10/8/92
 		jz	error2
@@ -474,7 +476,7 @@ error:
 		gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;
 		gvar->pm.xmm.XMSAvail = XMSAvail;
 		gvar->pm.xmm.XMSHandle = XMSHandle;
-//++++		gvar->pm.xmm.XMSVer = XMSVer;
+		//gvar->pm.xmm.XMSVer = XMSVer;
 		gvar->pm.xmm.XMSPresent = true;
 #ifdef __DEBUG_PM__
 		printf("	XMSmem=%lu	XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);