X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=24f78c5bd67e5499be869a796f1f7b99b59a22d0;hb=fa6e5edb63e179496bf10150ec3a14715d852101;hp=d6ce8743a5679958cc8c5d7da3e762f4278dbe86;hpb=cb6c00f1a3dc82e68b0b35d4dcaf92fc47c14671;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index d6ce8743..24f78c5b 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -135,10 +135,10 @@ boolean MML_CheckForEMS(void)
 =======================
 */
 
-unsigned MML_SetupEMS(mminfo_t *mm)
+byte MML_SetupEMS(mminfo_t *mm)
 {
-	char	str[80],str2[10];
-	unsigned	err;
+	char	str[80];//,str2[10];
+	byte	err;
 	boolean errorflag=false;
 	union REGS CPURegs;
 
@@ -199,6 +199,7 @@ getpages:
 		mov	[EMShandle],dx
 		jmp End
 error:
+		mov	err,ah
 		mov	errorflag,1
 		jmp End
 noEMS:
@@ -206,11 +207,12 @@ End:
 	}
 	if(errorflag==true)
 	{
-		err = CPURegs.h.ah;
+		//err = CPURegs.h.ah;
 		strcpy(str,"MML_SetupEMS: EMS error 0x");
-		itoa(err,str2,16);
-		strcpy(str,str2);
-		printf("%s\n",str);
+		//itoa(err,str2,16);
+		//strcat(str,&err);
+		//printf("%s\n",str);
+		printf("%s%x\n",str,err);
 		return err;
 	}
 	mm->totalEMSpages=totalEMSpages;
@@ -263,16 +265,17 @@ void MML_ShutdownEMS(mminfo_t *mm)
 ====================
 */
 
-unsigned MM_MapEMS(mminfo_t *mm)
+byte MM_MapEMS(mminfo_t *mm)
 {
-	char	str[80],str2[10];
-	unsigned	err, EMShandle;
+	char	str[80];//,str2[10];
+	unsigned	/*err, */EMShandle;
+	byte err;
 	boolean	errorflag=false;
 	int	i;
 	union REGS CPURegs;
 	EMShandle=mm->EMShandle;
 
-	for (i=0;i<4/*mm->EMSpagesmapped*/;i++)
+	for (i=0;i<MAPPAGES;i++)
 	{
 		__asm
 		{
@@ -285,24 +288,26 @@ unsigned MM_MapEMS(mminfo_t *mm)
 			jnz	error
 			jmp End
 			error:
+			mov	err,ah
 			mov	errorflag,1
 			End:
 		}
 		if(errorflag==true)
 		{
-			err = CPURegs.h.ah;
+			//err = CPURegs.h.ah;
 			strcpy(str,"MM_MapEMS: EMS error 0x");
-			itoa(err,str2,16);
-			strcpy(str,str2);
+			//itoa(err,str2,16);
+			//strcat(str,&err);
 			//printf("%s\n",str);
-			printf("FACK! %u\n", err);
+			printf("%s%x\n",str, err);
+			//printf("FACK! %x\n", err);
 			return err;
 		}
 	}
 	return 0;
 }
 
-void MM_MapXEMS(mminfo_t *mm)
+byte MM_MapXEMS(mminfo_t *mm)
 {
 
 //SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)
@@ -327,6 +332,46 @@ void MM_MapXEMS(mminfo_t *mm)
 //	EMS.Error = (Regs.ax AND &HFF00&) \ &H100  //Store the status code
 
 //END SUB
+/*
+char	str[80];//,str2[10];
+	unsigned	EMShandle;
+	byte err;
+	boolean	errorflag=false;
+	int	i;
+	union REGS CPURegs;
+	EMShandle=mm->EMShandle;
+
+	for (i=0;i<MAPPAGES;i++)
+	{
+		__asm
+		{
+			mov	ah,EMS_MAPPAGE
+			mov	bx,[i]			// logical page
+			mov	al,bl			// physical page
+			mov	dx,[EMShandle]	// handle
+			int	EMS_INT
+			or	ah,ah
+			jnz	error
+			jmp End
+			error:
+			mov	err,ah
+			mov	errorflag,1
+			End:
+		}
+		if(errorflag==true)
+		{
+			//err = CPURegs.h.ah;
+			strcpy(str,"MM_MapEMS: EMS error 0x");
+			//itoa(err,str2,16);
+			//strcat(str,&err);
+			//printf("%s\n",str);
+			printf("%s%x\n",str, err);
+			//printf("FACK! %x\n", err);
+			return err;
+		}
+	}
+	return 0;
+*/
 }
 
 //==========================================================================