]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_mm.c
ok!
[16.git] / src / lib / 16_mm.c
index f0c40f9ec4f53b210bba7444cc90f3a280c7fff5..fda0a9ddc8aa5eba65ab9f0efb5386426cac163e 100644 (file)
@@ -135,12 +135,11 @@ 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;
 
        unsigned int EMSVer = 0;
        //byte  EMS_status;
@@ -199,6 +198,7 @@ getpages:
                mov     [EMShandle],dx
                jmp End
 error:
+               mov     err,ah
                mov     errorflag,1
                jmp End
 noEMS:
@@ -206,11 +206,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;
@@ -248,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
 }
 
 /*
@@ -263,16 +264,16 @@ void MML_ShutdownEMS(mminfo_t *mm)
 ====================
 */
 
-unsigned 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/*4mm->EMSpagesmapped*/;i++)
+       for (i=0;i<4/*MAPPAGES*/;i++)
        {
                __asm
                {
@@ -285,51 +286,92 @@ 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;
                }
        }
+       mmi->EMSmem = (i)*0x4000lu;
        return 0;
 }
 
-/*
-SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)\r
+byte MM_MapXEMS(mminfo_t *mm, mminfotype *mmi)
+{
+
+//SUB EMS.MapXPages (PhysicalStart, LogicalStart, NumPages, Handle)\r
 \r
-  'Maps up to 4 logical EMS pages to physical pages in the page frame, where:\r
-  '\r
-  'PhysicalStart = Physical page first logical page is mapped to\r
-  'LogicalStart  = First logical page to map\r
-  'NumPages      = Number of pages to map (1 to 4)\r
-  'Handle        = EMS handle logical pages are allocated to\r
+       //Maps up to 4 logical EMS pages to physical pages in the page frame, where:\r
+       //PhysicalStart = Physical page first logical page is mapped to\r
+       //LogicalStart  = First logical page to map\r
+       //NumPages      = Number of pages to map (1 to 4)\r
+       //Handle        = EMS handle logical pages are allocated to\r
 \r
-  'Create a buffer containing the page information\r
-  FOR x = 0 TO NumPages - 1\r
-    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)\r
-  NEXT\r
+  /*//Create a buffer containing the page information\r
+//  FOR x = 0 TO NumPages - 1\r
+//    MapInfo$ = MapInfo$ + MKI$(LogicalStart + x) + MKI$(PhysicalStart + x)\r
+//  NEXT*/\r
 \r
-  Regs.ax = &H5000                           'Map the pages in the buffer\r
-  Regs.cx = NumPages                         'to the pageframe\r
-  Regs.dx = Handle\r
-  Regs.ds = VARSEG(MapInfo$)\r
-  Regs.si = SADD(MapInfo$)\r
-  InterruptX &H67, Regs, Regs\r
-  EMS.Error = (Regs.ax AND &HFF00&) \ &H100  'Store the status code\r
+//  Regs.ax = &H5000                           //Map the pages in the buffer\r
+//  Regs.cx = NumPages                         //to the pageframe\r
+//  Regs.dx = Handle\r
+//  Regs.ds = VARSEG(MapInfo$)\r
+//  Regs.si = SADD(MapInfo$)\r
+//  InterruptX &H67, Regs, Regs\r
+//     EMS.Error = (Regs.ax AND &HFF00&) \ &H100  //Store the status code\r
 \r
-END SUB
-*/
-void MM_MapXEMS(mminfo_t *mm)
-{
+//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;
 }
 
 //==========================================================================
@@ -658,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++)
        {
@@ -668,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
        }
 
 //