modified the thing a bit!

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 49f9c1be75ee243e3749ae347597f477d14bc57f..fc40735329ff3c65701d0b70139f9a5c5b3562f0 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -74,9 +74,9 @@ byte          _seg    *audiosegs[NUMSNDCHUNKS];
 void           _seg    *grsegs[NUMCHUNKS];\r
 \r
 byte           far     grneeded[NUMCHUNKS];\r
-byte           ca_levelbit,ca_levelnum;\r
+byte           ca_levelbit,ca_levelnum;*/\r
 \r
-int                    profilehandle,debughandle;*/\r
+int                    profilehandle,debughandle;\r
 \r
 void   (*drawcachebox)         (char *title, unsigned numcache);\r
 void   (*updatecachebox)       (void);\r
@@ -173,17 +173,16 @@ long GRFILEPOS(int c)
 =\r
 ============================\r
 */\r
-/*++++\r
 void CA_OpenDebug(void)\r
 {\r
-       unlink("DEBUG.TXT");\r
-       debughandle = open("DEBUG.TXT", O_CREAT | O_WRONLY | O_TEXT);\r
+       unlink("debug.txt");\r
+       debughandle = open("debug.txt", O_CREAT | O_WRONLY | O_TEXT);\r
 }\r
 \r
 void CA_CloseDebug(void)\r
 {\r
-       close debughandle);\r
-}*/\r
+       close(debughandle);\r
+}\r
 \r
 \r
 \r
@@ -216,38 +215,49 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead (int handle, byte huge *dest, dword length)\r
+boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)\r
 {\r
        boolean flag;\r
-       boolean fat;\r
-       if (length>0xffffl) fat=true;\r
+       dword fat=0;
+       word segm=0;
+       //if(mm->EMSVer<0x40)\r
+       if(length>0xfffflu)
+       {
+               printf("File is a fat bakapee\n");
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
 //             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
-\r
-       __asm\r
+       }
+
+       if(!fat&&!segm)
        {\r
-               push    ds\r
-               mov     bx,[handle]\r
-               mov     cx,[WORD PTR length]\r
-               mov     dx,[WORD PTR dest]\r
-               mov     ds,[WORD PTR dest+2]\r
-               mov     ah,0x3f                         // READ w/handle\r
-               int     21h\r
-               pop     ds\r
-               jnc     good\r
-               mov     errno,ax\r
-               mov     flag,0\r
-               jmp End\r
+               __asm\r
+               {\r
+                       push    ds\r
+                       mov     bx,[handle]\r
+                       mov     cx,[WORD PTR length]\r
+                       mov     dx,[WORD PTR dest]\r
+                       mov     ds,[WORD PTR dest+2]\r
+                       mov     ah,0x3f                         // READ w/handle\r
+                       int     21h\r
+                       pop     ds\r
+                       jnc     good\r
+                       mov     errno,ax\r
+                       mov     flag,0\r
+                       jmp End\r
 good:\r
-               cmp     ax,[WORD PTR length]\r
-               je      done\r
-//             errno = EINVFMT;                        // user manager knows this is bad read\r
-               mov     flag,0\r
-               jmp End\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+//                     errno = EINVFMT;                        // user manager knows this is bad read\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-               mov     flag,1\r
+                       mov     flag,1\r
 End:\r
-       }\r
-       return flag;\r
+               }\r
+       return flag;
+       }else return 0;//todo: EXPAND!!!\r
 }\r
 \r
 \r
@@ -261,38 +271,49 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite (int handle, byte huge *source, dword length)\r
+boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)\r
 {\r
        boolean flag;\r
-       boolean fat;\r
-       if (length>0xffffl) fat=true;\r
-//             printf("CA_FarWrite doesn't support 64K reads yet!\n");\r
-\r
-       __asm\r
+       dword fat=0;
+       word segm=0;
+       //if(mm->EMSVer<0x40)\r
+       if(length>0xfffflu)
+       {
+               printf("File is a fat bakapee\n");
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
+//             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
+       }\r
+
+       if(!fat&&!segm)
        {\r
-               push    ds\r
-               mov     bx,[handle]\r
-               mov     cx,[WORD PTR length]\r
-               mov     dx,[WORD PTR source]\r
-               mov     ds,[WORD PTR source+2]\r
-               mov     ah,0x40                 // WRITE w/handle\r
-               int     21h\r
-               pop     ds\r
-               jnc     good\r
-               mov     errno,ax\r
-               mov flag,0\r
-               jmp End\r
+               __asm\r
+               {\r
+                       push    ds\r
+                       mov     bx,[handle]\r
+                       mov     cx,[WORD PTR length]\r
+                       mov     dx,[WORD PTR source]\r
+                       mov     ds,[WORD PTR source+2]\r
+                       mov     ah,0x40                 // WRITE w/handle\r
+                       int     21h\r
+                       pop     ds\r
+                       jnc     good\r
+                       mov     errno,ax\r
+                       mov flag,0\r
+                       jmp End\r
 good:\r
-               cmp     ax,[WORD PTR length]\r
-               je      done\r
-       //errno = ENOMEM;                               // user manager knows this is bad write\r
-               mov     flag,0\r
-               jmp End\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+                       //errno = ENOMEM;                               // user manager knows this is bad write\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-               mov     flag,1\r
+                       mov     flag,1\r
 End:\r
-       }\r
-       return flag;\r
+               }\r
+       return flag;
+       }else return 0;\r
 }\r
 \r
 \r
@@ -306,7 +327,7 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_ReadFile(char *filename, memptr *ptr)\r
+boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)\r
 {\r
        int handle;\r
        dword size;\r
@@ -315,7 +336,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr)
                return false;\r
 \r
        size = filelength(handle);\r
-       if(!CA_FarRead(handle,*ptr,size))\r
+       if(!CA_FarRead(handle,*ptr,size, mm))\r
        {\r
                close(handle);\r
                return false;\r
@@ -346,7 +367,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 \r
        size = filelength (handle);\r
        MM_GetPtr(ptr,size, mm, mmi);\r
-       if(!CA_FarRead(handle,*ptr,size))\r
+       if(!CA_FarRead(handle,*ptr,size, mm))\r
        {\r
                close(handle);\r
                return false;\r