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

PSP sleep mode fixed, hopefully for read; 1.50 release

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@538 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-07-09 19:52:17 +00:00
parent 366747cc4b
commit 4b811a8abe
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base_readme.txt
View file

@ -657,7 +657,7 @@ Changelog
* Improved renderer performance for shadow/hilight mode.
* Added a hack for YM2612 frequency overflow issue (bleep noises
in Shaq Fu, Spider-Man - The Animated Series (intro music), etc.)
Credits to Nemesis @ spritesmind forum. Works only sound rate
Credits to Nemesis @ spritesmind forum. Works only if sound rate
is set to 44kHz.
+ Implemented some sprite rendering improvements, as suggested by
Exophase. Games with lots of sprites now perform better.
@ -675,6 +675,7 @@ Changelog
* Fixed a bug in Sega CD savestate loader, where the game would
sometimes crash after load.
* Fixed a crash of games using eeprom (introduced in 1.40b).
* PSP: fixed suspend/resume (hopefully for real).
1.40c
* Fixed a problem with sound in Marble Madness.

1
psp/emu.h
View file

@ -15,6 +15,7 @@ enum TPicoGameState {
PGS_Menu,
PGS_RestartRun,
PGS_Suspending,
PGS_SuspendAck,
};
extern char romFileName[];

7
psp/main.c
View file

@ -12,7 +12,6 @@
#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
#include "version.h"
#ifdef GPROF
#include <pspprof.h>
@ -32,7 +31,6 @@ void dummy(void)
int pico_main(void)
{
lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
psp_init();
emu_prepareDefaultConfig();
@ -71,8 +69,11 @@ int pico_main(void)
break;
case PGS_Suspending:
while (engineState == PGS_Suspending)
while (engineState == PGS_Suspending || engineState == PGS_SuspendAck) {
if (engineState == PGS_Suspending)
engineState = PGS_SuspendAck;
psp_wait_suspend();
}
break;
case PGS_RestartRun:

14
psp/psp.c
View file

@ -20,19 +20,20 @@
#include "psp.h"
#include "emu.h"
#include "../common/lprintf.h"
#include "version.h"
extern int pico_main(void);
#ifndef FW15
PSP_MODULE_INFO("PicoDrive", 0, 1, 40);
PSP_MODULE_INFO("PicoDrive", 0, 1, 50);
PSP_HEAP_SIZE_MAX();
int main() { return pico_main(); } /* just a wrapper */
#else
PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 40);
PSP_MODULE_INFO("PicoDrive", 0x1000, 1, 50);
PSP_MAIN_THREAD_ATTR(0);
int main()
@ -79,16 +80,20 @@ static int exit_callback(int arg1, int arg2, void *common)
static int power_callback(int unknown, int pwrflags, void *common)
{
static int old_state = PGS_Menu;
int i;
lprintf("power_callback: flags: 0x%08X\n", pwrflags);
/* check for power switch and suspending as one is manual and the other automatic */
if (pwrflags & PSP_POWER_CB_POWER_SWITCH || pwrflags & PSP_POWER_CB_SUSPENDING || pwrflags & PSP_POWER_CB_STANDBY)
{
if (engineState != PGS_Suspending) {
if (engineState != PGS_Suspending && engineState != PGS_SuspendAck) {
old_state = engineState;
engineState = PGS_Suspending;
}
for (i = 0; i < 10 && engineState != PGS_SuspendAck; i++)
sceKernelDelayThread(100*1024);
}
else if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE)
{
@ -129,6 +134,7 @@ void psp_init(void)
main_thread_id = sceKernelGetThreadId();
lprintf("\n%s\n", "PicoDrive v" VERSION " " __DATE__ " " __TIME__);
lprintf("running on %08x kernel\n", sceKernelDevkitVersion()),
lprintf("entered psp_init, threadId %08x, priority %i\n", main_thread_id,
sceKernelGetThreadCurrentPriority());
@ -304,6 +310,8 @@ typedef struct _log_entry
static log_entry *le_root = NULL;
#endif
/* strange: if this function leaks memory (before psp_init() call?),
* resume after suspend breaks on 3.90 */
void lprintf(const char *fmt, ...)
{
va_list vl;