X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fsoc_mmsp2.c;h=ee933d46a660a42663ba23a77f12a624ad7cf93e;hb=c54d04fd84f59c60c6ecdbd2502fbda5de735b4b;hp=00eb0a230bc0a9907a5845eaeff8eb2219acb840;hpb=053bef765a5dba9d5a050c0944676e96412e293d;p=libpicofe.git diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c index 00eb0a2..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,8 +22,9 @@ #include "soc.h" #include "soc_mmsp2.h" #include "plat_gp2x.h" -#include "../common/emu.h" -#include "../common/arm_utils.h" +#include "../emu.h" +#include "../plat.h" +#include "../arm_utils.h" #include "940ctl.h" volatile unsigned short *gp2x_memregs; @@ -40,7 +52,6 @@ static unsigned short gp2x_screenaddr_old[4]; static unsigned short memtimex_old[2]; static unsigned short reg0910; - /* video stuff */ static void gp2x_video_flip_(void) { @@ -508,6 +519,9 @@ void mmsp2_init(void) 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_good; + gp2x_get_ticks_us = plat_get_ticks_us_good; } void mmsp2_finish(void)