notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unified menu wip and some reorganization for it
[picodrive.git]
/
platform
/
pandora
/
main.c
diff --git
a/platform/pandora/main.c
b/platform/pandora/main.c
index
010bff9
..
4690f06
100644
(file)
--- a/
platform/pandora/main.c
+++ b/
platform/pandora/main.c
@@
-15,6
+15,7
@@
#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 "../common/input.h"
\r
#include "../gp2x/emu.h"
\r
#include "../gp2x/version.h"
\r
\r
#include "../gp2x/emu.h"
\r
#include "../gp2x/version.h"
\r
\r
@@
-77,10
+78,13
@@
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
+ in_probe();
\r
+ in_debug_dump();
\r
gp2x_init();
\r
emu_Init();
\r
menu_init();
\r
gp2x_init();
\r
emu_Init();
\r
menu_init();
\r
@@
-92,7
+96,7
@@
int main(int argc, char *argv[])
\r
if (engineState == PGS_ReloadRom)
\r
{
\r
\r
if (engineState == PGS_ReloadRom)
\r
{
\r
- if (emu_ReloadRom()) {
\r
+ if (emu_ReloadRom(
romFileName
)) {
\r
engineState = PGS_Running;
\r
if (load_state_slot >= 0) {
\r
state_slot = load_state_slot;
\r
engineState = PGS_Running;
\r
if (load_state_slot >= 0) {
\r
state_slot = load_state_slot;
\r
@@
-110,7
+114,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(
romFileName
))
\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