ok!

[16.git] / src / lib / 16_mm.c

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c7577924c22be821048d3cc94505e5b047dc4b4b..fda0a9ddc8aa5eba65ab9f0efb5386426cac163e 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -140,7 +140,6 @@ byte MML_SetupEMS(mminfo_t *mm)
        char    str[80];//,str2[10];
        byte    err;
        boolean errorflag=false;
-       union REGS CPURegs;
 
        unsigned int EMSVer = 0;
        //byte  EMS_status;
@@ -250,7 +249,7 @@ void MML_ShutdownEMS(mminfo_t *mm)
                mov     errorflag,1
                ok:
        }
-       if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!");      //++++ add something
+       if(errorflag==true) printf("MML_ShutdownEMS: Error freeing EMS!\n");    //++++ add something
 }
 
 /*
@@ -265,17 +264,16 @@ void MML_ShutdownEMS(mminfo_t *mm)
 ====================
 */
 
-byte MM_MapEMS(mminfo_t *mm)
+byte MM_MapEMS(mminfo_t *mm, mminfotype *mmi)
 {
-       char    str[80];//,str2[10];
-       unsigned        /*err, */EMShandle;
+       char    str[80];
+       unsigned        EMShandle;
        byte err;
        boolean errorflag=false;
        int     i;
-       union REGS CPURegs;
        EMShandle=mm->EMShandle;
 
-       for (i=0;i<MAPPAGES;i++)
+       for (i=0;i<4/*MAPPAGES*/;i++)
        {
                __asm
                {
@@ -304,10 +302,11 @@ byte MM_MapEMS(mminfo_t *mm)
                        return err;
                }
        }
+       mmi->EMSmem = (i)*0x4000lu;
        return 0;
 }
 
-void MM_MapXEMS(mminfo_t *mm)
+byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi)
 {
 
 //SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)\r
@@ -332,6 +331,47 @@ void MM_MapXEMS(mminfo_t *mm)
 //     EMS.Error = (Regs.ax AND &HFF00&) \ &H100  //Store the status code\r
 \r
 //END SUB
+       char    str[80];
+       byte err;
+       word    EMShandle;
+       boolean errorflag=false;
+       int     i;
+       EMShandle=mm->EMShandle;
+
+       if(mm->EMSVer<0x40)
+               return 5;
+
+       for (i=0;i<MAPPAGES;i++)
+       {
+               __asm
+               {
+                       mov     ax,EMS_MAPXPAGE
+                       mov     cx,[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_MapXEMS: 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;
+               }
+       }
+       mmi->EMSmem = (i)*0x4000lu;
+       return 0;
 }
 
 //==========================================================================
@@ -660,7 +700,7 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
 //
 // detect EMS and allocate up to 64K at page frame
 //
-       printf("EMS!\n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");       //bug!
+       printf("EMS1\n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");       //bug!
        mmi->EMSmem = 0;
        for(i = 1;i < __argc;i++)
        {
@@ -670,16 +710,17 @@ void MM_Startup(mminfo_t *mm, mminfotype *mmi)
        printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");     //bug!
        if(MML_CheckForEMS())
        {
-printf("EMS1\n");
-               MML_SetupEMS(mm);                                       // allocate space
 printf("EMS2\n");
+               MML_SetupEMS(mm);                                       // allocate space
+printf("EMS3\n");
                printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");     //bug!
                //TODO: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!
                MML_UseSpace(mm->EMSpageframe,(MAPPAGES)*0x4000lu, mm);
-printf("EMS3\n");
-               MM_MapEMS(mm);                                  // map in used pages
 printf("EMS4\n");
-               mmi->EMSmem = (MAPPAGES)*0x4000lu;
+               if(mm->EMSVer<0x40)
+                       MM_MapEMS(mm, mmi);                                     // map in used pages
+               else
+                       MM_MapXEMS(mm, mmi);                                    // map in used pages
        }
 
 //