notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move emu loop to common; redo timing; add pollux timer
[libpicofe.git]
/
gp2x
/
soc_mmsp2.c
diff --git
a/gp2x/soc_mmsp2.c
b/gp2x/soc_mmsp2.c
index
d6c40e5
..
5217dda
100644
(file)
--- a/
gp2x/soc_mmsp2.c
+++ b/
gp2x/soc_mmsp2.c
@@
-12,6
+12,7
@@
#include "soc_mmsp2.h"
#include "plat_gp2x.h"
#include "../common/emu.h"
#include "soc_mmsp2.h"
#include "plat_gp2x.h"
#include "../common/emu.h"
+#include "../common/plat.h"
#include "../common/arm_utils.h"
#include "940ctl.h"
#include "../common/arm_utils.h"
#include "940ctl.h"
@@
-40,6
+41,8
@@
static unsigned short gp2x_screenaddr_old[4];
static unsigned short memtimex_old[2];
static unsigned short reg0910;
static unsigned short memtimex_old[2];
static unsigned short reg0910;
+extern unsigned int plat_get_ticks_ms_gtod(void);
+extern unsigned int plat_get_ticks_us_gtod(void);
/* video stuff */
static void gp2x_video_flip_(void)
/* video stuff */
static void gp2x_video_flip_(void)
@@
-353,6
+356,10
@@
static void set_lcd_gamma_(int g100, int A_SNs_curve)
gamma_was_changed = 1;
}
gamma_was_changed = 1;
}
+static int gp2x_read_battery_(void)
+{
+ return -1; /* TODO? */
+}
/* these are not quite MMSP2 related,
* more to GP2X F100/F200 consoles themselves. */
/* these are not quite MMSP2 related,
* more to GP2X F100/F200 consoles themselves. */
@@
-503,6
+510,10
@@
void mmsp2_init(void)
set_ram_timings = set_ram_timings_;
unset_ram_timings = unset_ram_timings_;
set_ram_timings = set_ram_timings_;
unset_ram_timings = unset_ram_timings_;
+ gp2x_read_battery = gp2x_read_battery_;
+
+ gp2x_get_ticks_ms = plat_get_ticks_ms_gtod;
+ gp2x_get_ticks_us = plat_get_ticks_us_gtod;
}
void mmsp2_finish(void)
}
void mmsp2_finish(void)