notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
screen ptr/size unification, major cleanups
[picodrive.git]
/
platform
/
gp2x
/
main.c
diff --git
a/platform/gp2x/main.c
b/platform/gp2x/main.c
index
50210f6
..
95a181c
100644
(file)
--- a/
platform/gp2x/main.c
+++ b/
platform/gp2x/main.c
@@
-15,6
+15,8
@@
#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 "../common/plat.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
@@
-60,9
+62,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], PATH_MAX);
\r
+ rom
_fname_reload
[PATH_MAX-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
@@
-88,10
+90,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
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
gp2x_init();
\r
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
@@
-118,7
+123,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(
rom_fname_reload
)) {
\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
@@
-136,7
+141,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