notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input: add in_get_key_code
[libpicofe.git]
/
common
/
main.c
diff --git
a/common/main.c
b/common/main.c
index
7a7c876
..
48f218f
100644
(file)
--- a/
common/main.c
+++ b/
common/main.c
@@
-13,6
+13,7
@@
#include "config.h"
\r
#include "input.h"
\r
#include "plat.h"
\r
#include "config.h"
\r
#include "input.h"
\r
#include "plat.h"
\r
+#include <cpu/debug.h>
\r
#include <version.h>
\r
\r
\r
#include <version.h>
\r
\r
\r
@@
-34,6
+35,12
@@
void parse_cmd_line(int argc, char *argv[])
else if (strcasecmp(argv[x], "-loadstate") == 0) {
\r
if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
\r
}
\r
else if (strcasecmp(argv[x], "-loadstate") == 0) {
\r
if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
\r
}
\r
+ else if (strcasecmp(argv[x], "-pdb") == 0) {
\r
+ if (x+1 < argc) { ++x; pdb_command(argv[x]); }
\r
+ }
\r
+ else if (strcasecmp(argv[x], "-pdb_connect") == 0) {
\r
+ if (x+2 < argc) { pdb_net_connect(argv[x+1], argv[x+2]); x += 2; }
\r
+ }
\r
else {
\r
unrecognized = 1;
\r
break;
\r
else {
\r
unrecognized = 1;
\r
break;
\r
@@
-67,15
+74,13
@@
int main(int argc, char *argv[])
\r
plat_early_init();
\r
\r
\r
plat_early_init();
\r
\r
- /* in_init() must go before config, config accesses in_ fwk */
\r
in_init();
\r
in_init();
\r
- pemu_prep_defconfig();
\r
- emu_read_config(0, 0);
\r
- config_readlrom(PicoConfigFile);
\r
+ in_probe();
\r
\r
plat_init();
\r
\r
plat_init();
\r
- in_probe();
\r
- in_debug_dump();
\r
+
\r
+ emu_prep_defconfig(); // depends on input
\r
+ emu_read_config(NULL, 0);
\r
\r
emu_init();
\r
menu_init();
\r
\r
emu_init();
\r
menu_init();
\r