RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 14:57:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

UIQ3 update, some makefile unification, rm old configs, stuff

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@569 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-08-21 10:45:54 +00:00
parent 5d239ae7a4
commit 36f6fd5afe
18 changed files with 339 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

13
psp/emu.c
View file

@ -54,9 +54,10 @@ void emu_noticeMsgUpdated(void)
noticeMsgTime = sceKernelGetSystemTimeLow();
}
void emu_getMainDir(char *dst, int len)
int emu_getMainDir(char *dst, int len)
{
if (len > 0) *dst = 0;
return 0;
}
static void osd_text(int x, const char *text, int is_active, int clear_all)
@ -155,16 +156,6 @@ void emu_prepareDefaultConfig(void)
defaultConfig.turbo_rate = 15;
}
void emu_setDefaultConfig(void)
{
memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
PicoOpt = currentConfig.s_PicoOpt;
PsndRate = currentConfig.s_PsndRate;
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
}
extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);

4
psp/main.c
View file

@ -52,13 +52,13 @@ int pico_main(void)
#ifndef GPROF
menu_loop();
#else
strcpy(romFileName, lastRomFile);
strcpy(romFileName, loadedRomFName);
engineState = PGS_ReloadRom;
#endif
break;
case PGS_ReloadRom:
if (emu_ReloadRom()) {
if (emu_ReloadRom(romFileName)) {
engineState = PGS_Running;
if (mp3_last_error != 0)
engineState = PGS_Menu; // send to menu to display mp3 error

12
psp/menu.c
View file

@ -825,7 +825,7 @@ menu_entry cdopt_entries[] =
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },
{ "CD LEDs", MB_ONOFF, MA_CDOPT_LEDS, &currentConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },
{ "CDDA audio (using mp3s)", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },
{ "CDDA audio", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },
{ "PCM audio", MB_ONOFF, MA_CDOPT_PCM, &PicoOpt, 0x0400, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_CDOPT_READAHEAD, NULL, 0, 0, 0, 1, 1 },
{ "SaveRAM cart", MB_ONOFF, MA_CDOPT_SAVERAM, &PicoOpt, 0x8000, 0, 0, 1, 1 },
@ -1632,10 +1632,10 @@ static void menu_loop_root(void)
{
char curr_path[PATH_MAX], *selfname;
FILE *tstf;
if ( (tstf = fopen(lastRomFile, "rb")) )
if ( (tstf = fopen(loadedRomFName, "rb")) )
{
fclose(tstf);
strcpy(curr_path, lastRomFile);
strcpy(curr_path, loadedRomFName);
}
else
getcwd(curr_path, PATH_MAX);
@ -1777,10 +1777,10 @@ int menu_loop_tray(void)
menu_gfx_prepare();
if ( (tstf = fopen(lastRomFile, "rb")) )
if ( (tstf = fopen(loadedRomFName, "rb")) )
{
fclose(tstf);
strcpy(curr_path, lastRomFile);
strcpy(curr_path, loadedRomFName);
}
else
{
@ -1804,7 +1804,7 @@ int menu_loop_tray(void)
if (selfname) {
int ret = -1;
cd_img_type cd_type;
cd_type = emu_cdCheck(NULL);
cd_type = emu_cdCheck(NULL, romFileName);
if (cd_type != CIT_NOT_CD)
ret = Insert_CD(romFileName, cd_type);
if (ret != 0) {

6
psp/port_config.h
View file

@ -28,4 +28,10 @@ extern void blit1(void);
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
#define dprintf(x...)
// platform
#define PLAT_MAX_KEYS 32
#define PLAT_HAVE_JOY 0
#define PATH_SEP "/"
#define PATH_SEP_C '/'
#endif //PORT_CONFIG_H