X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcart.c;h=9dce38d98ea27c629b889c21c50cc01c57949288;hb=653f0b1399313ecef86d99a2552f40fb9e51b820;hp=6a835b6399adb46e8d2c534af9197f3b5ccce152;hpb=a76fad41291b7be0b42554353d6775dcdff065e0;p=picodrive.git

diff --git a/pico/cart.c b/pico/cart.c
index 6a835b6..9dce38d 100644
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -8,10 +8,9 @@
  */
 
 #include "pico_int.h"
-#include "../zlib/zlib.h"
 #include "../cpu/debug.h"
 #include "../unzip/unzip.h"
-#include "../unzip/unzip_stream.h"
+#include <zlib.h>
 
 
 static int rom_alloc_size;
@@ -50,7 +49,7 @@ typedef struct _cso_struct
 }
 cso_struct;
 
-static int uncompress2(void *dest, int destLen, void *source, int sourceLen)
+static int uncompress_buf(void *dest, int destLen, void *source, int sourceLen)
 {
     z_stream stream;
     int err;
@@ -100,6 +99,7 @@ pm_file *pm_open(const char *path)
     return NULL;
 
   ext = get_ext(path);
+#ifndef NO_ZLIB
   if (strcasecmp(ext, "zip") == 0)
   {
     struct zipent *zipentry;
@@ -149,7 +149,9 @@ zip_failed:
       return NULL;
     }
   }
-  else if (strcasecmp(ext, "cso") == 0)
+  else
+#endif
+  if (strcasecmp(ext, "cso") == 0)
   {
     cso_struct *cso = NULL, *tmp = NULL;
     int size;
@@ -157,7 +159,7 @@ zip_failed:
     if (f == NULL)
       goto cso_failed;
 
-#ifndef __EPOC32__
+#ifdef __GP2X__
     /* we use our own buffering */
     setvbuf(f, NULL, _IONBF, 0);
 #endif
@@ -227,7 +229,7 @@ cso_failed:
   strncpy(file->ext, ext, sizeof(file->ext) - 1);
   fseek(f, 0, SEEK_SET);
 
-#ifndef __EPOC32__ // makes things worse on Symbian
+#ifdef __GP2X__
   if (file->size > 0x400000)
     /* we use our own buffering */
     setvbuf(f, NULL, _IONBF, 0);
@@ -244,6 +246,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
   {
     ret = fread(ptr, 1, bytes, stream->file);
   }
+#ifndef NO_ZLIB
   else if (stream->type == PMT_ZIP)
   {
     gzFile gf = stream->param;
@@ -254,6 +257,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
       /* we must reset stream pointer or else next seek/read fails */
       gzrewind(gf);
   }
+#endif
   else if (stream->type == PMT_CSO)
   {
     cso_struct *cso = stream->param;
@@ -293,7 +297,7 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream)
           }
           cso->block_in_buff = block;
         }
-        rret = uncompress2(tmp_dst, 2048, cso->in_buff, read_len);
+        rret = uncompress_buf(tmp_dst, 2048, cso->in_buff, read_len);
         if (rret != 0) {
           elprintf(EL_STATUS, "cso: uncompress failed @ %08x with %i", read_pos, rret);
           break;
@@ -329,6 +333,7 @@ int pm_seek(pm_file *stream, long offset, int whence)
     fseek(stream->file, offset, whence);
     return ftell(stream->file);
   }
+#ifndef NO_ZLIB
   else if (stream->type == PMT_ZIP)
   {
     if (PicoMessage != NULL && offset > 6*1024*1024) {
@@ -338,6 +343,7 @@ int pm_seek(pm_file *stream, long offset, int whence)
     }
     return gzseek((gzFile) stream->param, offset, whence);
   }
+#endif
   else if (stream->type == PMT_CSO)
   {
     cso_struct *cso = stream->param;
@@ -363,6 +369,7 @@ int pm_close(pm_file *fp)
   {
     fclose(fp->file);
   }
+#ifndef NO_ZLIB
   else if (fp->type == PMT_ZIP)
   {
     ZIP *zipfile = fp->file;
@@ -370,6 +377,7 @@ int pm_close(pm_file *fp)
     zipfile->fp = NULL; // gzclose() closed it
     closezip(zipfile);
   }
+#endif
   else if (fp->type == PMT_CSO)
   {
     free(fp->param);
@@ -504,7 +512,7 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms)
     bytes_read = pm_read(rom,size,f); // Load up the rom
   if (bytes_read <= 0) {
     elprintf(EL_STATUS, "read failed");
-    free(rom);
+    plat_munmap(rom, rom_alloc_size);
     return 3;
   }