X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fsoc_mmsp2.c;h=ee933d46a660a42663ba23a77f12a624ad7cf93e;hb=20b143089cc395dbcd51cac516a9e36f4ab6f5ac;hp=5217dda1f7cf716dce92500479e4ff6001c79fd3;hpb=b5bfb86438216d502f1f9ed14b923d3b0107c07d;p=libpicofe.git diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c index 5217dda..ee933d4 100644 --- a/gp2x/soc_mmsp2.c +++ b/gp2x/soc_mmsp2.c @@ -1,3 +1,14 @@ +/* + * (C) Gražvydas "notaz" Ignotas, 2006-2012 + * + * This work is licensed under the terms of any of these licenses + * (at your option): + * - GNU GPL, version 2 or later. + * - GNU LGPL, version 2.1 or later. + * - MAME license. + * See the COPYING file in the top-level directory. + */ + #include #include #include @@ -11,9 +22,9 @@ #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; @@ -41,9 +52,6 @@ static unsigned short gp2x_screenaddr_old[4]; 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) { @@ -512,8 +520,8 @@ void mmsp2_init(void) 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; + gp2x_get_ticks_ms = plat_get_ticks_ms_good; + gp2x_get_ticks_us = plat_get_ticks_us_good; } void mmsp2_finish(void)