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 common files to root
[libpicofe.git]
/
gp2x
/
soc_mmsp2.c
diff --git
a/gp2x/soc_mmsp2.c
b/gp2x/soc_mmsp2.c
index
5217dda
..
e2a2f1d
100644
(file)
--- a/
gp2x/soc_mmsp2.c
+++ b/
gp2x/soc_mmsp2.c
@@
-11,9
+11,9
@@
#include "soc.h"
#include "soc_mmsp2.h"
#include "plat_gp2x.h"
#include "soc.h"
#include "soc_mmsp2.h"
#include "plat_gp2x.h"
-#include "../
common/
emu.h"
-#include "../
common/
plat.h"
-#include "../
common/
arm_utils.h"
+#include "../emu.h"
+#include "../plat.h"
+#include "../arm_utils.h"
#include "940ctl.h"
volatile unsigned short *gp2x_memregs;
#include "940ctl.h"
volatile unsigned short *gp2x_memregs;
@@
-41,9
+41,6
@@
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)
{
@@
-512,8
+509,8
@@
void mmsp2_init(void)
unset_ram_timings = unset_ram_timings_;
gp2x_read_battery = gp2x_read_battery_;
unset_ram_timings = unset_ram_timings_;
gp2x_read_battery = gp2x_read_battery_;
- gp2x_get_ticks_ms = plat_get_ticks_ms_g
t
od;
- gp2x_get_ticks_us = plat_get_ticks_us_g
t
od;
+ gp2x_get_ticks_ms = plat_get_ticks_ms_g
o
od;
+ gp2x_get_ticks_us = plat_get_ticks_us_g
o
od;
}
void mmsp2_finish(void)
}
void mmsp2_finish(void)