X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdriso.c;h=d6672f98cb557a3c078173e68ca777eddc0841aa;hp=aa6e47f43935676552eb0e38d46148560f063e31;hb=650adfd2da779ba8855623362c2900583e22931e;hpb=983a7cfdccceaa612267a1b045110b4f831d1495

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index aa6e47f4..d6672f98 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2007 PCSX-df Team                                       *
  *   Copyright (C) 2009 Wei Mingzhi                                        *
+ *   Copyright (C) 2012 notaz                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -15,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #include "psxcommon.h"
@@ -27,12 +28,18 @@
 #ifdef _WIN32
 #include <process.h>
 #include <windows.h>
+#define strcasecmp _stricmp
 #else
 #include <pthread.h>
 #include <sys/time.h>
+#include <unistd.h>
 #endif
+#include <errno.h>
 #include <zlib.h>
 
+unsigned int cdrIsoMultidiskCount;
+unsigned int cdrIsoMultidiskSelect;
+
 static FILE *cdHandle = NULL;
 static FILE *cddaHandle = NULL;
 static FILE *subHandle = NULL;
@@ -41,7 +48,9 @@ static boolean subChanMixed = FALSE;
 static boolean subChanRaw = FALSE;
 static boolean subChanMissing = FALSE;
 
-static unsigned char cdbuffer[DATA_SIZE];
+static boolean multifile = FALSE;
+
+static unsigned char cdbuffer[CD_FRAMESIZE_RAW];
 static unsigned char subbuffer[SUB_FRAMESIZE];
 
 static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10];
@@ -56,25 +65,30 @@ static pthread_t threadid;
 static unsigned int initial_offset = 0;
 static boolean playing = FALSE;
 static boolean cddaBigEndian = FALSE;
+// cdda sectors in toc, byte offset in file
 static unsigned int cdda_cur_sector;
-static unsigned int cdda_start_sector;
+static unsigned int cdda_first_sector;
+static unsigned int cdda_file_offset;
 /* Frame offset into CD image where pregap data would be found if it was there.
  * If a game seeks there we must *not* return subchannel data since it's
  * not in the CD image, so that cdrom code can fake subchannel data instead.
  * XXX: there could be multiple pregaps but PSX dumps only have one? */
 static unsigned int pregapOffset;
 
+#define cddaCurPos cdda_cur_sector
+
 // compressed image stuff
 static struct {
 	unsigned char buff_raw[16][CD_FRAMESIZE_RAW];
 	unsigned char buff_compressed[CD_FRAMESIZE_RAW * 16 + 100];
 	unsigned int *index_table;
 	unsigned int index_len;
+	unsigned int block_shift;
 	unsigned int current_block;
 	unsigned int sector_in_blk;
 } *compr_img;
 
-int (*cdimg_read_func)(FILE *f, void *dest, int sector, int offset);
+int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector);
 
 char* CALLBACK CDR__getDriveLetter(void);
 long CALLBACK CDR__configure(void);
@@ -85,14 +99,12 @@ long CALLBACK CDR__getStatus(struct CdrStat *stat);
 
 static void DecodeRawSubData(void);
 
-extern void *hCDRDriver;
-
 struct trackinfo {
-	enum {DATA, CDDA} type;
+	enum {DATA=1, CDDA} type;
 	char start[3];		// MSF-format
 	char length[3];		// MSF-format
 	FILE *handle;		// for multi-track images CDDA
-	int start_offset;	// sector offset from start of above file
+	unsigned int start_offset; // byte offset from start of above file
 };
 
 #define MAXTRACKS 100 /* How many tracks can a CD hold? */
@@ -166,28 +178,29 @@ static void *playthread(void *param)
 {
 	long osleep, d, t, i, s;
 	unsigned char	tmp;
-	int ret = 0;
+	int ret = 0, sector_offs;
 
 	t = GetTickCount();
 
 	while (playing) {
 		s = 0;
 		for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) {
-			d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector, 0);
-			if (d < CD_FRAMESIZE_RAW)
-				break;
+			sector_offs = cdda_cur_sector - cdda_first_sector;
+			if (sector_offs < 0) {
+				d = CD_FRAMESIZE_RAW;
+				memset(sndbuffer + s, 0, d);
+			}
+			else {
+				d = cdimg_read_func(cddaHandle, cdda_file_offset,
+					sndbuffer + s, sector_offs);
+				if (d < CD_FRAMESIZE_RAW)
+					break;
+			}
 
 			s += d;
 			cdda_cur_sector++;
 		}
 
-		if (subHandle != NULL) {
-			fseek(subHandle, cdda_cur_sector * SUB_FRAMESIZE, SEEK_SET);
-			fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);
-
-			if (subChanRaw) DecodeRawSubData();
-		}
-
 		if (s == 0) {
 			playing = FALSE;
 			initial_offset = 0;
@@ -203,6 +216,8 @@ static void *playthread(void *param)
 				}
 			}
 
