notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bring pandora to buildable state. Some cleanups and fixes along the way.
[picodrive.git]
/
platform
/
pandora
/
main.c
diff --git
a/platform/pandora/main.c
b/platform/pandora/main.c
index
55ece53
..
37a69fe
100644
(file)
--- a/
platform/pandora/main.c
+++ b/
platform/pandora/main.c
@@
-4,23
+4,23
@@
// For commercial use, separate licencing terms must be obtained.
\r
\r
#include <stdio.h>
\r
// For commercial use, separate licencing terms must be obtained.
\r
\r
#include <stdio.h>
\r
+#include <stdlib.h>
\r
#include <string.h>
\r
#include <unistd.h>
\r
#include <strings.h>
\r
#include <linux/limits.h>
\r
\r
#include <string.h>
\r
#include <unistd.h>
\r
#include <strings.h>
\r
#include <linux/limits.h>
\r
\r
-#include "../gp2x/gp2x.h"
\r
-#include "../gp2x/menu.h"
\r
+#include "../gp2x/emu.h" // TODO rm
\r
#include "../common/menu.h"
\r
#include "../common/emu.h"
\r
#include "../common/config.h"
\r
#include "../common/menu.h"
\r
#include "../common/emu.h"
\r
#include "../common/config.h"
\r
-#include "../
gp2x/emu
.h"
\r
+#include "../
common/input
.h"
\r
#include "../gp2x/version.h"
\r
#include "../gp2x/version.h"
\r
+#include "pandora.h"
\r
\r
\r
\r
\r
-extern int select_exits;
\r
extern char *PicoConfigFile;
\r
extern char *PicoConfigFile;
\r
-int mmuhack_status = 0; // TODO rm
\r
+static int load_state_slot = -1;
\r
char **g_argv;
\r
\r
void parse_cmd_line(int argc, char *argv[])
\r
char **g_argv;
\r
\r
void parse_cmd_line(int argc, char *argv[])
\r
@@
-34,8
+34,8
@@
void parse_cmd_line(int argc, char *argv[])
if(strcasecmp(argv[x], "-config") == 0) {
\r
if(x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
\r
}
\r
if(strcasecmp(argv[x], "-config") == 0) {
\r
if(x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
\r
}
\r
- else if(strcasecmp(argv[x], "-
selectexit
") == 0) {
\r
- select_exits = 1;
\r
+ else if(strcasecmp(argv[x], "-
loadstate
") == 0) {
\r
+ if(x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
\r
}
\r
else {
\r
unrecognized = 1;
\r
}
\r
else {
\r
unrecognized = 1;
\r
@@
-44,9
+44,9
@@
void parse_cmd_line(int argc, char *argv[])
} else {
\r
/* External Frontend: ROM Name */
\r
FILE *f;
\r
} else {
\r
/* External Frontend: ROM Name */
\r
FILE *f;
\r
- strncpy(rom
FileName, argv[x], PATH_MAX
);
\r
- rom
FileName[PATH_MAX-
1] = 0;
\r
- f = fopen(rom
FileName
, "rb");
\r
+ strncpy(rom
_fname_reload, argv[x], sizeof(rom_fname_reload)
);
\r
+ rom
_fname_reload[sizeof(rom_fname_reload) -
1] = 0;
\r
+ f = fopen(rom
_fname_reload
, "rb");
\r
if (f) fclose(f);
\r
else unrecognized = 1;
\r
engineState = PGS_ReloadRom;
\r
if (f) fclose(f);
\r
else unrecognized = 1;
\r
engineState = PGS_ReloadRom;
\r
@@
-55,14
+55,12
@@
void parse_cmd_line(int argc, char *argv[])
}
\r
\r
if (unrecognized) {
\r
}
\r
\r
if (unrecognized) {
\r
- printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-200
8
\n");
\r
+ printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-200
9
\n");
\r
printf("usage: %s [options] [romfile]\n", argv[0]);
\r
printf( "options:\n"
\r
printf("usage: %s [options] [romfile]\n", argv[0]);
\r
printf( "options:\n"
\r
- "-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
\r
- "-state <param> pass '-state param' to the menu program\n"
\r
"-config <file> use specified config file instead of default 'picoconfig.bin'\n"
\r
" see currentConfig_t structure in emu.h for the file format\n"
\r
"-config <file> use specified config file instead of default 'picoconfig.bin'\n"
\r
" see currentConfig_t structure in emu.h for the file format\n"
\r
- "-
selectexit pressing SELECT will exit the emu and start 'menu_path'
\n");
\r
+ "-
loadstate <num> if ROM is specified, try loading slot <num>
\n");
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-71,11
+69,14
@@
int main(int argc, char *argv[])
{
\r
g_argv = argv;
\r
\r
{
\r
g_argv = argv;
\r
\r
+ in_init();
\r
emu_prepareDefaultConfig();
\r
emu_ReadConfig(0, 0);
\r
config_readlrom(PicoConfigFile);
\r
\r
emu_prepareDefaultConfig();
\r
emu_ReadConfig(0, 0);
\r
config_readlrom(PicoConfigFile);
\r
\r
- gp2x_init();
\r
+ in_probe();
\r
+ in_debug_dump();
\r
+ pnd_init();
\r
emu_Init();
\r
menu_init();
\r
\r
emu_Init();
\r
menu_init();
\r
\r
@@
-84,6
+85,17
@@
int main(int argc, char *argv[])
if (argc > 1)
\r
parse_cmd_line(argc, argv);
\r
\r
if (argc > 1)
\r
parse_cmd_line(argc, argv);
\r
\r
+ if (engineState == PGS_ReloadRom)
\r
+ {
\r
+ if (emu_ReloadRom(rom_fname_reload)) {
\r
+ engineState = PGS_Running;
\r
+ if (load_state_slot >= 0) {
\r
+ state_slot = load_state_slot;
\r
+ emu_SaveLoadGame(1, 0);
\r
+ }
\r
+ }
\r
+ }
\r
+
\r
for (;;)
\r
{
\r
switch (engineState)
\r
for (;;)
\r
{
\r
switch (engineState)
\r
@@
-93,7
+105,7
@@
int main(int argc, char *argv[])
break;
\r
\r
case PGS_ReloadRom:
\r
break;
\r
\r
case PGS_ReloadRom:
\r
- if (emu_ReloadRom())
\r
+ if (emu_ReloadRom(
rom_fname_reload
))
\r
engineState = PGS_Running;
\r
else {
\r
printf("PGS_ReloadRom == 0\n");
\r
engineState = PGS_Running;
\r
else {
\r
printf("PGS_ReloadRom == 0\n");
\r
@@
-120,6
+132,7
@@
int main(int argc, char *argv[])
endloop:
\r
\r
emu_Deinit();
\r
endloop:
\r
\r
emu_Deinit();
\r
+ pnd_exit();
\r
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r