1.35a psp bugfix release

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@300 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-11-20 21:38:07 +00:00
parent aefb65bc6a
commit c6196c0f01
14 changed files with 72 additions and 34 deletions

View file

@ -150,7 +150,7 @@ static int g_read_offs = 0;
#define R_ERROR_RETURN(error) \
{ \
printf("PicoCdLoadState @ %x: " error "\n", g_read_offs); \
elprintf(EL_STATUS, "PicoCdLoadState @ %x: " error "\n", g_read_offs); \
return 1; \
}
@ -165,7 +165,7 @@ static int g_read_offs = 0;
#define CHECKED_READ2(len2,data) \
if (len2 != len) { \
printf("unexpected len %i, wanted %i (%s)", len, len2, #len2); \
elprintf(EL_STATUS, "unexpected len %i, wanted %i (%s)", len, len2, #len2); \
if (len > len2) R_ERROR_RETURN("failed."); \
/* else read anyway and hope for the best.. */ \
} \
@ -235,7 +235,7 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
case CHUNK_MISC_CD: CHECKED_READ_BUFF(Pico_mcd->m); break;
default:
printf("PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
elprintf(EL_STATUS, "PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
areaSeek(file, len, SEEK_CUR);
break;
}

View file

@ -43,7 +43,7 @@ void PicoCDBufferFree(void)
cd_buffer = NULL;
}
if (reads)
printf("CD buffer hits: %i/%i (%i%%)\n", hits, reads, hits * 100 / reads);
elprintf(EL_STATUS, "CD buffer hits: %i/%i (%i%%)\n", hits, reads, hits * 100 / reads);
}
@ -80,7 +80,6 @@ PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba)
dprintf("CD buffer seek %i -> %i\n", prev_lba, lba);
pm_seek(Pico_mcd->TOC.Tracks[0].F, where_seek, SEEK_SET);
}
else if (prev_lba == 0x80000000) printf("wtf?\n");
dprintf("CD buffer miss %i -> %i\n", prev_lba, lba);
@ -90,7 +89,6 @@ else if (prev_lba == 0x80000000) printf("wtf?\n");
dprintf("CD buffer move=%i, read_len=%i", PicoCDBuffers - read_len, read_len);
memmove(cd_buffer + read_len*2048, cd_buffer, (PicoCDBuffers - read_len)*2048);
moved = 1;
if (prev_lba == 0x80000000) printf("wtf?\n");
}
else
{

View file

@ -660,7 +660,7 @@ PICO_INTERNAL int Close_Tray_CDD_cC(void)
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
printf("tray close\n");
elprintf(EL_STATUS, "tray close\n");
if (PicoMCDcloseTray != NULL)
CD_Present = PicoMCDcloseTray();
@ -685,7 +685,7 @@ PICO_INTERNAL int Open_Tray_CDD_cD(void)
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
printf("tray open\n");
elprintf(EL_STATUS, "tray open\n");
Unload_ISO();
CD_Present = 0;

View file

@ -56,7 +56,7 @@ PICO_INTERNAL void pcm_set_rate(int rate)
step *= 256*256/4;
g_rate = (unsigned int) step;
if (step - (float) g_rate >= 0.5) g_rate++;
printf("g_rate: %f %08x\n", (double)step, g_rate);
elprintf(EL_STATUS, "g_rate: %f %08x\n", (double)step, g_rate);
}