+			// can't do it yet due to readahead..
+			//cdrAttenuate((short *)sndbuffer, s / 4, 1);
 			do {
 				ret = SPU_playCDDAchannel((short *)sndbuffer, s);
 				if (ret == 0x7761)
@@ -259,12 +274,11 @@ static void stopCDDA() {
 }
 
 // start the CDDA playback
-static void startCDDA(unsigned int sector) {
+static void startCDDA(void) {
 	if (playing) {
 		stopCDDA();
 	}
 
-	cdda_cur_sector = sector;
 	playing = TRUE;
 
 #ifdef _WIN32
@@ -279,10 +293,11 @@ static void startCDDA(unsigned int sector) {
 static int parsetoc(const char *isofile) {
 	char			tocname[MAXPATHLEN];
 	FILE			*fi;
-	char			linebuf[256], dummy[256], name[256];
+	char			linebuf[256], tmp[256], name[256];
 	char			*token;
 	char			time[20], time2[20];
-	unsigned int	t, sector_offs;
+	unsigned int	t, sector_offs, sector_size;
+	unsigned int	current_zero_gap = 0;
 
 	numtracks = 0;
 
@@ -313,22 +328,34 @@ static int parsetoc(const char *isofile) {
 				return -1;
 			}
 		}
+		// check if it's really a TOC named as a .cue
+		fgets(linebuf, sizeof(linebuf), fi);
+		token = strtok(linebuf, " ");
+		if (token && strncmp(token, "CD", 2) != 0 && strcmp(token, "CATALOG") != 0) {
+			fclose(fi);
+			return -1;
+		}
+		fseek(fi, 0, SEEK_SET);
 	}
 
 	memset(&ti, 0, sizeof(ti));
 	cddaBigEndian = TRUE; // cdrdao uses big-endian for CD Audio
 
+	sector_size = CD_FRAMESIZE_RAW;
 	sector_offs = 2 * 75;
 
 	// parse the .toc file
 	while (fgets(linebuf, sizeof(linebuf), fi) != NULL) {
 		// search for tracks
-		strncpy(dummy, linebuf, sizeof(linebuf));
-		token = strtok(dummy, " ");
+		strncpy(tmp, linebuf, sizeof(linebuf));
+		token = strtok(tmp, " ");
 
 		if (token == NULL) continue;
 
 		if (!strcmp(token, "TRACK")) {
+			sector_offs += current_zero_gap;
+			current_zero_gap = 0;
+
 			// get type of track
 			token = strtok(NULL, " ");
 			numtracks++;
@@ -339,9 +366,11 @@ static int parsetoc(const char *isofile) {
 
 				// check if this image contains mixed subchannel data
 				token = strtok(NULL, " ");
-				if (token != NULL && !strncmp(token, "RW_RAW", 6)) {
+				if (token != NULL && !strncmp(token, "RW", 2)) {
+					sector_size = CD_FRAMESIZE_RAW + SUB_FRAMESIZE;
 					subChanMixed = TRUE;
-					subChanRaw = TRUE;
+					if (!strncmp(token, "RW_RAW", 6))
+						subChanRaw = TRUE;
 				}
 			}
 			else if (!strncmp(token, "AUDIO", 5)) {
@@ -351,9 +380,8 @@ static int parsetoc(const char *isofile) {
 		else if (!strcmp(token, "DATAFILE")) {
 			if (ti[numtracks].type == CDDA) {
 				sscanf(linebuf, "DATAFILE \"%[^\"]\" #%d %8s", name, &t, time2);
-				t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0);
 				ti[numtracks].start_offset = t;
-				t += sector_offs;
+				t = t / sector_size + sector_offs;
 				sec2msf(t, (char *)&ti[numtracks].start);
 				tok2msf((char *)&time2, (char *)&ti[numtracks].length);
 			}
@@ -365,21 +393,39 @@ static int parsetoc(const char *isofile) {
 		else if (!strcmp(token, "FILE")) {
 			sscanf(linebuf, "FILE \"%[^\"]\" #%d %8s %8s", name, &t, time, time2);
 			tok2msf((char *)&time, (char *)&ti[numtracks].start);
-			t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0);
+			t += msf2sec(ti[numtracks].start) * sector_size;
 			ti[numtracks].start_offset = t;
-			t += msf2sec(ti[numtracks].start) + sector_offs;
+			t = t / sector_size + sector_offs;
 			sec2msf(t, (char *)&ti[numtracks].start);
 			tok2msf((char *)&time2, (char *)&ti[numtracks].length);
 		}
-		else if (!strcmp(token, "ZERO")) {
-			sscanf(linebuf, "ZERO AUDIO RW_RAW %8s", time);
-			tok2msf((char *)&time, dummy);
-			sector_offs += msf2sec(dummy);
+		else if (!strcmp(token, "ZERO") || !strcmp(token, "SILENCE")) {
+			// skip unneeded optional fields
+			while (token != NULL) {
+				token = strtok(NULL, " ");
+				if (strchr(token, ':') != NULL)
+					break;
+			}
+			if (token != NULL) {
+				tok2msf(token, tmp);
+				current_zero_gap = msf2sec(tmp);
+			}
 			if (numtracks > 1) {
 				t = ti[numtracks - 1].start_offset;
+				t /= sector_size;
 				pregapOffset = t + msf2sec(ti[numtracks - 1].length);
 			}
 		}
+		else if (!strcmp(token, "START")) {
+			token = strtok(NULL, " ");
+			if (token != NULL && strchr(token, ':')) {
+				tok2msf(token, tmp);
+				t = msf2sec(tmp);
+				ti[numtracks].start_offset += (t - current_zero_gap) * sector_size;
+				t = msf2sec(ti[numtracks].start) + t;
+				sec2msf(t, (char *)&ti[numtracks].start);
+			}
+		}
 	}
 
 	fclose(fi);
@@ -399,7 +445,8 @@ static int parsecue(const char *isofile) {
 	char			*tmp;
 	char			linebuf[256], tmpb[256], dummy[256];
 	unsigned int	incue_max_len;
-	unsigned int	t, file_len, sector_offs;
+	unsigned int	t, file_len, mode, sector_offs;
+	unsigned int	sector_size = 2352;
 
 	numtracks = 0;
 
@@ -432,10 +479,12 @@ static int parsecue(const char *isofile) {
 
 	// build a path for files referenced in .cue
 	strncpy(filepath, cuename, sizeof(filepath));
-	tmp = strrchr(filepath, '/') + 1;
-	if (tmp == NULL)
-		tmp = strrchr(filepath, '\\') + 1;
+	tmp = strrchr(filepath, '/');
 	if (tmp == NULL)
+		tmp = strrchr(filepath, '\\');
+	if (tmp != NULL)
+		tmp++;
+	else
 		tmp = filepath;
 	*tmp = 0;
 	filepath[sizeof(filepath) - 1] = 0;
@@ -458,24 +507,32 @@ static int parsecue(const char *isofile) {
 		if (!strcmp(token, "TRACK")) {
 			numtracks++;
 
+			sector_size = 0;
 			if (strstr(linebuf, "AUDIO") != NULL) {
 				ti[numtracks].type = CDDA;
+				sector_size = 2352;
 			}
-			else if (strstr(linebuf, "MODE1/2352") != NULL || strstr(linebuf, "MODE2/2352") != NULL) {
+			else if (sscanf(linebuf, " TRACK %u MODE%u/%u", &t, &mode, &sector_size) == 3)
 				ti[numtracks].type = DATA;
+			else {
+				SysPrintf(".cue: failed to parse TRACK\n");
+				ti[numtracks].type = numtracks == 1 ? DATA : CDDA;
 			}
+			if (sector_size == 0)
+				sector_size = 2352;
 		}
 		else if (!strcmp(token, "INDEX")) {
-			sscanf(linebuf, " INDEX %02d %8s", &t, time);
+			if (sscanf(linebuf, " INDEX %02d %8s", &t, time) != 2)
+				SysPrintf(".cue: failed to parse INDEX\n");
 			tok2msf(time, (char *)&ti[numtracks].start);
 
 			t = msf2sec(ti[numtracks].start);
-			ti[numtracks].start_offset = t;
+			ti[numtracks].start_offset = t * sector_size;
 			t += sector_offs;
 			sec2msf(t, ti[numtracks].start);
 
 			// default track length to file length
-			t = file_len - ti[numtracks].start_offset;
+			t = file_len - ti[numtracks].start_offset / sector_size;
 			sec2msf(t, ti[numtracks].length);
 
 			if (numtracks > 1 && ti[numtracks].handle == NULL) {
@@ -485,7 +542,7 @@ static int parsecue(const char *isofile) {
 				sec2msf(t, ti[numtracks - 1].length);
 			}
 			if (numtracks > 1 && pregapOffset == -1)
-				pregapOffset = ti[numtracks].start_offset;
+				pregapOffset = ti[numtracks].start_offset / sector_size;
 		}
 		else if (!strcmp(token, "PREGAP")) {
 			if (sscanf(linebuf, " PREGAP %8s", time) == 1) {
@@ -495,7 +552,9 @@ static int parsecue(const char *isofile) {
 			pregapOffset = -1; // mark to fill track start_offset
 		}
 		else if (!strcmp(token, "FILE")) {
-			sscanf(linebuf, " FILE \"%[^\"]\"", tmpb);
+			t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb);
+			if (t != 1)
+				sscanf(linebuf, " FILE %256s", tmpb);
 
 			// absolute path?
 			ti[numtracks + 1].handle = fopen(tmpb, "rb");
@@ -513,8 +572,10 @@ static int parsecue(const char *isofile) {
 			}
 
 			// update global offset if this is not first file in this .cue
-			if (numtracks + 1 > 1)
+			if (numtracks + 1 > 1) {
+				multifile = 1;
 				sector_offs += file_len;
+			}
 
 			file_len = 0;
 			if (ti[numtracks + 1].handle == NULL) {
@@ -576,7 +637,7 @@ static int parseccd(const char *isofile) {
 		else if (!strncmp(linebuf, "INDEX 1=", 8)) {
 			sscanf(linebuf, "INDEX 1=%d", &t);
 			sec2msf(t + 2 * 75, ti[numtracks].start);
-			ti[numtracks].start_offset = t;
+			ti[numtracks].start_offset = t * 2352;
 
 			// If we've already seen another track, this is its end
 			if (numtracks > 1) {
@@ -661,7 +722,7 @@ static int parsemds(const char *isofile) {
 
 	// check if the image contains mixed subchannel data
 	fseek(fi, offset + 1, SEEK_SET);
-	subChanMixed = (fgetc(fi) ? TRUE : FALSE);
+	subChanMixed = subChanRaw = (fgetc(fi) ? TRUE : FALSE);
 
 	// read track data
 	for (i = 1; i <= numtracks; i++) {
@@ -683,14 +744,14 @@ static int parsemds(const char *isofile) {
 		fseek(fi, offset + 0x28, SEEK_SET);
 		fread(&l, 1, sizeof(unsigned int), fi);
 		l = SWAP32(l);
-		ti[i].start_offset = l / CD_FRAMESIZE_RAW;
+		ti[i].start_offset = l;
 
 		// get pregap
 		fseek(fi, extra_offset, SEEK_SET);
 		fread(&l, 1, sizeof(unsigned int), fi);
 		l = SWAP32(l);
 		if (l != 0 && i > 1)
-			pregapOffset = ti[i].start_offset;
+			pregapOffset = msf2sec(ti[i].start);
 
 		// get the track length
 		fread(&l, 1, sizeof(unsigned int), fi);
@@ -704,7 +765,7 @@ static int parsemds(const char *isofile) {
 	return 0;
 }
 
-static int parsepbp(const char *isofile) {
+static int handlepbp(const char *isofile) {
 	struct {
 		unsigned int sig;
 		unsigned int dontcare[8];
@@ -723,8 +784,9 @@ static int parsepbp(const char *isofile) {
 		unsigned int size;
 		unsigned int dontcare[6];
 	} index_entry;
-	char psar_sig[9];
+	char psar_sig[11];
 	unsigned int t, cd_length, cdimg_base;
+	unsigned int offsettab[8], psisoimg_offs;
 	const char *ext = NULL;
 	int i, ret;
 
@@ -737,27 +799,66 @@ static int parsepbp(const char *isofile) {
 
 	ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle);
 	if (ret != sizeof(pbp_hdr)) {
-		fprintf(stderr, "failed to read pbp\n");
+		SysPrintf("failed to read pbp\n");
 		goto fail_io;
 	}
 
 	ret = fseek(cdHandle, pbp_hdr.psar_offs, SEEK_SET);
 	if (ret != 0) {
-		fprintf(stderr, "failed to seek to %x\n", pbp_hdr.psar_offs);
+		SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs);
 		goto fail_io;
 	}
 
+	psisoimg_offs = pbp_hdr.psar_offs;
 	fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
-	psar_sig[8] = 0;
-	if (strcmp(psar_sig, "PSISOIMG") != 0) {
-		fprintf(stderr, "bad psar_sig: %s\n", psar_sig);
+	psar_sig[10] = 0;
+	if (strcmp(psar_sig, "PSTITLEIMG") == 0) {
+		// multidisk image?
+		ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200);
+			goto fail_io;
+		}
+
+		if (fread(&offsettab, 1, sizeof(offsettab), cdHandle) != sizeof(offsettab)) {
+			SysPrintf("failed to read offsettab\n");
+			goto fail_io;
+		}
+
+		for (i = 0; i < sizeof(offsettab) / sizeof(offsettab[0]); i++) {
+			if (offsettab[i] == 0)
+				break;
+		}
+		cdrIsoMultidiskCount = i;
+		if (cdrIsoMultidiskCount == 0) {
+			SysPrintf("multidisk eboot has 0 images?\n");
+			goto fail_io;
+		}
+
+		if (cdrIsoMultidiskSelect >= cdrIsoMultidiskCount)
+			cdrIsoMultidiskSelect = 0;
+
+		psisoimg_offs += offsettab[cdrIsoMultidiskSelect];
+
+		ret = fseek(cdHandle, psisoimg_offs, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", psisoimg_offs);
+			goto fail_io;
+		}
+
+		fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
+		psar_sig[10] = 0;
+	}
+
+	if (strcmp(psar_sig, "PSISOIMG00") != 0) {
+		SysPrintf("bad psar_sig: %s\n", psar_sig);
 		goto fail_io;
 	}
 
 	// seek to TOC
-	ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x800, SEEK_SET);
+	ret = fseek(cdHandle, psisoimg_offs + 0x800, SEEK_SET);
 	if (ret != 0) {
-		fprintf(stderr, "failed to seek to %x\n", pbp_hdr.psar_offs);
+		SysPrintf("failed to seek to %x\n", psisoimg_offs + 0x800);
 		goto fail_io;
 	}
 
@@ -777,6 +878,7 @@ static int parsepbp(const char *isofile) {
 
 		ti[i].start_offset = btoi(toc_entry.index0[0]) * 60 * 75 +
 			btoi(toc_entry.index0[1]) * 75 + btoi(toc_entry.index0[2]);
+		ti[i].start_offset *= 2352;
 		ti[i].start[0] = btoi(toc_entry.index1[0]);
 		ti[i].start[1] = btoi(toc_entry.index1[1]);
 		ti[i].start[2] = btoi(toc_entry.index1[2]);
@@ -786,13 +888,13 @@ static int parsepbp(const char *isofile) {
 			sec2msf(t, ti[i - 1].length);
 		}
 	}
-	t = cd_length - ti[numtracks].start_offset;
+	t = cd_length - ti[numtracks].start_offset / 2352;
 	sec2msf(t, ti[numtracks].length);
 
 	// seek to ISO index
-	ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x4000, SEEK_SET);
+	ret = fseek(cdHandle, psisoimg_offs + 0x4000, SEEK_SET);
 	if (ret != 0) {
-		fprintf(stderr, "failed to seek to ISO index\n");
+		SysPrintf("failed to seek to ISO index\n");
 		goto fail_io;
 	}
 
@@ -800,6 +902,7 @@ static int parsepbp(const char *isofile) {
 	if (compr_img == NULL)
 		goto fail_io;
 
+	compr_img->block_shift = 4;
 	compr_img->current_block = (unsigned int)-1;
 
 	compr_img->index_len = (0x100000 - 0x4000) / sizeof(index_entry);
@@ -807,11 +910,11 @@ static int parsepbp(const char *isofile) {
 	if (compr_img->index_table == NULL)
 		goto fail_io;
 
-	cdimg_base = pbp_hdr.psar_offs + 0x100000;
+	cdimg_base = psisoimg_offs + 0x100000;
 	for (i = 0; i < compr_img->index_len; i++) {
 		ret = fread(&index_entry, 1, sizeof(index_entry), cdHandle);
 		if (ret != sizeof(index_entry)) {
-			fprintf(stderr, "failed to read index_entry #%d\n", i);
+			SysPrintf("failed to read index_entry #%d\n", i);
 			goto fail_index;
 		}
 
@@ -828,6 +931,88 @@ fail_index:
 	free(compr_img->index_table);
 	compr_img->index_table = NULL;
 fail_io:
+	if (compr_img != NULL) {
+		free(compr_img);
+		compr_img = NULL;
+	}
+	return -1;
+}
+
+static int handlecbin(const char *isofile) {
+	struct
+	{
+		char magic[4];
+		unsigned int header_size;
+		unsigned long long total_bytes;
+		unsigned int block_size;
+		unsigned char ver;		// 1
+		unsigned char align;
+		unsigned char rsv_06[2];
+	} ciso_hdr;
+	const char *ext = NULL;
+	unsigned int index = 0, plain;
+	int i, ret;
+
+	if (strlen(isofile) >= 5)
+		ext = isofile + strlen(isofile) - 5;
+	if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0))
+		return -1;
+
+	ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle);
+	if (ret != sizeof(ciso_hdr)) {
+		SysPrintf("failed to read ciso header\n");
+		return -1;
+	}
+
+	if (strncmp(ciso_hdr.magic, "CISO", 4) != 0 || ciso_hdr.total_bytes <= 0 || ciso_hdr.block_size <= 0) {
+		SysPrintf("bad ciso header\n");
+		return -1;
+	}
+	if (ciso_hdr.header_size != 0 && ciso_hdr.header_size != sizeof(ciso_hdr)) {
+		ret = fseek(cdHandle, ciso_hdr.header_size, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", ciso_hdr.header_size);
+			return -1;
+		}
+	}
+
+	compr_img = calloc(1, sizeof(*compr_img));
+	if (compr_img == NULL)
+		goto fail_io;
+
+	compr_img->block_shift = 0;
+	compr_img->current_block = (unsigned int)-1;
+
+	compr_img->index_len = ciso_hdr.total_bytes / ciso_hdr.block_size;
+	compr_img->index_table = malloc((compr_img->index_len + 1) * sizeof(compr_img->index_table[0]));
+	if (compr_img->index_table == NULL)
+		goto fail_io;
+
+	ret = fread(compr_img->index_table, sizeof(compr_img->index_table[0]), compr_img->index_len, cdHandle);
+	if (ret != compr_img->index_len) {
+		SysPrintf("failed to read index table\n");
+		goto fail_index;
+	}
+
+	for (i = 0; i < compr_img->index_len + 1; i++) {
+		index = compr_img->index_table[i];
+		plain = index & 0x80000000;
+		index &= 0x7fffffff;
+		compr_img->index_table[i] = (index << ciso_hdr.align) | plain;
+	}
+	if ((long long)index << ciso_hdr.align >= 0x80000000ll)
+		SysPrintf("warning: ciso img too large, expect problems\n");
+
+	return 0;
+
+fail_index:
+	free(compr_img->index_table);
+	compr_img->index_table = NULL;
+fail_io:
+	if (compr_img != NULL) {
+		free(compr_img);
+		compr_img = NULL;
+	}
 	return -1;
 }
 
@@ -872,18 +1057,18 @@ static int opensbifile(const char *isoname) {
 	return LoadSBI(sbiname, s);
 }
 
-static int cdread_normal(FILE *f, void *dest, int sector, int offset)
+static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector)
 {
-	fseek(f, sector * CD_FRAMESIZE_RAW + offset, SEEK_SET);
-	return fread(dest, 1, CD_FRAMESIZE_RAW - offset, f);
+	fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET);
+	return fread(dest, 1, CD_FRAMESIZE_RAW, f);
 }
 
-static int cdread_sub_mixed(FILE *f, void *dest, int sector, int offset)
+static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
 {
 	int ret;
 
-	fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + offset, SEEK_SET);
-	ret = fread(dest, 1, CD_FRAMESIZE_RAW - offset, f);
+	fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET);
+	ret = fread(dest, 1, CD_FRAMESIZE_RAW, f);
 	fread(subbuffer, 1, SUB_FRAMESIZE, f);
 
 	if (subChanRaw) DecodeRawSubData();
@@ -922,14 +1107,18 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
 	return ret == 1 ? 0 : ret;
 }
 
-static int cdread_compressed(FILE *f, void *dest, int sector, int offset)
+static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
 {
+	unsigned long cdbuffer_size, cdbuffer_size_expect;
 	unsigned int start_byte, size;
-	unsigned long cdbuffer_size;
+	int is_compressed;
 	int ret, block;
 
-	block = sector >> 4;
-	compr_img->sector_in_blk = sector & 15;
+	if (base)
+		sector += base / 2352;
+
+	block = sector >> compr_img->block_shift;
+	compr_img->sector_in_blk = sector & ((1 << compr_img->block_shift) - 1);
 
 	if (block == compr_img->current_block) {
 		//printf("hit sect %d\n", sector);
@@ -937,62 +1126,67 @@ static int cdread_compressed(FILE *f, void *dest, int sector, int offset)
 	}
 
 	if (sector >= compr_img->index_len * 16) {
-		fprintf(stderr, "sector %d is past img end\n", sector);
+		SysPrintf("sector %d is past img end\n", sector);
 		return -1;
 	}
 
-	start_byte = compr_img->index_table[block];
+	start_byte = compr_img->index_table[block] & 0x7fffffff;
 	if (fseek(cdHandle, start_byte, SEEK_SET) != 0) {
-		fprintf(stderr, "seek error for block %d at %x: ",
+		SysPrintf("seek error for block %d at %x: ",
 			block, start_byte);
 		perror(NULL);
 		return -1;
 	}
 
-	size = compr_img->index_table[block + 1] - start_byte;
+	is_compressed = !(compr_img->index_table[block] & 0x80000000);
+	size = (compr_img->index_table[block + 1] & 0x7fffffff) - start_byte;
 	if (size > sizeof(compr_img->buff_compressed)) {
-		fprintf(stderr, "block %d is too large: %u\n", block, size);
+		SysPrintf("block %d is too large: %u\n", block, size);
 		return -1;
 	}
 
-	if (fread(compr_img->buff_compressed, 1, size, cdHandle) != size) {
-		fprintf(stderr, "read error for block %d at %x: ", block, start_byte);
+	if (fread(is_compressed ? compr_img->buff_compressed : compr_img->buff_raw[0],
+				1, size, cdHandle) != size) {
+		SysPrintf("read error for block %d at %x: ", block, start_byte);
 		perror(NULL);
 		return -1;
 	}
 
-	cdbuffer_size = sizeof(compr_img->buff_raw[0]) * 16;
-	ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
-	if (ret != 0) {
-		fprintf(stderr, "uncompress failed with %d for block %d, sector %d\n",
-			ret, block, sector);
-		return -1;
+	if (is_compressed) {
+		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+		cdbuffer_size = cdbuffer_size_expect;
+		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+		if (ret != 0) {
+			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+					ret, block, sector);
+			return -1;
+		}
+		if (cdbuffer_size != cdbuffer_size_expect)
+			SysPrintf("cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size,
+					cdbuffer_size_expect, sector);
 	}
-	if (cdbuffer_size != sizeof(compr_img->buff_raw[0]) * 16)
-		fprintf(stderr, "cdbuffer_size: %lu != %d, sector %d\n", cdbuffer_size,
-			sizeof(compr_img->buff_raw[0]) * 16, sector);
 
 	// done at last!
 	compr_img->current_block = block;
 
 finish:
 	if (dest != cdbuffer) // copy avoid HACK
-		memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk] + offset,
-			CD_FRAMESIZE_RAW - offset);
-	return CD_FRAMESIZE_RAW - offset;
+		memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk],
+			CD_FRAMESIZE_RAW);
+	return CD_FRAMESIZE_RAW;
 }
 
-static int cdread_2048(FILE *f, void *dest, int sector, int offset)
+static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector)
 {
 	int ret;
 
-	fseek(f, sector * 2048, SEEK_SET);
-	ret = fread((char *)dest + 12, 1, 2048, f);
+	fseek(f, base + sector * 2048, SEEK_SET);
+	ret = fread((char *)dest + 12 * 2, 1, 2048, f);
 
 	// not really necessary, fake mode 2 header
-	memset(cdbuffer, 0, 12);
-	sec2msf(sector + 2 * 75, (char *)cdbuffer);
-	cdbuffer[3] = 1;
+	memset(cdbuffer, 0, 12 * 2);
+	sec2msf(sector + 2 * 75, (char *)&cdbuffer[12]);
+	cdbuffer[12 + 3] = 1;
 
 	return ret;
 }
@@ -1002,7 +1196,7 @@ static unsigned char * CALLBACK ISOgetBuffer_compr(void) {
 }
 
 static unsigned char * CALLBACK ISOgetBuffer(void) {
-	return cdbuffer;
+	return cdbuffer + 12;
 }
 
 static void PrintTracks(void) {
@@ -1020,6 +1214,8 @@ static void PrintTracks(void) {
 // file for playback
 static long CALLBACK ISOopen(void) {
 	boolean isMode1ISO = FALSE;
+	char alt_bin_filename[MAXPATHLEN];
+	const char *bin_filename;
 
 	if (cdHandle != NULL) {
 		return 0; // it's already open
@@ -1027,6 +1223,8 @@ static long CALLBACK ISOopen(void) {
 
 	cdHandle = fopen(GetIsoFile(), "rb");
 	if (cdHandle == NULL) {
+		SysPrintf(_("Could't open '%s' for reading: %s\n"),
+			GetIsoFile(), strerror(errno));
 		return -1;
 	}
 
@@ -1036,14 +1234,13 @@ static long CALLBACK ISOopen(void) {
 	subChanMixed = FALSE;
 	subChanRaw = FALSE;
 	pregapOffset = 0;
+	cdrIsoMultidiskCount = 1;
+	multifile = 0;
 
 	CDR_getBuffer = ISOgetBuffer;
 	cdimg_read_func = cdread_normal;
 
-	if (parsecue(GetIsoFile()) == 0) {
-		SysPrintf("[+cue]");
-	}
-	else if (parsetoc(GetIsoFile()) == 0) {
+	if (parsetoc(GetIsoFile()) == 0) {
 		SysPrintf("[+toc]");
 	}
 	else if (parseccd(GetIsoFile()) == 0) {
@@ -1052,11 +1249,19 @@ static long CALLBACK ISOopen(void) {
 	else if (parsemds(GetIsoFile()) == 0) {
 		SysPrintf("[+mds]");
 	}
-	else if (parsepbp(GetIsoFile()) == 0) {
+	else if (parsecue(GetIsoFile()) == 0) {
+		SysPrintf("[+cue]");
+	}
+	if (handlepbp(GetIsoFile()) == 0) {
 		SysPrintf("[pbp]");
 		CDR_getBuffer = ISOgetBuffer_compr;
 		cdimg_read_func = cdread_compressed;
 	}
+	else if (handlecbin(GetIsoFile()) == 0) {
+		SysPrintf("[cbin]");
+		CDR_getBuffer = ISOgetBuffer_compr;
+		cdimg_read_func = cdread_compressed;
+	}
 
 	if (!subChanMixed && opensubfile(GetIsoFile()) == 0) {
 		SysPrintf("[+sub]");
@@ -1065,8 +1270,36 @@ static long CALLBACK ISOopen(void) {
 		SysPrintf("[+sbi]");
 	}
 
-	// guess whether it is mode1/2048
 	fseek(cdHandle, 0, SEEK_END);
+
+	// maybe user selected metadata file instead of main .bin ..
+	bin_filename = GetIsoFile();
+	if (ftell(cdHandle) < 2352 * 0x10) {
+		static const char *exts[] = { ".bin", ".BIN", ".img", ".IMG" };
+		FILE *tmpf = NULL;
+		size_t i;
+		char *p;
+
+		strncpy(alt_bin_filename, bin_filename, sizeof(alt_bin_filename));
+		alt_bin_filename[MAXPATHLEN - 1] = '\0';
+		if (strlen(alt_bin_filename) >= 4) {
+			p = alt_bin_filename + strlen(alt_bin_filename) - 4;
+			for (i = 0; i < sizeof(exts) / sizeof(exts[0]); i++) {
+				strcpy(p, exts[i]);
+				tmpf = fopen(alt_bin_filename, "rb");
+				if (tmpf != NULL)
+					break;
+			}
+		}
+		if (tmpf != NULL) {
+			bin_filename = alt_bin_filename;
+			fclose(cdHandle);
+			cdHandle = tmpf;
+			fseek(cdHandle, 0, SEEK_END);
+		}
+	}
+
+	// guess whether it is mode1/2048
 	if (ftell(cdHandle) % 2048 == 0) {
 		unsigned int modeTest = 0;
 		fseek(cdHandle, 0, SEEK_SET);
@@ -1089,9 +1322,10 @@ static long CALLBACK ISOopen(void) {
 
 	// make sure we have another handle open for cdda
 	if (numtracks > 1 && ti[1].handle == NULL) {
-		ti[1].handle = fopen(GetIsoFile(), "rb");
+		ti[1].handle = fopen(bin_filename, "rb");
 	}
-	cdda_cur_sector = cdda_start_sector = 0;
+	cdda_cur_sector = 0;
+	cdda_file_offset = 0;
 
 	return 0;
 }
@@ -1123,8 +1357,12 @@ static long CALLBACK ISOclose(void) {
 		}
 	}
 	numtracks = 0;
+	ti[1].type = 0;
 	UnloadSBI();
 
+	memset(cdbuffer, 0, sizeof(cdbuffer));
+	CDR_getBuffer = ISOgetBuffer;
+
 	return 0;
 }
 
@@ -1164,7 +1402,6 @@ static long CALLBACK ISOgetTN(unsigned char *buffer) {
 //  byte 2 - minute
 static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) {
 	if (track == 0) {
-		// CD length according pcsxr-svn (done a bit different here)
 		unsigned int sect;
 		unsigned char time[3];
 		sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length);
@@ -1208,6 +1445,7 @@ static void DecodeRawSubData(void) {
 // uses bcd format
 static long CALLBACK ISOreadTrack(unsigned char *time) {
 	int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2]));
+	long ret;
 
 	if (cdHandle == NULL) {
 		return -1;
@@ -1222,7 +1460,9 @@ static long CALLBACK ISOreadTrack(unsigned char *time) {
 		}
 	}
 
-	cdimg_read_func(cdHandle, cdbuffer, sector, 12);
+	ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector);
+	if (ret < 0)
+		return -1;
 
 	if (subHandle != NULL) {
 		fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);
@@ -1238,38 +1478,30 @@ static long CALLBACK ISOreadTrack(unsigned char *time) {
 // sector: byte 0 - minute; byte 1 - second; byte 2 - frame
 // does NOT uses bcd format
 static long CALLBACK ISOplay(unsigned char *time) {
-	unsigned int i, abs_sect;
-	int file_sect;
+	unsigned int i;
 
 	if (numtracks <= 1)
 		return 0;
 
 	// find the track
-	abs_sect = msf2sec((char *)time);
-	for (i = numtracks; i > 1; i--)
-		if (msf2sec(ti[i].start) <= abs_sect + 2 * 75)
+	cdda_cur_sector = msf2sec((char *)time);
+	for (i = numtracks; i > 1; i--) {
+		cdda_first_sector = msf2sec(ti[i].start);
+		if (cdda_first_sector <= cdda_cur_sector + 2 * 75)
 			break;
-
-	file_sect = ti[i].start_offset + (abs_sect - msf2sec(ti[i].start));
-	if (file_sect < 0)
-		file_sect = 0;
+	}
+	cdda_file_offset = ti[i].start_offset;
 
 	// find the file that contains this track
 	for (; i > 1; i--)
 		if (ti[i].handle != NULL)
 			break;
 
-	cdda_start_sector = abs_sect - file_sect;
 	cddaHandle = ti[i].handle;
 
-	if (pregapOffset && (unsigned int)(pregapOffset - file_sect) < 2 * 75) {
-		// get out of the missing pregap to avoid noise
-		file_sect = pregapOffset;
-	}
+	if (SPU_playCDDAchannel != NULL)
+		startCDDA();
 
-	if (SPU_playCDDAchannel != NULL) {
-		startCDDA(file_sect);
-	}
 	return 0;
 }
 
@@ -1289,20 +1521,74 @@ static unsigned char* CALLBACK ISOgetBufferSub(void) {
 }
 
 static long CALLBACK ISOgetStatus(struct CdrStat *stat) {
-	int sec;
-
+	u32 sect;
+	
 	CDR__getStatus(stat);
-
+	
 	if (playing) {
 		stat->Type = 0x02;
 		stat->Status |= 0x80;
 	}
 	else {
-		stat->Type = 0x01;
+		// BIOS - boot ID (CD type)
+		stat->Type = ti[1].type;
+	}
+	
+	// relative -> absolute time
+	sect = cddaCurPos;
+	sec2msf(sect, (char *)stat->Time);
+	
+	return 0;
+}
+
+// read CDDA sector into buffer
+long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) {
+	unsigned char msf[3] = {m, s, f};
+	unsigned int file, track, track_start = 0;
+	int ret;
+
+	cddaCurPos = msf2sec((char *)msf);
+
+	// find current track index
+	for (track = numtracks; ; track--) {
+		track_start = msf2sec(ti[track].start);
+		if (track_start <= cddaCurPos)
+			break;
+		if (track == 1)
+			break;
 	}
 
-	sec = cdda_start_sector + cdda_cur_sector;
-	sec2msf(sec, (char *)stat->Time);
+	// data tracks play silent
+	if (ti[track].type != CDDA) {
+		memset(buffer, 0, CD_FRAMESIZE_RAW);
+		return 0;
+	}
+
+	file = 1;
+	if (multifile) {
+		// find the file that contains this track
+		for (file = track; file > 1; file--)
+			if (ti[file].handle != NULL)
+				break;
+	}
+
+	ret = cdimg_read_func(ti[file].handle, ti[track].start_offset,
+		buffer, cddaCurPos - track_start);
+	if (ret != CD_FRAMESIZE_RAW) {
+		memset(buffer, 0, CD_FRAMESIZE_RAW);
+		return -1;
+	}
+
+	if (cddaBigEndian) {
+		int i;
+		unsigned char tmp;
+
+		for (i = 0; i < CD_FRAMESIZE_RAW / 2; i++) {
+			tmp = buffer[i * 2];
+			buffer[i * 2] = buffer[i * 2 + 1];
+			buffer[i * 2 + 1] = tmp;
+		}
+	}
 
 	return 0;
 }
@@ -1320,6 +1606,7 @@ void cdrIsoInit(void) {
 	CDR_stop = ISOstop;
 	CDR_getBufferSub = ISOgetBufferSub;
 	CDR_getStatus = ISOgetStatus;
+	CDR_readCDDA = ISOreadCDDA;
 
 	CDR_getDriveLetter = CDR__getDriveLetter;
 	CDR_configure = CDR__configure;