/*
- * (C) notaz, 2010
+ * (C) notaz, 2010-2011
*
* This work is licensed under the terms of the GNU GPLv2 or later.
* See the COPYING file in the top-level directory.
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <signal.h>
+#include "main.h"
#include "plugin.h"
+#include "plugin_lib.h"
#include "pcnt.h"
#include "menu.h"
-#include "../gui/Linux.h"
#include "../libpcsxcore/misc.h"
+#include "../plugins/cdrcimg/cdrcimg.h"
#include "common/plat.h"
#include "common/input.h"
int ready_to_go;
-int UseGui;
+unsigned long gpuDisp;
+char cfgfile_basename[MAXPATHLEN];
static char *(*real_getenv)(const char *name);
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
create_profile_dir(PLUGINS_CFG_DIR);
create_profile_dir(CHEATS_DIR);
create_profile_dir(PATCHES_DIR);
+ create_profile_dir(PCSX_DOT_DIR "cfg");
}
-static void CreateMemcard(char *filename, char *conf_mcd) {
- struct stat buf;
+void set_cd_image(const char *fname)
+{
+ const char *ext = NULL;
+
+ if (fname != NULL)
+ ext = strrchr(fname, '.');
+
+ if (ext && (
+ strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
+ strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) {
+ SetIsoFile(NULL);
+ cdrcimg_set_fname(fname);
+ strcpy(Config.Cdr, "builtin_cdrcimg");
+ } else {
+ SetIsoFile(fname);
+ strcpy(Config.Cdr, "builtin_cdr");
+ }
+}
- make_path(conf_mcd, MAXPATHLEN, MEMCARD_DIR, filename);
+static void set_default_paths(void)
+{
+ MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
+ MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
+ strcpy(Config.BiosDir, "bios");
- /* Only create a memory card if an existing one does not exist */
- if (stat(conf_mcd, &buf) == -1) {
- SysPrintf(_("Creating memory card: %s\n"), conf_mcd);
- CreateMcd(conf_mcd);
- }
+ strcpy(Config.PluginsDir, "plugins");
+ strcpy(Config.Gpu, "builtin_gpu");
+ strcpy(Config.Spu, "builtin_spu");
+ strcpy(Config.Cdr, "builtin_cdr");
+ strcpy(Config.Pad1, "builtin_pad");
+ strcpy(Config.Pad2, "builtin_pad");
+ strcpy(Config.Net, "Disabled");
+ Config.PsxAuto = 1;
+
+ snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
}
int main(int argc, char *argv[])
{
char file[MAXPATHLEN] = "";
char path[MAXPATHLEN];
- int runcd = 0;
+ const char *cdfile = NULL;
int loadst = 0;
void *tmp;
int i;
isofilename[0] = 0;
}
- SetIsoFile(isofilename);
- runcd = 1;
+ cdfile = isofilename;
}
else if (!strcmp(argv[i], "-h") ||
!strcmp(argv[i], "-help") ||
}
memset(&Config, 0, sizeof(PcsxConfig));
- strcpy(Config.Net, "Disabled");
CheckSubDir();
-// ScanAllPlugins();
-
+ set_default_paths();
strcpy(Config.Bios, "HLE");
- strcpy(Config.BiosDir, "./");
-
- strcpy(Config.PluginsDir, "plugins");
- strcpy(Config.Gpu, "builtin_gpu");
- strcpy(Config.Spu, "builtin_spu");
- strcpy(Config.Cdr, "builtin_cdr");
- strcpy(Config.Pad1, "builtin_pad");
- strcpy(Config.Pad2, "builtin_pad");
- // try to load config
- // if the config file doesn't exist
- if (LoadConfig() == -1) {
- // Uh oh, no config file found, use some defaults
- Config.PsxAuto = 1;
+ if (cdfile)
+ set_cd_image(cdfile);
- // create & load default memcards if they don't exist
- CreateMemcard("card1.mcd", Config.Mcd1);
- CreateMemcard("card2.mcd", Config.Mcd2);
-
- LoadMcds(Config.Mcd1, Config.Mcd2);
-
- SaveConfig();
- }
-
- snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
-/*
- // switch to plugin dotdir
- // this lets plugins work without modification!
- gchar *plugin_default_dir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
- chdir(plugin_default_dir);
- g_free(plugin_default_dir);
-*/
if (SysInit() == -1)
return 1;
menu_init();
if (LoadPlugins() == -1) {
+ // FIXME: this recovery doesn't work, just delete bad config and bail out
+ // SysMessage("could not load plugins, retrying with defaults\n");
+ set_default_paths();
+ snprintf(path, sizeof(path), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+ remove(path);
SysMessage("Failed loading plugins!");
return 1;
}
if (OpenPlugins() == -1) {
return 1;
}
+ plugin_call_rearmed_cbs();
- SysReset();
CheckCdrom();
+ SysReset();
if (file[0] != '\0') {
if (Load(file) != -1)
ready_to_go = 1;
} else {
- if (runcd) {
+ if (cdfile) {
if (LoadCdrom() == -1) {
ClosePlugins();
printf(_("Could not load CD-ROM!\n"));
// If a state has been specified, then load that
if (loadst) {
- StatesC = loadst - 1;
- char *state_filename = get_state_filename(StatesC);
- int ret = LoadState(state_filename);
+ char state_filename[MAXPATHLEN];
+ int ret = get_state_filename(state_filename, sizeof(state_filename), loadst - 1);
+ if (ret == 0)
+ ret = LoadState(state_filename);
printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename);
- free(state_filename);
}
if (ready_to_go)
else
menu_loop();
+ pl_start_watchdog();
+
while (1)
{
psxCpu->Execute();
printf("StartGui\n");
}
+static void dummy_lace()
+{
+}
+
void SysReset() {
+ // rearmed hack: EmuReset() runs some code when real BIOS is used,
+ // but we usually do reset from menu while GPU is not open yet,
+ // so we need to prevent updateLace() call..
+ void *real_lace = GPU_updateLace;
+ GPU_updateLace = dummy_lace;
+
EmuReset();
+
+ // hmh core forgets this
+ CDR_stop();
+
+ GPU_updateLace = real_lace;
}
void SysClose() {
}
void SysUpdate() {
- PADhandleKey(PAD1_keypressed());
- PADhandleKey(PAD2_keypressed());
-}
-
-void UpdateMenuSlots() {
}
void OnFile_Exit() {
- printf("OnFile_Exit\n");
+ printf("OnFile_Exit\n");
+ menu_finish();
+ plat_finish();
+ SysClose();
exit(0);
}
-void state_save(gchar *state_filename) {
- char Text[MAXPATHLEN + 20];
-
- GPU_updateLace();
-
- if (SaveState(state_filename) == 0)
- sprintf(Text, _("Saved state %s."), state_filename);
- else
- sprintf(Text, _("Error saving state %s!"), state_filename);
-
- GPU_displayText(Text);
-}
-
-void state_load(gchar *state_filename) {
- int ret;
- char Text[MAXPATHLEN + 20];
- FILE *fp;
-
- // check if the state file actually exists
- fp = fopen(state_filename, "rb");
- if (fp == NULL) {
- // file does not exist
- return;
- }
-
- fclose(fp);
-
- ret = CheckState(state_filename);
-
- if (ret == 0) {
- SysReset();
- ret = LoadState(state_filename);
- }
-
- if (ret == 0) {
- // Check the CD-ROM is valid
- if (CheckCdrom() == -1) {
- ClosePlugins();
- SysRunGui();
- return;
- }
-
- sprintf(Text, _("Loaded state %s."), state_filename);
- } else {
- sprintf(Text, _("Error loading state %s!"), state_filename);
- }
- GPU_displayText(Text);
-}
-
-char *get_state_filename(int i) {
- char SStateFile[256];
+int get_state_filename(char *buf, int size, int i) {
char trimlabel[33];
int j;
else
continue;
- snprintf(SStateFile, sizeof(SStateFile), "." STATES_DIR "%.32s-%.9s.%3.3d",
+ snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d",
trimlabel, CdromId, i);
- return strdup(SStateFile);
+ return 0;
}
void SysPrintf(const char *fmt, ...) {
fprintf(stderr, "%s\n", msg);
}
+static void SignalExit(int sig) {
+ ClosePlugins();
+ OnFile_Exit();
+}
+
+#define PARSEPATH(dst, src) \
+ ptr = src + strlen(src); \
+ while (*ptr != '\\' && ptr != src) ptr--; \
+ if (ptr != src) { \
+ strcpy(dst, ptr+1); \
+ }
+
+static int _OpenPlugins(void) {
+ int ret;
+
+ signal(SIGINT, SignalExit);
+ signal(SIGPIPE, SignalExit);
+
+ GPU_clearDynarec(clearDynarec);
+
+ ret = CDR_open();
+ if (ret < 0) { SysMessage(_("Error opening CD-ROM plugin!")); return -1; }
+ ret = SPU_open();
+ if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; }
+ SPU_registerCallback(SPUirq);
+ // pcsx-rearmed: we handle gpu elsewhere
+ //ret = GPU_open(&gpuDisp, "PCSX", NULL);
+ //if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
+ ret = PAD1_open(&gpuDisp);
+ if (ret < 0) { SysMessage(_("Error opening Controller 1 plugin!")); return -1; }
+ ret = PAD2_open(&gpuDisp);
+ if (ret < 0) { SysMessage(_("Error opening Controller 2 plugin!")); return -1; }
+
+ if (Config.UseNet && !NetOpened) {
+ netInfo info;
+ char path[MAXPATHLEN];
+ char dotdir[MAXPATHLEN];
+
+ MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
+
+ strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+ strncpy(info.CdromID, CdromId, 9);
+ strncpy(info.CdromLabel, CdromLabel, 9);
+ info.psxMem = psxM;
+ info.GPU_showScreenPic = GPU_showScreenPic;
+ info.GPU_displayText = GPU_displayText;
+ info.GPU_showScreenPic = GPU_showScreenPic;
+ info.PAD_setSensitive = PAD1_setSensitive;
+ sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
+ strcpy(info.BIOSpath, path);
+ strcpy(info.MCD1path, Config.Mcd1);
+ strcpy(info.MCD2path, Config.Mcd2);
+ sprintf(path, "%s%s", dotdir, Config.Gpu);
+ strcpy(info.GPUpath, path);
+ sprintf(path, "%s%s", dotdir, Config.Spu);
+ strcpy(info.SPUpath, path);
+ sprintf(path, "%s%s", dotdir, Config.Cdr);
+ strcpy(info.CDRpath, path);
+ NET_setInfo(&info);
+
+ ret = NET_open(&gpuDisp);
+ if (ret < 0) {
+ if (ret == -2) {
+ // -2 is returned when something in the info
+ // changed and needs to be synced
+ char *ptr;
+
+ PARSEPATH(Config.Bios, info.BIOSpath);
+ PARSEPATH(Config.Gpu, info.GPUpath);
+ PARSEPATH(Config.Spu, info.SPUpath);
+ PARSEPATH(Config.Cdr, info.CDRpath);
+
+ strcpy(Config.Mcd1, info.MCD1path);
+ strcpy(Config.Mcd2, info.MCD2path);
+ return -2;
+ } else {
+ Config.UseNet = FALSE;
+ }
+ } else {
+ if (NET_queryPlayer() == 1) {
+ if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
+ } else {
+ if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
+ }
+ }
+ NetOpened = TRUE;
+ } else if (Config.UseNet) {
+ NET_resume();
+ }
+
+ return 0;
+}
+
+int OpenPlugins() {
+ int ret;
+
+ while ((ret = _OpenPlugins()) == -2) {
+ ReleasePlugins();
+ LoadMcds(Config.Mcd1, Config.Mcd2);
+ if (LoadPlugins() == -1) return -1;
+ }
+ return ret;
+}
+
+void ClosePlugins() {
+ int ret;
+
+ signal(SIGINT, SIG_DFL);
+ signal(SIGPIPE, SIG_DFL);
+ ret = CDR_close();
+ if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; }
+ ret = SPU_close();
+ if (ret < 0) { SysMessage(_("Error closing SPU plugin!")); return; }
+ ret = PAD1_close();
+ if (ret < 0) { SysMessage(_("Error closing Controller 1 Plugin!")); return; }
+ ret = PAD2_close();
+ if (ret < 0) { SysMessage(_("Error closing Controller 2 plugin!")); return; }
+ // pcsx-rearmed: we handle gpu elsewhere
+ //ret = GPU_close();
+ //if (ret < 0) { SysMessage(_("Error closing GPU plugin!")); return; }
+
+ if (Config.UseNet) {
+ NET_pause();
+ }
+}
+
#if 1
/* this is to avoid having to hack every plugin to stop using $HOME */
char *getenv(const char *name)
/* we hook statically linked plugins here */
static const char *builtin_plugins[] = {
- "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad"
+ "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad",
+ "builtin_cdrcimg",
};
static const int builtin_plugin_ids[] = {
PLUGIN_GPU, PLUGIN_SPU, PLUGIN_CDR, PLUGIN_PAD,
+ PLUGIN_CDRCIMG,
};
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
+ void *ret;
int i;
- printf("dlopen %s\n", lib);
+ printf("plugin: %s\n", lib);
+
if (tmp != NULL) {
tmp++;
for (i = 0; i < ARRAY_SIZE(builtin_plugins); i++)
return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
- return dlopen(lib, RTLD_NOW);
+#if defined(__x86_64__) || defined(__i386__)
+ // convenience hack
+ char name[MAXPATHLEN];
+ snprintf(name, sizeof(name), "%s.x86", lib);
+ lib = name;
+#endif
+
+ ret = dlopen(lib, RTLD_NOW);
+ if (ret == NULL)
+ fprintf(stderr, "dlopen: %s\n", dlerror());
+ return ret;
}
void *SysLoadSym(void *lib, const char *sym) {
dlclose(lib);
}
-
notaz.gp2x.de / pcsx_rearmed.git / blobdiff