support for zipped ISOs

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@65 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/gp2x/Makefile b/gp2x/Makefile
index a3c6961..081715a 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -68,7 +68,7 @@ OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
        ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
 # unzip\r
-OBJS += ../../unzip/unzip.o\r
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
 # mp3\r
 OBJS += mp3.o\r
 # CPU cores\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index c8c4f8a..3d6cd3a 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -169,31 +169,31 @@ int find_bios(int region, char **bios_file)
 \r
 /* checks if romFileName points to valid MegaCD image\r
  * if so, checks for suitable BIOS */\r
-static int cd_check(char *ext, char **bios_file)\r
+static int cd_check(char **bios_file)\r
 {\r
        unsigned char buf[32];\r
-       FILE *cd_f;\r
+       pm_file *cd_f;\r
        int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
 \r
-       cd_f = fopen(romFileName, "rb");\r
+       cd_f = pm_open(romFileName);\r
        if (!cd_f) return 0; // let the upper level handle this\r
 \r
-       if (fread(buf, 1, 32, cd_f) != 32) {\r
-               fclose(cd_f);\r
+       if (pm_read(buf, 32, cd_f) != 32) {\r
+               pm_close(cd_f);\r
                return 0;\r
        }\r
 \r
        if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)\r
        if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)\r
        if (type == 0) {\r
-               fclose(cd_f);\r
+               pm_close(cd_f);\r
                return 0;\r
        }\r
 \r
        /* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */\r
-       fseek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
-       fread(buf, 1, 1, cd_f);\r
-       fclose(cd_f);\r
+       pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
+       pm_read(buf, 1, cd_f);\r
+       pm_close(cd_f);\r
 \r
        if (buf[0] == 0x64) region = 8; // EU\r
        if (buf[0] == 0xa1) region = 1; // JAP\r
@@ -217,7 +217,7 @@ int emu_ReloadRom(void)
        unsigned int rom_size = 0;\r
        char *used_rom_name = romFileName;\r
        char ext[5];\r
-       FILE *rom;\r
+       pm_file *rom;\r
        int ret, cd_state;\r
 \r
        printf("emu_ReloadRom(%s)\n", romFileName);\r
@@ -284,7 +284,7 @@ int emu_ReloadRom(void)
        }\r
 \r
        // check for MegaCD image\r
-       cd_state = cd_check(ext, &used_rom_name);\r
+       cd_state = cd_check(&used_rom_name);\r
        if (cd_state > 0) {\r
                PicoMCD |= 1;\r
                get_ext(used_rom_name, ext);\r
@@ -296,7 +296,7 @@ int emu_ReloadRom(void)
                PicoMCD &= ~1;\r
        }\r
 \r
-       rom = fopen(used_rom_name, "rb");\r
+       rom = pm_open(used_rom_name);\r
        if(!rom) {\r
                sprintf(menuErrorMsg, "Failed to open rom.");\r
                return 0;\r
@@ -308,25 +308,13 @@ int emu_ReloadRom(void)
                rom_size = 0;\r
        }\r
 \r
-       // zipfile support\r
-       if(!strcasecmp(ext, ".zip")) {\r
-               fclose(rom);\r
-               ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);\r
-               if(ret) {\r
-                       if (ret == 4) strcpy(menuErrorMsg, "No ROMs found in zip.");\r
-                       else sprintf(menuErrorMsg, "Unzip failed with code %i", ret);\r
-                       printf("%s\n", menuErrorMsg);\r
-                       return 0;\r
-               }\r
-       } else {\r
-               if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
-                       sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
-                       printf("%s\n", menuErrorMsg);\r
-                       fclose(rom);\r
-                       return 0;\r
-               }\r
-               fclose(rom);\r
+       if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
+               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
+               printf("%s\n", menuErrorMsg);\r
+               pm_close(rom);\r
+               return 0;\r
        }\r
+       pm_close(rom);\r
 \r
        // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
        if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 032616a..40eee48 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -407,7 +407,7 @@ static void draw_patchlist(int sel)
                if (pos < 0)  continue;\r
                if (pos > 23) break;\r
                gp2x_smalltext8_lim(14,     pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);\r
-               gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-5);\r
+               gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);\r
        }\r
        pos = start + i;\r
        if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);\r

diff --git a/linux/Makefile b/linux/Makefile
index fc5ff06..cd18159 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -39,7 +39,7 @@ OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2
 OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \
        ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o
 # unzip
-OBJS += ../../unzip/unzip.o
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o
 # mp3
 OBJS += ../gp2x/mp3.o
 # CPU cores

diff --git a/linux/gp2x.c b/linux/gp2x.c
index e4e3421..cc4db98 100644 (file)
--- a/linux/gp2x.c
+++ b/linux/gp2x.c
@@ -164,6 +164,7 @@ void gp2x_init(void)
        printf("entering init()\n"); fflush(stdout);
 
        gp2x_screen = malloc(320*240*2 + 320*2);
+       memset(gp2x_screen, 0, 320*240*2 + 320*2);
 
        // snd
        mixerdev = open("/dev/mixer", O_RDWR);