-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#include "pico_int.h"\r
-#include "../zlib/zlib.h"\r
#include "../cpu/debug.h"\r
#include "../unzip/unzip.h"\r
-#include "../unzip/unzip_stream.h"\r
+#include <zlib.h>\r
\r
\r
static int rom_alloc_size;\r
void (*PicoCartLoadProgressCB)(int percent) = NULL;\r
void (*PicoCDLoadProgressCB)(const char *fname, int percent) = NULL; // handled in Pico/cd/cd_file.c\r
\r
+int PicoGameLoaded;\r
+\r
static void PicoCartDetect(const char *carthw_cfg);\r
\r
/* cso struct */\r
}\r
cso_struct;\r
\r
-static int uncompress2(void *dest, int destLen, void *source, int sourceLen)\r
+static int uncompress_buf(void *dest, int destLen, void *source, int sourceLen)\r
{\r
z_stream stream;\r
int err;\r
return ext;\r
}\r
\r
+struct zip_file {\r
+ pm_file file;\r
+ ZIP *zip;\r
+ struct zipent *entry;\r
+ z_stream stream;\r
+ unsigned char inbuf[16384];\r
+ long start;\r
+ unsigned int pos;\r
+};\r
+\r
pm_file *pm_open(const char *path)\r
{\r
pm_file *file = NULL;\r
ext = get_ext(path);\r
if (strcasecmp(ext, "zip") == 0)\r
{\r
+ struct zip_file *zfile = NULL;\r
struct zipent *zipentry;\r
- gzFile gzf = NULL;\r
ZIP *zipfile;\r
- int i;\r
+ int i, ret;\r
\r
zipfile = openzip(path);\r
if (zipfile != NULL)\r
goto zip_failed;\r
\r
found_rom_zip:\r
- /* try to convert to gzip stream, so we could use standard gzio functions from zlib */\r
- gzf = zip2gz(zipfile, zipentry);\r
- if (gzf == NULL) goto zip_failed;\r
-\r
- file = calloc(1, sizeof(*file));\r
- if (file == NULL) goto zip_failed;\r
- file->file = zipfile;\r
- file->param = gzf;\r
- file->size = zipentry->uncompressed_size;\r
- file->type = PMT_ZIP;\r
- strncpy(file->ext, ext, sizeof(file->ext) - 1);\r
- return file;\r
+ zfile = calloc(1, sizeof(*zfile));\r
+ if (zfile == NULL)\r
+ goto zip_failed;\r
+ ret = seekcompresszip(zipfile, zipentry);\r
+ if (ret != 0)\r
+ goto zip_failed;\r
+ ret = inflateInit2(&zfile->stream, -15);\r
+ if (ret != Z_OK) {\r
+ elprintf(EL_STATUS, "zip: inflateInit2 %d", ret);\r
+ goto zip_failed;\r
+ }\r
+ zfile->zip = zipfile;\r
+ zfile->entry = zipentry;\r
+ zfile->start = ftell(zipfile->fp);\r
+ zfile->file.file = zfile;\r
+ zfile->file.size = zipentry->uncompressed_size;\r
+ zfile->file.type = PMT_ZIP;\r
+ strncpy(zfile->file.ext, ext, sizeof(zfile->file.ext) - 1);\r
+ return &zfile->file;\r
\r
zip_failed:\r
- if (gzf) {\r
- gzclose(gzf);\r
- zipfile->fp = NULL; // gzclose() closed it\r
- }\r
closezip(zipfile);\r
+ free(zfile);\r
return NULL;\r
}\r
}\r
if (f == NULL)\r
goto cso_failed;\r
\r
-#ifndef __EPOC32__\r
+#ifdef __GP2X__\r
/* we use our own buffering */\r
setvbuf(f, NULL, _IONBF, 0);\r
#endif\r
strncpy(file->ext, ext, sizeof(file->ext) - 1);\r
fseek(f, 0, SEEK_SET);\r
\r
-#ifndef __EPOC32__ // makes things worse on Symbian\r
+#ifdef __GP2X__\r
if (file->size > 0x400000)\r
/* we use our own buffering */\r
setvbuf(f, NULL, _IONBF, 0);\r
}\r
else if (stream->type == PMT_ZIP)\r
{\r
- gzFile gf = stream->param;\r
- int err;\r
- ret = gzread(gf, ptr, bytes);\r
- err = gzerror2(gf);\r
- if (ret > 0 && (err == Z_DATA_ERROR || err == Z_STREAM_END))\r
- /* we must reset stream pointer or else next seek/read fails */\r
- gzrewind(gf);\r
+ struct zip_file *z = stream->file;\r
+\r
+ if (z->entry->compression_method == 0) {\r
+ int ret = fread(ptr, 1, bytes, z->zip->fp);\r
+ z->pos += ret;\r
+ return ret;\r
+ }\r
+\r
+ z->stream.next_out = ptr;\r
+ z->stream.avail_out = bytes;\r
+ while (z->stream.avail_out != 0) {\r
+ if (z->stream.avail_in == 0) {\r
+ z->stream.avail_in = fread(z->inbuf, 1, sizeof(z->inbuf), z->zip->fp);\r
+ if (z->stream.avail_in == 0)\r
+ break;\r
+ z->stream.next_in = z->inbuf;\r
+ }\r
+ ret = inflate(&z->stream, Z_NO_FLUSH);\r
+ if (ret == Z_STREAM_END)\r
+ break;\r
+ if (ret != Z_OK) {\r
+ elprintf(EL_STATUS, "zip: inflate: %d", ret);\r
+ return 0;\r
+ }\r
+ }\r
+ z->pos += bytes - z->stream.avail_out;\r
+ return bytes - z->stream.avail_out;\r
}\r
else if (stream->type == PMT_CSO)\r
{\r
}\r
cso->block_in_buff = block;\r
}\r
- rret = uncompress2(tmp_dst, 2048, cso->in_buff, read_len);\r
+ rret = uncompress_buf(tmp_dst, 2048, cso->in_buff, read_len);\r
if (rret != 0) {\r
elprintf(EL_STATUS, "cso: uncompress failed @ %08x with %i", read_pos, rret);\r
break;\r
}\r
else if (stream->type == PMT_ZIP)\r
{\r
- if (PicoMessage != NULL && offset > 6*1024*1024) {\r
- long pos = gztell((gzFile) stream->param);\r
- if (offset < pos || offset - pos > 6*1024*1024)\r
- PicoMessage("Decompressing data...");\r
+ struct zip_file *z = stream->file;\r
+ unsigned int pos = z->pos;\r
+ int ret;\r
+\r
+ switch (whence)\r
+ {\r
+ case SEEK_CUR: pos += offset; break;\r
+ case SEEK_SET: pos = offset; break;\r
+ case SEEK_END: pos = stream->size - offset; break;\r
+ }\r
+ if (z->entry->compression_method == 0) {\r
+ ret = fseek(z->zip->fp, z->start + pos, SEEK_SET);\r
+ if (ret == 0)\r
+ return (z->pos = pos);\r
+ return -1;\r
+ }\r
+ offset = pos - z->pos;\r
+ if (pos < z->pos) {\r
+ // full decompress from the start\r
+ fseek(z->zip->fp, z->start, SEEK_SET);\r
+ z->stream.avail_in = 0;\r
+ z->stream.next_in = z->inbuf;\r
+ inflateReset(&z->stream);\r
+ z->pos = 0;\r
+ offset = pos;\r
+ }\r
+\r
+ if (PicoIn.osdMessage != NULL && offset > 4 * 1024 * 1024)\r
+ PicoIn.osdMessage("Decompressing data...");\r
+\r
+ while (offset > 0) {\r
+ char buf[16 * 1024];\r
+ size_t l = offset > sizeof(buf) ? sizeof(buf) : offset;\r
+ ret = pm_read(buf, l, stream);\r
+ if (ret != l)\r
+ break;\r
+ offset -= l;\r
}\r
- return gzseek((gzFile) stream->param, offset, whence);\r
+ return z->pos;\r
}\r
else if (stream->type == PMT_CSO)\r
{\r
}\r
else if (fp->type == PMT_ZIP)\r
{\r
- ZIP *zipfile = fp->file;\r
- gzclose((gzFile) fp->param);\r
- zipfile->fp = NULL; // gzclose() closed it\r
- closezip(zipfile);\r
+ struct zip_file *z = fp->file;\r
+ inflateEnd(&z->stream);\r
+ closezip(z->zip);\r
}\r
else if (fp->type == PMT_CSO)\r
{\r
\r
// Allocate space for the rom plus padding\r
// use special address for 32x dynarec\r
- rom = plat_mmap(0x02000000, rom_alloc_size);\r
+ rom = plat_mmap(0x02000000, rom_alloc_size, 0, 0);\r
return rom;\r
}\r
\r
bytes_read = pm_read(rom,size,f); // Load up the rom\r
if (bytes_read <= 0) {\r
elprintf(EL_STATUS, "read failed");\r
- free(rom);\r
+ plat_munmap(rom, rom_alloc_size);\r
return 3;\r
}\r
\r
if (!is_sms)\r
{\r
// maybe we are loading MegaCD BIOS?\r
- if (!(PicoAHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||\r
+ if (!(PicoIn.AHW & PAHW_MCD) && size == 0x20000 && (!strncmp((char *)rom+0x124, "BOOT", 4) ||\r
!strncmp((char *)rom+0x128, "BOOT", 4))) {\r
- PicoAHW |= PAHW_MCD;\r
+ PicoIn.AHW |= PAHW_MCD;\r
}\r
\r
// Check for SMD:\r
Pico.rom=rom;\r
Pico.romsize=romsize;\r
\r
- if (SRam.data) {\r
- free(SRam.data);\r
- SRam.data = NULL;\r
+ if (Pico.sv.data) {\r
+ free(Pico.sv.data);\r
+ Pico.sv.data = NULL;\r
}\r
\r
if (PicoCartUnloadHook != NULL) {\r
}\r
pdb_cleanup();\r
\r
- PicoAHW &= PAHW_MCD|PAHW_SMS;\r
+ PicoIn.AHW &= PAHW_MCD|PAHW_SMS;\r
\r
PicoCartMemSetup = NULL;\r
PicoDmaHook = NULL;\r
PicoLoadStateHook = NULL;\r
carthw_chunks = NULL;\r
\r
- if (!(PicoAHW & (PAHW_MCD|PAHW_SMS)))\r
+ if (!(PicoIn.AHW & (PAHW_MCD|PAHW_SMS)))\r
PicoCartDetect(carthw_cfg);\r
\r
// setup correct memory map for loaded ROM\r
- switch (PicoAHW) {\r
+ switch (PicoIn.AHW) {\r
default:\r
- elprintf(EL_STATUS|EL_ANOMALY, "starting in unknown hw configuration: %x", PicoAHW);\r
+ elprintf(EL_STATUS|EL_ANOMALY, "starting in unknown hw configuration: %x", PicoIn.AHW);\r
case 0:\r
case PAHW_SVP: PicoMemSetup(); break;\r
case PAHW_MCD: PicoMemSetupCD(); break;\r
if (PicoCartMemSetup != NULL)\r
PicoCartMemSetup();\r
\r
- if (PicoAHW & PAHW_SMS)\r
+ if (PicoIn.AHW & PAHW_SMS)\r
PicoPowerMS();\r
else\r
PicoPower();\r
\r
+ PicoGameLoaded = 1;\r
return 0;\r
}\r
\r
PicoCartUnloadHook = NULL;\r
}\r
\r
- if (PicoAHW & PAHW_32X)\r
+ if (PicoIn.AHW & PAHW_32X)\r
PicoUnload32x();\r
\r
if (Pico.rom != NULL) {\r
plat_munmap(Pico.rom, rom_alloc_size);\r
Pico.rom = NULL;\r
}\r
+ PicoGameLoaded = 0;\r
}\r
\r
static unsigned int rom_crc32(void)\r
{\r
int i, len = strlen(s1);\r
const char *s_rom = (const char *)Pico.rom;\r
+ if (rom_offset + len > Pico.romsize)\r
+ return 0;\r
for (i = 0; i < len; i++)\r
if (s1[i] != s_rom[(i + rom_offset) ^ 1])\r
return 1;\r
return 1;\r
}\r
\r
-static void parse_carthw(const char *carthw_cfg, int *fill_sram)\r
+#include "carthw_cfg.c"\r
+\r
+static void parse_carthw(const char *carthw_cfg, int *fill_sram,\r
+ int *hw_detected)\r
{\r
int line = 0, any_checks_passed = 0, skip_sect = 0;\r
+ const char *s, *builtin = builtin_carthw_cfg;\r
int tmp, rom_crc = 0;\r
char buff[256], *p, *r;\r
FILE *f;\r
\r
f = fopen(carthw_cfg, "r");\r
- if (f == NULL) {\r
+ if (f == NULL)\r
+ f = fopen("pico/carthw.cfg", "r");\r
+ if (f == NULL)\r
elprintf(EL_STATUS, "couldn't open carthw.cfg!");\r
- return;\r
- }\r
\r
- while ((p = fgets(buff, sizeof(buff), f)))\r
+ for (;;)\r
{\r
+ if (f != NULL) {\r
+ p = fgets(buff, sizeof(buff), f);\r
+ if (p == NULL)\r
+ break;\r
+ }\r
+ else {\r
+ if (*builtin == 0)\r
+ break;\r
+ for (s = builtin; *s != 0 && *s != '\n'; s++)\r
+ ;\r
+ while (*s == '\n')\r
+ s++;\r
+ tmp = s - builtin;\r
+ if (tmp > sizeof(buff) - 1)\r
+ tmp = sizeof(buff) - 1;\r
+ memcpy(buff, builtin, tmp);\r
+ buff[tmp] = 0;\r
+ p = buff;\r
+ builtin = s;\r
+ }\r
+\r
line++;\r
p = sskip(p);\r
if (*p == 0 || *p == '#')\r
if (is_expr("hw", &p)) {\r
if (!any_checks_passed)\r
goto no_checks;\r
+ *hw_detected = 1;\r
rstrip(p);\r
\r
if (strcmp(p, "svp") == 0)\r
carthw_realtec_startup();\r
else if (strcmp(p, "radica_mapper") == 0)\r
carthw_radica_startup();\r
+ else if (strcmp(p, "piersolar_mapper") == 0)\r
+ carthw_pier_startup();\r
else if (strcmp(p, "prot_lk3") == 0)\r
carthw_prot_lk3_startup();\r
else {\r
elprintf(EL_STATUS, "carthw:%d: unsupported mapper: %s", line, p);\r
skip_sect = 1;\r
+ *hw_detected = 0;\r
}\r
continue;\r
}\r
elprintf(EL_STATUS, "carthw:%d: bad sram_range: %08x - %08x", line, start, end);\r
goto bad_nomsg;\r
}\r
- SRam.start = start;\r
- SRam.end = end;\r
+ Pico.sv.start = start;\r
+ Pico.sv.end = end;\r
continue;\r
}\r
else if (is_expr("prop", &p)) {\r
rstrip(p);\r
\r
if (strcmp(p, "no_sram") == 0)\r
- SRam.flags &= ~SRF_ENABLED;\r
+ Pico.sv.flags &= ~SRF_ENABLED;\r
else if (strcmp(p, "no_eeprom") == 0)\r
- SRam.flags &= ~SRF_EEPROM;\r
+ Pico.sv.flags &= ~SRF_EEPROM;\r
else if (strcmp(p, "filled_sram") == 0)\r
*fill_sram = 1;\r
+ else if (strcmp(p, "force_6btn") == 0)\r
+ PicoIn.quirks |= PQUIRK_FORCE_6BTN;\r
else {\r
elprintf(EL_STATUS, "carthw:%d: unsupported prop: %s", line, p);\r
goto bad_nomsg;\r
}\r
+ elprintf(EL_STATUS, "game prop: %s", p);\r
continue;\r
}\r
else if (is_expr("eeprom_type", &p)) {\r
type = strtoul(p, &r, 0);\r
if (r == p || type < 0)\r
goto bad;\r
- SRam.eeprom_type = type;\r
- SRam.flags |= SRF_EEPROM;\r
+ Pico.sv.eeprom_type = type;\r
+ Pico.sv.flags |= SRF_EEPROM;\r
continue;\r
}\r
else if (is_expr("eeprom_lines", &p)) {\r
sda_out < 0 || sda_out > 15)\r
goto bad;\r
\r
- SRam.eeprom_bit_cl = scl;\r
- SRam.eeprom_bit_in = sda_in;\r
- SRam.eeprom_bit_out= sda_out;\r
+ Pico.sv.eeprom_bit_cl = scl;\r
+ Pico.sv.eeprom_bit_in = sda_in;\r
+ Pico.sv.eeprom_bit_out= sda_out;\r
continue;\r
}\r
else if ((tmp = is_expr("prot_ro_value16", &p)) || is_expr("prot_rw_value16", &p)) {\r
skip_sect = 1;\r
continue;\r
}\r
- fclose(f);\r
+\r
+ if (f != NULL)\r
+ fclose(f);\r
}\r
\r
/*\r
*/\r
static void PicoCartDetect(const char *carthw_cfg)\r
{\r
+ int carthw_detected = 0;\r
int fill_sram = 0;\r
\r
- memset(&SRam, 0, sizeof(SRam));\r
+ memset(&Pico.sv, 0, sizeof(Pico.sv));\r
if (Pico.rom[0x1B1] == 'R' && Pico.rom[0x1B0] == 'A')\r
{\r
- SRam.start = rom_read32(0x1B4) & ~0xff000001; // align\r
- SRam.end = (rom_read32(0x1B8) & ~0xff000000) | 1;\r
+ Pico.sv.start = rom_read32(0x1B4) & ~0xff000001; // align\r
+ Pico.sv.end = (rom_read32(0x1B8) & ~0xff000000) | 1;\r
if (Pico.rom[0x1B2] & 0x40)\r
// EEPROM\r
- SRam.flags |= SRF_EEPROM;\r
- SRam.flags |= SRF_ENABLED;\r
+ Pico.sv.flags |= SRF_EEPROM;\r
+ Pico.sv.flags |= SRF_ENABLED;\r
}\r
- if (SRam.end == 0 || SRam.start > SRam.end)\r
+ if (Pico.sv.end == 0 || Pico.sv.start > Pico.sv.end)\r
{\r
// some games may have bad headers, like S&K and Sonic3\r
// note: majority games use 0x200000 as starting address, but there are some which\r
// use something else (0x300000 by HardBall '95). Luckily they have good headers.\r
- SRam.start = 0x200000;\r
- SRam.end = 0x203FFF;\r
- SRam.flags |= SRF_ENABLED;\r
+ Pico.sv.start = 0x200000;\r
+ Pico.sv.end = 0x203FFF;\r
+ Pico.sv.flags |= SRF_ENABLED;\r
}\r
\r
// set EEPROM defaults, in case it gets detected\r
- SRam.eeprom_type = 0; // 7bit (24C01)\r
- SRam.eeprom_bit_cl = 1;\r
- SRam.eeprom_bit_in = 0;\r
- SRam.eeprom_bit_out= 0;\r
+ Pico.sv.eeprom_type = 0; // 7bit (24C01)\r
+ Pico.sv.eeprom_bit_cl = 1;\r
+ Pico.sv.eeprom_bit_in = 0;\r
+ Pico.sv.eeprom_bit_out= 0;\r
\r
if (carthw_cfg != NULL)\r
- parse_carthw(carthw_cfg, &fill_sram);\r
+ parse_carthw(carthw_cfg, &fill_sram, &carthw_detected);\r
+\r
+ // assume the standard mapper for large roms\r
+ if (!carthw_detected && Pico.romsize > 0x400000)\r
+ carthw_ssf2_startup();\r
\r
- if (SRam.flags & SRF_ENABLED)\r
+ if (Pico.sv.flags & SRF_ENABLED)\r
{\r
- if (SRam.flags & SRF_EEPROM)\r
- SRam.size = 0x2000;\r
+ if (Pico.sv.flags & SRF_EEPROM)\r
+ Pico.sv.size = 0x2000;\r
else\r
- SRam.size = SRam.end - SRam.start + 1;\r
+ Pico.sv.size = Pico.sv.end - Pico.sv.start + 1;\r
\r
- SRam.data = calloc(SRam.size, 1);\r
- if (SRam.data == NULL)\r
- SRam.flags &= ~SRF_ENABLED;\r
+ Pico.sv.data = calloc(Pico.sv.size, 1);\r
+ if (Pico.sv.data == NULL)\r
+ Pico.sv.flags &= ~SRF_ENABLED;\r
\r
- if (SRam.eeprom_type == 1) // 1 == 0 in PD EEPROM code\r
- SRam.eeprom_type = 0;\r
+ if (Pico.sv.eeprom_type == 1) // 1 == 0 in PD EEPROM code\r
+ Pico.sv.eeprom_type = 0;\r
}\r
\r
- if ((SRam.flags & SRF_ENABLED) && fill_sram)\r
+ if ((Pico.sv.flags & SRF_ENABLED) && fill_sram)\r
{\r
elprintf(EL_STATUS, "SRAM fill");\r
- memset(SRam.data, 0xff, SRam.size);\r
+ memset(Pico.sv.data, 0xff, Pico.sv.size);\r
}\r
\r
// Unusual region 'code'\r
*(int *) (Pico.rom + 0x1f0) = 0x20204520;\r
}\r
\r
+// vim:shiftwidth=2:expandtab\r
notaz.gp2x.de / picodrive.git / blobdiff