RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.35a psp bugfix release

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
Pico/Cart.c
View file

@ -257,7 +257,7 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize)
// Allocate space for the rom plus padding
rom=PicoCartAlloc(size);
if (rom==NULL) {
printf("out of memory (wanted %i)\n", size);
elprintf(EL_STATUS, "out of memory (wanted %i)", size);
return 1;
}
@ -281,7 +281,7 @@ int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize)
else
bytes_read = pm_read(rom,size,f); // Load up the rom
if (bytes_read <= 0) {
printf("read failed\n");
elprintf(EL_STATUS, "read failed");
free(rom);
return 1;
}

6
Pico/cd/Area.c
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;
}

4
Pico/cd/buffering.c
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
{

4
Pico/cd/cd_sys.c
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;

2
Pico/cd/pcm.c
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);
}

5
Pico/sound/sound.c
View file

@ -372,7 +372,7 @@ PICO_INTERNAL void z80_init(void)
memset(&CZ80, 0, sizeof(CZ80));
Cz80_Init(&CZ80);
Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram - 0x2000); // mirror
Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // mirror
Cz80_Set_ReadB(&CZ80, (UINT8 (*)(UINT32 address))z80_read); // unused (hacked in)
Cz80_Set_WriteB(&CZ80, z80_write);
Cz80_Set_INPort(&CZ80, z80_in);
@ -395,6 +395,9 @@ PICO_INTERNAL void z80_reset(void)
drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
#elif defined(_USE_CZ80)
Cz80_Reset(&CZ80);
Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);
Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
#endif
Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
}

11
platform/base_readme.txt
View file

@ -49,9 +49,7 @@ If you are running a custom firmware, just copy the whole PicoDrive directory to
/PSP/GAME or /PSP/GAMEXXX directory in your memory stick (it shouldn't matter
which one GAME* directory to use).
If you are on 1.5, you will have to use KXploit tool to create the needed files
and directories, and then copy them to /PSP/GAME. I assume 1.5 users know how to
do this, if not, just google for KXploit.
If you are on 1.5, there is a separate KXploited version for it.
#endif
Note that this emulator may require some tweaking of configuration settings to run
@ -630,6 +628,13 @@ Additional thanks
Changelog
---------
1.35a
* PSP: fixed a bug which prevented to load any ROMs after testing the BIOS.
* PSP: fixed incorrect CZ80 memory map setup, which caused Z80 crashes and
graphics corruption in EU Mega CD model1 BIOS menus.
+ PSP: added additional "set to 4:3 scaled" display option for convenience.
+ Added an option to disable frame limitter (works only with non-auto frameskip).
1.35
+ PSP port added. Lots of new code for it. Integrated modified FAME/C, CZ80 cores.
+ Some minor generic optimizations.

16
platform/common/emu.c
View file

