#else
#include <pthread.h>
#include <sys/time.h>
+#include <unistd.h>
#endif
#include <zlib.h>
static boolean subChanRaw = FALSE;
static boolean subChanMissing = FALSE;
-static unsigned char cdbuffer[DATA_SIZE];
+static unsigned char cdbuffer[CD_FRAMESIZE_RAW];
static unsigned char subbuffer[SUB_FRAMESIZE];
static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10];
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, void *dest, int sector);
char* CALLBACK CDR__getDriveLetter(void);
long CALLBACK CDR__configure(void);
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);
+ d = cdimg_read_func(cddaHandle, sndbuffer + s, cdda_cur_sector);
if (d < CD_FRAMESIZE_RAW)
break;
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");
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;
}
// multidisk image?
ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET);
if (ret != 0) {
- fprintf(stderr, "failed to seek to %x\n", pbp_hdr.psar_offs + 0x200);
+ SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200);
goto fail_io;
}
if (fread(&offsettab, 1, sizeof(offsettab), cdHandle) != sizeof(offsettab)) {
- fprintf(stderr, "failed to read offsettab\n");
+ SysPrintf("failed to read offsettab\n");
goto fail_io;
}
}
cdrIsoMultidiskCount = i;
if (cdrIsoMultidiskCount == 0) {
- fprintf(stderr, "multidisk eboot has 0 images?\n");
+ SysPrintf("multidisk eboot has 0 images?\n");
goto fail_io;
}
ret = fseek(cdHandle, psisoimg_offs, SEEK_SET);
if (ret != 0) {
- fprintf(stderr, "failed to seek to %x\n", psisoimg_offs);
+ SysPrintf("failed to seek to %x\n", psisoimg_offs);
goto fail_io;
}
}
if (strcmp(psar_sig, "PSISOIMG00") != 0) {
- fprintf(stderr, "bad psar_sig: %s\n", psar_sig);
+ SysPrintf("bad psar_sig: %s\n", psar_sig);
goto fail_io;
}
// seek to TOC
ret = fseek(cdHandle, psisoimg_offs + 0x800, SEEK_SET);
if (ret != 0) {
- fprintf(stderr, "failed to seek to %x\n", psisoimg_offs + 0x800);
+ SysPrintf("failed to seek to %x\n", psisoimg_offs + 0x800);
goto fail_io;
}
// seek to ISO index
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;
}
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;
}
ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle);
if (ret != sizeof(ciso_hdr)) {
- fprintf(stderr, "failed to read ciso header\n");
+ 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) {
- fprintf(stderr, "bad ciso header\n");
+ 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) {
- fprintf(stderr, "failed to seek to %x\n", ciso_hdr.header_size);
+ SysPrintf("failed to seek to %x\n", ciso_hdr.header_size);
return -1;
}
}
ret = fread(compr_img->index_table, sizeof(compr_img->index_table[0]), compr_img->index_len, cdHandle);
if (ret != compr_img->index_len) {
- fprintf(stderr, "failed to read index table\n");
+ SysPrintf("failed to read index table\n");
goto fail_index;
}
compr_img->index_table[i] = (index << ciso_hdr.align) | plain;
}
if ((long long)index << ciso_hdr.align >= 0x80000000ll)
- fprintf(stderr, "warning: ciso img too large, expect problems\n");
+ SysPrintf("warning: ciso img too large, expect problems\n");
return 0;
return LoadSBI(sbiname, s);
}
-static int cdread_normal(FILE *f, void *dest, int sector, int offset)
+static int cdread_normal(FILE *f, void *dest, int sector)
{
- fseek(f, sector * CD_FRAMESIZE_RAW + offset, SEEK_SET);
- return fread(dest, 1, CD_FRAMESIZE_RAW - offset, f);
+ fseek(f, 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, 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, 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();
return ret == 1 ? 0 : ret;
}
-static int cdread_compressed(FILE *f, void *dest, int sector, int offset)
+static int cdread_compressed(FILE *f, void *dest, int sector)
{
unsigned long cdbuffer_size, cdbuffer_size_expect;
unsigned int start_byte, size;
}
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] & 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;
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(is_compressed ? compr_img->buff_compressed : compr_img->buff_raw[0],
1, size, cdHandle) != size) {
- fprintf(stderr, "read error for block %d at %x: ", block, start_byte);
+ SysPrintf("read error for block %d at %x: ", block, start_byte);
perror(NULL);
return -1;
}
cdbuffer_size = cdbuffer_size_expect;
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",
+ SysPrintf("uncompress failed with %d for block %d, sector %d\n",
ret, block, sector);
return -1;
}
if (cdbuffer_size != cdbuffer_size_expect)
- fprintf(stderr, "cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size,
+ SysPrintf("cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size,
cdbuffer_size_expect, sector);
}
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, void *dest, int sector)
{
int ret;
fseek(f, sector * 2048, SEEK_SET);
- ret = fread((char *)dest + 12, 1, 2048, f);
+ 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;
}
}
static unsigned char * CALLBACK ISOgetBuffer(void) {
- return cdbuffer;
+ return cdbuffer + 12;
}
static void PrintTracks(void) {
}
}
- cdimg_read_func(cdHandle, cdbuffer, sector, 12);
+ cdimg_read_func(cdHandle, cdbuffer, sector);
if (subHandle != NULL) {
fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);