move emu loop to common; redo timing; add pollux timer

[libpicofe.git] / pandora / emu.c

diff --git a/pandora/emu.c b/pandora/emu.c
index 0425075..a9a2119 100644 (file)
--- a/pandora/emu.c
+++ b/pandora/emu.c
@@ -34,7 +34,6 @@
 \r
 \r
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int osd_fps_x;\r
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
 \r
@@ -43,17 +42,6 @@ unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 static int pico_pen_x = 0, pico_pen_y = 240/2;\r
 \r
 \r
-void plat_status_msg(const char *format, ...)\r
-{\r
-       va_list vl;\r
-\r
-       va_start(vl, format);\r
-       vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);\r
-       va_end(vl);\r
-\r
-       gettimeofday(&noticeMsgTime, 0);\r
-}\r
-\r
 int plat_get_root_dir(char *dst, int len)\r
 {\r
        extern char **g_argv;\r
@@ -134,7 +122,7 @@ static void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned char *) g_screen_ptr+x+g_screen_width*(y+h));\r
                        for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
                }\r
-               emu_textOut8(x, y, text);\r
+               emu_text_out8(x, y, text);\r
        } else {\r
                int *p, i, h;\r
                x &= ~1; // align x\r
@@ -143,7 +131,7 @@ static void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned short *) g_screen_ptr+x+g_screen_width*(y+h));\r
                        for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7;\r
                }\r
-               textOut16(x, y, text);\r
+               text_out16(x, y, text);\r
        }\r
 }\r
 \r