@ -137,6 +137,19 @@ int emu_findBios(int region, char **bios_file)
}
}
/* check if the name begins with BIOS name */
static int emu_isBios(const char *name)
{
int i;
for (i = 0; i < sizeof(biosfiles_us)/sizeof(biosfiles_us[0]); i++)
if (strstr(name, biosfiles_us[i]) != NULL) return 1;
for (i = 0; i < sizeof(biosfiles_eu)/sizeof(biosfiles_eu[0]); i++)
if (strstr(name, biosfiles_eu[i]) != NULL) return 1;
for (i = 0; i < sizeof(biosfiles_jp)/sizeof(biosfiles_jp[0]); i++)
if (strstr(name, biosfiles_jp[i]) != NULL) return 1;
return 0;
}
/* checks if romFileName points to valid MegaCD image
* if so, checks for suitable BIOS */
int emu_cdCheck(int *pregion)
@ -340,9 +353,12 @@ int emu_ReloadRom(void)
menu_romload_end();
if (!emu_isBios(romFileName))
{
// emu_ReadConfig() might have messed currentConfig.lastRomFile
strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
}
if (PicoPatches) {
PicoPatchPrepare();

2
platform/common/emu.h
View file

@ -9,7 +9,7 @@ typedef struct {
// squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode
// craigix_ram, confirm_save, show_cd_leds, confirm_load
// A_SNs_gamma, perfect_vsync, giz_scanlines, giz_dblbuff
// vsync_mode, show_clock
// vsync_mode, show_clock, no_frame_limitter
int PicoOpt; // used for config saving only, see Pico.h
int PsndRate; // ditto
int PicoRegion; // ditto

2
platform/common/menu.h
View file

@ -64,11 +64,13 @@ typedef enum
MA_OPT2_RAMTIMINGS, /* gp2x */
MA_OPT2_SQUIDGEHACK, /* gp2x */
MA_OPT2_STATUS_LINE, /* psp */
MA_OPT2_NO_FRAME_LIMIT, /* psp */
MA_OPT2_DONE,
MA_OPT3_SCALE, /* psp (all OPT3) */
MA_OPT3_HSCALE32,
MA_OPT3_HSCALE40,
MA_OPT3_PRES_NOSCALE,
MA_OPT3_PRES_SCALE43,
MA_OPT3_PRES_FULLSCR,
MA_OPT3_FILTERING,
MA_OPT3_VSYNC,

6
platform/psp/emu.c
View file

@ -197,7 +197,6 @@ static void set_scaling_params(void)
if (fbimg_width >= 480) {
g_vertices[0].u = (fbimg_width-480)/2;
g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1;
if (fbimg_width == 480) border_hack = 1;
fbimg_width = 480;
fbimg_xoffs = 0;
} else {
@ -205,6 +204,7 @@ static void set_scaling_params(void)
g_vertices[1].u = src_width;
fbimg_xoffs = 240 - fbimg_width/2;
}
if (fbimg_width > 320 && fbimg_width <= 480) border_hack = 1;
if (fbimg_height >= 272) {
g_vertices[0].v = (fbimg_height-272)/2;
@ -990,7 +990,7 @@ void emu_Loop(void)
for (i = 0; i < currentConfig.Frameskip; i++) {
updateKeys();
SkipFrame(); frames_done++;
if (PsndOut) { // do framelimitting if sound is enabled
if (!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if needed
int tval_diff;
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
@ -1035,7 +1035,7 @@ void emu_Loop(void)
if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
reset_timing = 1;
else if (PsndOut != NULL || currentConfig.Frameskip < 0)
else if (!(currentConfig.EmuOpt&0x40000) || currentConfig.Frameskip < 0)
{
// sleep if we are still too fast
if (tval_diff < lim_time)

16
platform/psp/menu.c
View file

@ -335,13 +335,14 @@ end:
}
static SceIoStat cpstat;
static char *romsel_loop(char *curr_path)
{
struct my_dirent **namelist;
int n, iret, sel = 0;
unsigned long inp = 0;
char *ret = NULL, *fname = NULL;
SceIoStat cpstat;
// is this a dir or a full path?
memset(&cpstat, 0, sizeof(cpstat));
@ -349,9 +350,12 @@ static char *romsel_loop(char *curr_path)
if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFREG)) { // file
char *p;
for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--);
if (p > curr_path) {
*p = 0;
fname = p+1;
}
else strcpy(curr_path, "ms0:/");
}
else if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFDIR)); // dir
else strcpy(curr_path, "ms0:/"); // something else
@ -402,7 +406,7 @@ static char *romsel_loop(char *curr_path)
p = start + strlen(start) - 1;
while (*p == '/' && p > start) p--;
while (*p != '/' && *p != ':' && p > start) p--;
if (p <= start || *p == ':' || p[-1] == ':') strcpy(newdir, "ms0:/");
if (p <= start || *p == ':') strcpy(newdir, "ms0:/");
else { strncpy(newdir, start, p-start); newdir[p-start] = 0; }
} else {
strcpy(newdir, curr_path);
@ -1004,6 +1008,7 @@ menu_entry opt3_entries[] =
{ NULL, MB_ONOFF, MA_OPT3_FILTERING, &currentConfig.scaling, 1, 0, 0, 1 },
{ NULL, MB_NONE, MA_OPT3_VSYNC, NULL, 0, 0, 0, 1 },
{ "Set to unscaled centered", MB_NONE, MA_OPT3_PRES_NOSCALE, NULL, 0, 0, 0, 1 },
{ "Set to 4:3 scaled", MB_NONE, MA_OPT3_PRES_SCALE43, NULL, 0, 0, 0, 1 },
{ "Set to fullscreen", MB_NONE, MA_OPT3_PRES_FULLSCR, NULL, 0, 0, 0, 1 },
{ "done", MB_NONE, MA_OPT3_DONE, NULL, 0, 0, 0, 1 },
};
@ -1137,6 +1142,12 @@ static void dispmenu_loop_options(void)
currentConfig.scale = currentConfig.hscale40 = currentConfig.hscale32 = 1.0;
menu_opt3_preview(is_32col);
break;
case MA_OPT3_PRES_SCALE43:
currentConfig.scale = 1.20;
currentConfig.hscale40 = 1.00;
currentConfig.hscale32 = 1.25;
menu_opt3_preview(is_32col);
break;
case MA_OPT3_PRES_FULLSCR:
currentConfig.scale = 1.20;
currentConfig.hscale40 = 1.25;
@ -1164,6 +1175,7 @@ menu_entry opt2_entries[] =
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, &currentConfig.EmuOpt, 0x00008, 0, 0, 1 },
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, &currentConfig.EmuOpt, 0x00020, 0, 0, 1 },
{ "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, &currentConfig.EmuOpt, 0x20000, 0, 0, 1 },
{ "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, &currentConfig.EmuOpt, 0x40000, 0, 0, 1 },
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 },
};

2
platform/psp/psp.c
View file

@ -212,6 +212,7 @@ char *psp_get_status_line(void)
/* alt logging */
#define LOG_FILE "log.txt"
#ifndef LPRINTF_STDIO
typedef struct _log_entry
{
char buff[256];
@ -219,6 +220,7 @@ typedef struct _log_entry
} log_entry;
static log_entry *le_root = NULL;
#endif
void lprintf_f(const char *fmt, ...)
{

2
platform/psp/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.35"
#define VERSION "1.35a"