#include "plugin_lib.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
-
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iSPUIRQWait;
-extern int iUseTimer;
+#include "../plugins/dfinput/main.h"
+#include "maemo_common.h"
int g_opts = OPT_SHOWFPS;
+int g_maemo_opts;
+int g_scaler, soft_filter;
+int g_menuscreen_w, g_menuscreen_h;
+
+char file_name[MAXPATHLEN];
enum sched_action emu_action;
void do_emu_action(void);
}
}
-int maemo_main(int argc, char **argv)
+int main(int argc, char **argv)
{
- ChangeWorkingDirectory("c");
char file[MAXPATHLEN] = "";
char path[MAXPATHLEN];
const char *cdfile = NULL;
int loadst = 0;
int i;
+ emu_core_preinit();
+ ChangeWorkingDirectory("c");
+
strcpy(Config.BiosDir, "/home/user/MyDocs");
strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins");
snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR);
Config.PsxAuto = 1;
-
+
+ g_menuscreen_w = 800;
+ g_menuscreen_h = 480;
+
+ pl_init();
+
+ emu_core_init();
+
// read command line options
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]);
else if (!strcmp(argv[i], "-cdfile")) {
char isofilename[MAXPATHLEN];
-
if (i+1 >= argc) break;
strncpy(isofilename, argv[++i], MAXPATHLEN);
if (isofilename[0] != '/') {
} else
isofilename[0] = 0;
}
-
cdfile = isofilename;
}
else if (!strcmp(argv[i],"-frameskip")) {
-
int tv_reg = atol(argv[++i]);
if (tv_reg > 0)
- pl_rearmed_cbs.frameskip = 1;
- }
- else if (!strcmp(argv[i],"-sputhreaded")) {
- iUseTimer=1;
- }
- else if (!strcmp(argv[i],"-nosound")) {
- strcpy(Config.Spu, "spunull.so");
- }
- else if(!strcmp(argv[i], "-bdir")) sprintf(Config.BiosDir, "%s", argv[++i]);
- else if(!strcmp(argv[i], "-bios")) sprintf(Config.Bios, "%s", argv[++i]);
- else if (!strcmp(argv[i],"-gles")){
- strcpy(Config.Gpu, "gpuGLES.so");
+ pl_rearmed_cbs.frameskip = -1;
}
+ else if (!strcmp(argv[i],"-fullscreen")) g_maemo_opts |= 2;
+ else if (!strcmp(argv[i],"-accel")) g_maemo_opts |= 4;
+ else if (!strcmp(argv[i],"-nosound")) strcpy(Config.Spu, "spunull.so");
+ else if (!strcmp(argv[i], "-bdir")) sprintf(Config.BiosDir, "%s", argv[++i]);
+ else if (!strcmp(argv[i], "-bios")) sprintf(Config.Bios, "%s", argv[++i]);
+ else if (!strcmp(argv[i], "-gles")) strcpy(Config.Gpu, "gpuGLES.so");
else if (!strcmp(argv[i], "-cdda")) Config.Cdda = 1;
else if (!strcmp(argv[i], "-xa")) Config.Xa = 1;
else if (!strcmp(argv[i], "-rcnt")) Config.RCntFix = 1 ;
else if (!strcmp(argv[i], "-sio")) Config.Sio = 1;
else if (!strcmp(argv[i], "-spuirq")) Config.SpuIrq = 1;
else if (!strcmp(argv[i], "-vsync")) Config.VSyncWA = 1;
- else if (!strcmp(argv[i], "-h") ||
- !strcmp(argv[i], "-help") ||
- !strcmp(argv[i], "--help")) {
- printf(PACKAGE_NAME " " PACKAGE_VERSION "\n");
- printf("%s\n", _(
- " pcsx [options] [file]\n"
- "\toptions:\n"
- "\t-cdfile FILE\tRuns a CD image file\n"
- "\t-psxout\t\tEnable PSX output\n"
- "\t-nosound\t\tDisable sound using spunull plugin\n"
- "\t-sputhreaded\t\tMove sound to separate thread\n"
- "\t-frameskip\t\tEnable frameskip\n"
- "\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
- "\t-h -help\tDisplay this message\n"
- "\tfile\t\tLoads file\n"));
- return 0;
- } else {
- strncpy(file, argv[i], MAXPATHLEN);
- if (file[0] != '/') {
- getcwd(path, MAXPATHLEN);
- if (strlen(path) + strlen(file) + 1 < MAXPATHLEN) {
- strcat(path, "/");
- strcat(path, file);
- strcpy(file, path);
- } else
- file[0] = 0;
- }
- }
}
- pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
- iUseReverb = 2;
- iUseInterpolation = 1;
- iSPUIRQWait = 1;
- iUseTimer = 2;
-
- in_type1 = PSE_PAD_TYPE_STANDARD;
- in_type2 = PSE_PAD_TYPE_STANDARD;
-
hildon_init(&argc, &argv);
- if (cdfile)
+ if (cdfile) {
set_cd_image(cdfile);
-
- if (SysInit() == -1)
- return 1;
-
- pl_init();
+ strcpy(file_name, strrchr(cdfile,'/'));
+ }
if (LoadPlugins() == -1) {
SysMessage("Failed loading plugins!");
printf(_("Could not load CD-ROM!\n"));
return -1;
}
+ emu_on_new_cd(0);
ready_to_go = 1;
}
}
+ if (!ready_to_go) {
+ printf ("something goes wrong, maybe you forgot -cdfile ? \n");
+ return 1;
+ }
+
// If a state has been specified, then load that
if (loadst) {
int ret = emu_load_state(loadst - 1);
printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
}
- if (ready_to_go)
- maemo_init();
- else
- {
- printf ("somethings goes wrong, maybe you forgot -cdfile ? \n");
- return 0;
+ maemo_init(&argc, &argv);
+
+ if (GPU_open != NULL) {
+ int ret = GPU_open(&gpuDisp, "PCSX", NULL);
+ if (ret)
+ fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
}
+ dfinput_activate();
pl_timing_prepare(Config.PsxType);
while (1)
notaz.gp2x.de / pcsx_rearmed.git / blobdiff