diff options
| author | notaz | 2011-02-06 02:22:05 +0200 |
|---|---|---|
| committer | notaz | 2011-02-10 02:07:54 +0200 |
| commit | 54b4a001cf0b0f165a59b727c4b201226eda014c (patch) | |
| tree | 25e3d317d97599793fc8ce0046c0600b43382991 /maemo/main.c | |
| parent | 799b0b8773d6add1de99efd582c93701b82e970d (diff) | |
| download | pcsx_rearmed-54b4a001cf0b0f165a59b727c4b201226eda014c.tar.gz pcsx_rearmed-54b4a001cf0b0f165a59b727c4b201226eda014c.tar.bz2 pcsx_rearmed-54b4a001cf0b0f165a59b727c4b201226eda014c.zip | |
maemo: update for recent changes, fix warnings
Diffstat (limited to 'maemo/main.c')
| -rw-r--r-- | maemo/main.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/maemo/main.c b/maemo/main.c index 267fb55..80919ac 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -7,17 +7,13 @@ #include <stdio.h> #include <string.h> -#include <stdarg.h> -#include <dlfcn.h> -#include <sys/stat.h> -#include <sys/types.h> +#include <stdint.h> #include <unistd.h> -#include <signal.h> #include "main.h" #include "plugin.h" #include "../libpcsxcore/misc.h" -#include "../plugins/cdrcimg/cdrcimg.h" +#include "../libpcsxcore/new_dynarec/new_dynarec.h" // from softgpu plugin extern int iUseDither; @@ -34,11 +30,14 @@ extern int iXAPitch; extern int iSPUIRQWait; extern int iUseTimer; +enum sched_action emu_action; +void do_emu_action(void); + static void ChangeWorkingDirectory(char *exe) { - s8 exepath[1024]; - s8* s; - sprintf(exepath, "%s", exe); + char exepath[1024]; + char *s; + snprintf(exepath, sizeof(exepath), "%s", exe); s = strrchr(exepath, '/'); if (s != NULL) { *s = '\0'; @@ -53,7 +52,6 @@ int maemo_main(int argc, char **argv) char path[MAXPATHLEN]; const char *cdfile = NULL; int loadst = 0; - void *tmp; int i; strcpy(Config.BiosDir, "/home/user/MyDocs"); @@ -190,7 +188,15 @@ int maemo_main(int argc, char **argv) return 0; } - psxCpu->Execute(); + while (1) + { + stop = 0; + emu_action = SACTION_NONE; + + psxCpu->Execute(); + if (emu_action != SACTION_NONE) + do_emu_action(); + } return 0; } |