giz menu works

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@231 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw2.c b/Pico/Draw2.c
index 5037e2f..9fc413b 100644 (file)
--- a/Pico/Draw2.c
+++ b/Pico/Draw2.c
@@ -21,7 +21,6 @@
 #define USE_CACHE\r
 \r
 \r
-extern unsigned char *framebuff; // in format (8+320)x(8+224+8) (eights for borders)\r
 int currpri = 0;\r
 \r
 static int HighCache2A[41*(TILE_ROWS+1)+1+1]; // caches for high layers\r
@@ -139,7 +138,7 @@ static void DrawWindowFull(int start, int end, int prio)
 {\r
        struct PicoVideo *pvid=&Pico.video;\r
        int nametab, nametab_step, trow, tilex, blank=-1, code;\r
-       unsigned char *scrpos = framebuff;\r
+       unsigned char *scrpos = PicoDraw2FB;\r
        int tile_start, tile_end; // in cells\r
 \r
        // parse ranges\r
@@ -239,7 +238,7 @@ static void DrawLayerFull(int plane, int *hcache, int planestart, int planeend)
        if (plane==0) nametab=(pvid->reg[2]&0x38)<< 9; // A\r
        else          nametab=(pvid->reg[4]&0x07)<<12; // B\r
 \r
-       scrpos = framebuff;\r
+       scrpos = PicoDraw2FB;\r
        scrpos+=8*328*(planestart-START_ROW);\r
 \r
        // Get vertical scroll value:\r
@@ -317,7 +316,7 @@ static void DrawTilesFromCacheF(int *hc)
 //     unsigned short *pal;\r
        unsigned char pal;\r
        short blank=-1; // The tile we know is blank\r
-       unsigned char *scrpos = framebuff, *pd = 0;\r
+       unsigned char *scrpos = PicoDraw2FB, *pd = 0;\r
 \r
        // *hcache++ = code|(dx<<16)|(trow<<27); // cache it\r
        scrpos+=(*hc++)*328 - START_ROW*328*8;\r
@@ -380,7 +379,7 @@ static void DrawSpriteFull(unsigned int *sprite)
        // goto first vertically visible tile\r
        while(sy <= START_ROW*8) { sy+=8; tile+=tdeltay; height--; }\r
 \r
-       scrpos = framebuff;\r
+       scrpos = PicoDraw2FB;\r
        scrpos+=(sy-START_ROW*8)*328;\r
 \r
        for (; height > 0; height--, sy+=8, tile+=tdeltay)\r
@@ -481,7 +480,7 @@ static void DrawAllSpritesFull(int prio, int maxwidth)
 static void BackFillFull(int reg7)\r
 {\r
        unsigned int back, i;\r
-       unsigned int *p=(unsigned int *)framebuff;\r
+       unsigned int *p=(unsigned int *)PicoDraw2FB;\r
 \r
        // Start with a background color:\r
 //     back=PicoCramHigh[reg7&0x3f];\r

diff --git a/Pico/Draw2.s b/Pico/Draw2.s
index 7826b1e..9c3f027 100644 (file)
--- a/Pico/Draw2.s
+++ b/Pico/Draw2.s
@@ -8,7 +8,7 @@
 \r
 \r
 .extern Pico\r
-.extern framebuff\r
+.extern PicoDraw2FB\r
 \r
 @ define these constants in your include file:\r
 @ .equiv START_ROW,            1\r
@@ -22,7 +22,7 @@
 BackFillFull:\r
     stmfd   sp!, {r4-r9,lr}\r
 \r
-    ldr     lr, =framebuff      @ lr=framebuff\r
+    ldr     lr, =PicoDraw2FB      @ lr=PicoDraw2FB\r
     ldr     lr, [lr]\r
     add     lr, lr, #328*8\r
 \r
@@ -394,7 +394,7 @@ DrawLayerFull:
     and     r4, r4, #7\r
     orr     lr, lr, r4, lsl #13   @ lr|=nametab_bits{3}<<13\r
 \r
-    ldr     r11, =framebuff       @ r11=framebuff\r
+    ldr     r11, =PicoDraw2FB     @ r11=PicoDraw2FB\r
     ldr     r11, [r11]\r
     sub     r4, r9, #(START_ROW<<24)\r
     mov     r4, r4, asr #24\r
@@ -572,7 +572,7 @@ DrawTilesFromCacheF:
     mov     r9, #0xff000000 @ r9=prevcode=-1\r
     mvn     r6, #0          @ r6=prevy=-1\r
 \r
-    ldr     r4, =framebuff  @ r4=framebuff\r
+    ldr     r4, =PicoDraw2FB  @ r4=PicoDraw2FB\r
     ldr     r4, [r4]\r
     ldr     r1, [r0], #4    @ read y offset\r
     mov     r7, #328\r
@@ -696,7 +696,7 @@ DrawWindowFull:
 \r
     mov     r9, #0xff000000       @ r9=prevcode=-1\r
 \r
-    ldr     r11, =framebuff       @ r11=scrpos\r
+    ldr     r11, =PicoDraw2FB     @ r11=scrpos\r
     ldr     r11, [r11]\r
     add     r11, r11, #328*8\r
     add     r11, r11, #8\r
@@ -896,7 +896,7 @@ DrawSpriteFull:
 \r
     ldr     r10, =(Pico+0x10000)  @ r10=Pico.vram\r
 \r
-    ldr     r11, =framebuff       @ r11=scrpos\r
+    ldr     r11, =PicoDraw2FB     @ r11=scrpos\r
     ldr     r11, [r11]\r
     sub     r1, r12, #(START_ROW*8)\r
     mov     r0, #328\r

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 0ec74a8..6adb7f5 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -118,6 +118,7 @@ void *blockcpy(void *dst, const void *src, size_t n);
 \r
 // Draw2.c\r
 // stuff below is optional\r
+extern unsigned char  *PicoDraw2FB;  // buffer for fasr renderer in format (8+320)x(8+224+8) (eights for borders)\r
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)\r
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use\r
 \r

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index f495bb6..d98a900 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -315,7 +315,8 @@ extern int z80startCycle, z80stopCycle; // in 68k cycles
 PICO_INTERNAL int CheckDMA(void);\r
 \r
 // cd/Pico.c\r
-PICO_INTERNAL int PicoInitMCD(void);\r
+PICO_INTERNAL int  PicoInitMCD(void);\r
+PICO_INTERNAL void PicoExitMCD(void);\r
 PICO_INTERNAL int PicoResetMCD(int hard);\r
 PICO_INTERNAL int PicoFrameMCD(void);\r
 \r

diff --git a/Pico/cd/Misc.c b/Pico/cd/Misc.c
index d43c161..74beade 100644 (file)
--- a/Pico/cd/Misc.c
+++ b/Pico/cd/Misc.c
@@ -1,6 +1,7 @@
 // Some misc stuff
 // (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
+#include "../PicoInt.h"
 
 unsigned char formatted_bram[4*0x10] =
 {

diff --git a/cpu/DrZ80/drz80.s b/cpu/DrZ80/drz80.s
index 4760650..eba8b95 100644 (file)
--- a/cpu/DrZ80/drz80.s
+++ b/cpu/DrZ80/drz80.s
@@ -11,18 +11,21 @@
       .global DrZ80Run\r
       .global DrZ80Ver\r
 \r
-         .equiv INTERRUPT_MODE,                0               ;@0 = Use internal int handler, 1 = Use Mames int handler\r
-         .equiv FAST_Z80SP,                    1               ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer\r
-         .equiv UPDATE_CONTEXT,            0\r
-         .equiv DRZ80_FOR_PICODRIVE,   1\r
+      .equiv INTERRUPT_MODE,        0  ;@0 = Use internal int handler, 1 = Use Mames int handler\r
+      .equiv FAST_Z80SP,            1  ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer\r
+      .equiv UPDATE_CONTEXT,        0\r
+      .equiv DRZ80_FOR_PICODRIVE,   1\r
 \r
 .if INTERRUPT_MODE\r
-         .extern Interrupt\r
+      .extern Interrupt\r
 .endif\r
 \r
 .if DRZ80_FOR_PICODRIVE\r
-         .extern YM2612Read_\r
-         .extern YM2612Read_940\r
+.include "port_config.s"\r
+      .extern YM2612Read_\r
+.if EXTERNAL_YM2612\r
+      .extern YM2612Read_940\r
+.endif\r
       .extern PicoRead8\r
       .extern Pico\r
       .extern z80_write\r
@@ -106,7 +109,6 @@ DrZ80Ver: .long 0x0001
 .text\r
 \r
 .if DRZ80_FOR_PICODRIVE\r
-.include "port_config.s"\r
 \r
 .macro YM2612Read_and_ret8\r
        stmfd sp!,{r3,r12,lr}\r

diff --git a/platform/gp2x/asmutils.h b/platform/common/arm_utils.h
similarity index 100%
rename from platform/gp2x/asmutils.h
rename to platform/common/arm_utils.h

diff --git a/platform/gp2x/asmutils.s b/platform/common/arm_utils.s
similarity index 100%
rename from platform/gp2x/asmutils.s
rename to platform/common/arm_utils.s

diff --git a/platform/gp2x/fonts.c b/platform/common/fonts.c
similarity index 100%
rename from platform/gp2x/fonts.c
rename to platform/common/fonts.c

diff --git a/platform/gp2x/fonts.h b/platform/common/fonts.h
similarity index 100%
rename from platform/gp2x/fonts.h
rename to platform/common/fonts.h

diff --git a/platform/common/lprintf.h b/platform/common/lprintf.h
new file mode 100644 (file)
index 0000000..5cd176f
--- /dev/null
+++ b/platform/common/lprintf.h
@@ -0,0 +1,6 @@
+#if defined(__GP2X__)
+#define lprintf printf
+#else
+#include "giz.h"
+#endif
+

diff --git a/platform/common/menu.c b/platform/common/menu.c
new file mode 100644 (file)
index 0000000..53ef33d
--- /dev/null
+++ b/platform/common/menu.c
@@ -0,0 +1,314 @@
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
+// Free for non-commercial use.\r
+\r
+// For commercial use, separate licencing terms must be obtained.\r
+\r
+#include <stdio.h>\r
+#include <string.h>\r
+#include <stdlib.h>\r
+#include <stdarg.h>\r
+\r
+#include "menu.h"\r
+#include "fonts.h"\r
+#include "readpng.h"\r
+#include "lprintf.h"\r
+\r
+#if   defined(__GP2X__)\r
+#include "../gp2x/gp2x.h"\r
+#define SCREEN_WIDTH 320\r
+#define SCREEN_BUFFER gp2x_screen\r
+#elif defined(__GIZ__)\r
+#include "../gizmondo/giz.h"\r
+#define SCREEN_WIDTH 321\r
+#define SCREEN_BUFFER giz_screen\r
+#endif\r
+\r
+static unsigned char menu_font_data[10240];\r
+static int menu_text_color = 0xffff; // default to white\r
+static int menu_sel_color = -1; // disabled\r
+\r
+// draws text to current bbp16 screen\r
+static void text_out16_(int x, int y, const char *text, int color)\r
+{\r
+       int i, l, u, tr, tg, tb, len;\r
+       unsigned short *dest = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+       tr = (color & 0xf800) >> 8;\r
+       tg = (color & 0x07e0) >> 3;\r
+       tb = (color & 0x001f) << 3;\r
+\r
+       if (text == (void *)1)\r
+       {\r
+               // selector symbol\r
+               text = "";\r
+               len = 1;\r
+       }\r
+       else\r
+               len = strlen(text);\r
+\r
+       for (i = 0; i < len; i++)\r
+       {\r
+               unsigned char  *src = menu_font_data + (unsigned int)text[i]*4*10;\r
+               unsigned short *dst = dest;\r
+               for (l = 0; l < 10; l++, dst += SCREEN_WIDTH-8)\r
+               {\r
+                       for (u = 8/2; u > 0; u--, src++)\r
+                       {\r
+                               int c, r, g, b;\r
+                               c = *src >> 4;\r
+                               r = (*dst & 0xf800) >> 8;\r
+                               g = (*dst & 0x07e0) >> 3;\r
+                               b = (*dst & 0x001f) << 3;\r
+                               r = (c^0xf)*r/15 + c*tr/15;\r
+                               g = (c^0xf)*g/15 + c*tg/15;\r
+                               b = (c^0xf)*b/15 + c*tb/15;\r
+                               *dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
+                               c = *src & 0xf;\r
+                               r = (*dst & 0xf800) >> 8;\r
+                               g = (*dst & 0x07e0) >> 3;\r
+                               b = (*dst & 0x001f) << 3;\r
+                               r = (c^0xf)*r/15 + c*tr/15;\r
+                               g = (c^0xf)*g/15 + c*tg/15;\r
+                               b = (c^0xf)*b/15 + c*tb/15;\r
+                               *dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
+                       }\r
+               }\r
+               dest += 8;\r
+       }\r
+}\r
+\r
+void text_out16(int x, int y, const char *texto, ...)\r
+{\r
+       va_list args;\r
+       char    buffer[512];\r
+\r
+       va_start(args,texto);\r
+       vsprintf(buffer,texto,args);\r
+       va_end(args);\r
+\r
+       text_out16_(x,y,buffer,menu_text_color);\r
+}\r
+\r
+\r
+void smalltext_out16(int x, int y, const char *texto, int color)\r
+{\r
+       int i;\r
+       unsigned char  *src;\r
+       unsigned short *dst;\r
+\r
+       for (i = 0;; i++, x += 6)\r
+       {\r
+               unsigned char c = (unsigned char) texto[i];\r
+               int h = 8;\r
+\r
+               if (!c) break;\r
+\r
+               src = fontdata6x8[c];\r
+               dst = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+\r
+               while (h--)\r
+               {\r
+                       int w = 0x20;\r
+                       while (w)\r
+                       {\r
+                               if( *src & w ) *dst = color;\r
+                               dst++;\r
+                               w>>=1;\r
+                       }\r
+                       src++;\r
+\r
+                       dst += SCREEN_WIDTH-6;\r
+               }\r
+       }\r
+}\r
+\r
+void smalltext_out16_lim(int x, int y, const char *texto, int color, int max)\r
+{\r
+       char    buffer[SCREEN_WIDTH/6+1];\r
+\r
+       strncpy(buffer, texto, SCREEN_WIDTH/6);\r
+       if (max > SCREEN_WIDTH/6) max = SCREEN_WIDTH/6;\r
+       if (max < 0) max = 0;\r
+       buffer[max] = 0;\r
+\r
+       smalltext_out16(x, y, buffer, color);\r
+}\r
+\r
+void menu_draw_selection(int x, int y, int w)\r
+{\r
+       int i, h;\r
+       unsigned short *dst, *dest;\r
+\r
+       text_out16_(x, y, (void *)1, (menu_sel_color < 0) ? menu_text_color : menu_sel_color);\r
+\r
+       if (menu_sel_color < 0) return; // no selection hilight\r
+\r
+       if (y > 0) y--;\r
+       dest = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH + 14;\r
+       for (h = 11; h > 0; h--)\r
+       {\r
+               dst = dest;\r
+               for (i = w; i > 0; i--)\r
+                       *dst++ = menu_sel_color;\r
+               dest += SCREEN_WIDTH;\r
+       }\r
+}\r
+\r
+static int parse_hex_color(char *buff)\r
+{\r
+       char *endp = buff;\r
+       int t = (int) strtoul(buff, &endp, 16);\r
+       if (endp != buff) return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);\r
+       return -1;\r
+}\r
+\r
+void menu_init(void)\r
+{\r
+       int c, l;\r
+       unsigned char *fd = menu_font_data;\r
+       char buff[256];\r
+       FILE *f;\r
+\r
+       // generate default font from fontdata8x8\r
+       memset(menu_font_data, 0, sizeof(menu_font_data));\r
+       for (c = 0; c < 256; c++)\r
+       {\r
+               for (l = 0; l < 8; l++)\r
+               {\r
+                       unsigned char fd8x8 = fontdata8x8[c*8+l];\r
+                       if (fd8x8&0x80) *fd |= 0xf0;\r
+                       if (fd8x8&0x40) *fd |= 0x0f; fd++;\r
+                       if (fd8x8&0x20) *fd |= 0xf0;\r
+                       if (fd8x8&0x10) *fd |= 0x0f; fd++;\r
+                       if (fd8x8&0x08) *fd |= 0xf0;\r
+                       if (fd8x8&0x04) *fd |= 0x0f; fd++;\r
+                       if (fd8x8&0x02) *fd |= 0xf0;\r
+                       if (fd8x8&0x01) *fd |= 0x0f; fd++;\r
+               }\r
+               fd += 8*2/2; // 2 empty lines\r
+       }\r
+\r
+       // load custom font and selector (stored as 1st symbol in font table)\r
+       readpng(menu_font_data, "skin/font.png", READPNG_FONT);\r
+       memcpy(menu_font_data, menu_font_data + ((int)'>')*4*10, 4*10); // default selector symbol is '>'\r
+       readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
+\r
+       // load custom colors\r
+       f = fopen("skin/skin.txt", "r");\r
+       if (f != NULL)\r
+       {\r
+               lprintf("found skin.txt\n");\r
+               while (!feof(f))\r
+               {\r
+                       fgets(buff, sizeof(buff), f);\r
+                       if (buff[0] == '#'  || buff[0] == '/')  continue; // comment\r
+                       if (buff[0] == '\r' || buff[0] == '\n') continue; // empty line\r
+                       if (strncmp(buff, "text_color=", 11) == 0)\r
+                       {\r
+                               int tmp = parse_hex_color(buff+11);\r
+                               if (tmp >= 0) menu_text_color = tmp;\r
+                               else lprintf("skin.txt: parse error for text_color\n");\r
+                       }\r
+                       else if (strncmp(buff, "selection_color=", 16) == 0)\r
+                       {\r
+                               int tmp = parse_hex_color(buff+16);\r
+                               if (tmp >= 0) menu_sel_color = tmp;\r
+                               else lprintf("skin.txt: parse error for selection_color\n");\r
+                       }\r
+                       else\r
+                               lprintf("skin.txt: parse error: %s\n", buff);\r
+               }\r
+               fclose(f);\r
+       }\r
+}\r
+\r
+\r
+int me_id2offset(const menu_entry *entries, int count, menu_id id)\r
+{\r
+       int i;\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               if (entries[i].id == id) return i;\r
+       }\r
+\r
+       lprintf("%s: id %i not found\n", __FUNCTION__, id);\r
+       return 0;\r
+}\r
+\r
+void me_enable(menu_entry *entries, int count, menu_id id, int enable)\r
+{\r
+       int i = me_id2offset(entries, count, id);\r
+       entries[i].enabled = enable;\r
+}\r
+\r
+int me_count_enabled(const menu_entry *entries, int count)\r
+{\r
+       int i, ret = 0;\r
+\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               if (entries[i].enabled) ret++;\r
+       }\r
+\r
+       return ret;\r
+}\r
+\r
+menu_id me_index2id(const menu_entry *entries, int count, int index)\r
+{\r
+       int i;\r
+\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               if (entries[i].enabled)\r
+               {\r
+                       if (index == 0) break;\r
+                       index--;\r
+               }\r
+       }\r
+       if (i >= count) i = count - 1;\r
+       return entries[i].id;\r
+}\r
+\r
+void me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param)\r
+{\r
+       int i, y1 = y;\r
+\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               if (!entries[i].enabled) continue;\r
+               if (entries[i].name == NULL)\r
+               {\r
+                       if (cust_draw != NULL)\r
+                               cust_draw(&entries[i], x, y1, param);\r
+                       y1 += 10;\r
+                       continue;\r
+               }\r
+               text_out16(x, y1, entries[i].name);\r
+               if (entries[i].beh == MB_ONOFF)\r
+                       text_out16(x + 27*8, y1, (*(int *)entries[i].var & entries[i].mask) ? "ON" : "OFF");\r
+               else if (entries[i].beh == MB_RANGE)\r
+                       text_out16(x + 27*8, y1, "%i", *(int *)entries[i].var);\r
+               y1 += 10;\r
+       }\r
+}\r
+\r
+int me_process(menu_entry *entries, int count, menu_id id, int is_next)\r
+{\r
+       int i = me_id2offset(entries, count, id);\r
+       menu_entry *entry = &entries[i];\r
+       switch (entry->beh)\r
+       {\r
+               case MB_ONOFF:\r
+                       *(int *)entry->var ^= entry->mask;\r
+                       return 1;\r
+               case MB_RANGE:\r
+                       *(int *)entry->var += is_next ? 1 : -1;\r
+                       if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->min;\r
+                       if (*(int *)entry->var > (int)entry->max) *(int *)entry->var = (int)entry->max;\r
+                       return 1;\r
+               default:\r
+                       return 0;\r
+       }\r
+}\r
+\r
+\r
+\r

diff --git a/platform/common/menu.h b/platform/common/menu.h
new file mode 100644 (file)
index 0000000..1e096ff
--- /dev/null
+++ b/platform/common/menu.h
@@ -0,0 +1,98 @@
+// (c) Copyright 2006,2007 notaz, All rights reserved.
+
+
+void menu_init(void);
+void text_out16(int x, int y, const char *texto, ...);
+void smalltext_out16(int x, int y, const char *texto, int color);
+void smalltext_out16_lim(int x, int y, const char *texto, int color, int max);
+void menu_draw_selection(int x, int y, int w);
+
+
+
+typedef enum
+{
+       MB_NONE = 1,            /* no auto processing */
+       MB_ONOFF,               /* ON/OFF setting */
+       MB_RANGE,               /* [min-max] setting */
+} menu_behavior;
+
+typedef enum
+{
+       MA_NONE = 1,
+       MA_MAIN_RESUME_GAME,
+       MA_MAIN_SAVE_STATE,
+       MA_MAIN_LOAD_STATE,
+       MA_MAIN_RESET_GAME,
+       MA_MAIN_LOAD_ROM,
+       MA_MAIN_OPTIONS,
+       MA_MAIN_CONTROLS,
+       MA_MAIN_CREDITS,
+       MA_MAIN_PATCHES,
+       MA_MAIN_EXIT,
+       MA_OPT_RENDERER,
+       MA_OPT_SCALING,
+       MA_OPT_ACC_TIMING,
+       MA_OPT_ACC_SPRITES,
+       MA_OPT_SHOW_FPS,
+       MA_OPT_FRAMESKIP,
+       MA_OPT_ENABLE_SOUND,
+       MA_OPT_SOUND_QUALITY,
+       MA_OPT_ARM940_SOUND,
+       MA_OPT_6BUTTON_PAD,
+       MA_OPT_REGION,
+       MA_OPT_SRAM_STATES,
+       MA_OPT_CONFIRM_STATES,
+       MA_OPT_SAVE_SLOT,
+       MA_OPT_CPU_CLOCKS,
+       MA_OPT_SCD_OPTS,
+       MA_OPT_ADV_OPTS,
+       MA_OPT_SAVECFG,
+       MA_OPT_SAVECFG_GAME,
+       MA_OPT_LOADCFG,
+       MA_OPT2_GAMMA,
+       MA_OPT2_A_SN_GAMMA,
+       MA_OPT2_VSYNC,
+       MA_OPT2_ENABLE_Z80,
+       MA_OPT2_ENABLE_YM2612,
+       MA_OPT2_ENABLE_SN76496,
+       MA_OPT2_GZIP_STATES,
+       MA_OPT2_NO_LAST_ROM,
+       MA_OPT2_RAMTIMINGS,
+       MA_OPT2_SQUIDGEHACK,
+       MA_OPT2_DONE,
+       MA_CDOPT_TESTBIOS_USA,
+       MA_CDOPT_TESTBIOS_EUR,
+       MA_CDOPT_TESTBIOS_JAP,
+       MA_CDOPT_LEDS,
+       MA_CDOPT_CDDA,
+       MA_CDOPT_PCM,
+       MA_CDOPT_READAHEAD,
+       MA_CDOPT_SAVERAM,
+       MA_CDOPT_SCALEROT_CHIP,
+       MA_CDOPT_BETTER_SYNC,
+       MA_CDOPT_DONE,
+} menu_id;
+
+typedef struct
+{
+       char *name;
+       menu_behavior beh;
+       menu_id id;
+       void *var;              /* for on-off settings */
+       int mask;
+       signed char min;        /* for ranged integer settings, to be sign-extended */
+       signed char max;
+       char enabled;
+} menu_entry;
+
+
+typedef void (me_draw_custom_f)(const menu_entry *entry, int x, int y, void *param);
+
+int     me_id2offset(const menu_entry *entries, int count, menu_id id);
+void    me_enable(menu_entry *entries, int count, menu_id id, int enable);
+int     me_count_enabled(const menu_entry *entries, int count);
+menu_id me_index2id(const menu_entry *entries, int count, int index);
+void    me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param);
+int     me_process(menu_entry *entries, int count, menu_id id, int is_next);
+
+

diff --git a/platform/gp2x/readpng.c b/platform/common/readpng.c
similarity index 76%
rename from platform/gp2x/readpng.c
rename to platform/common/readpng.c
index a890e4e..2a74668 100644 (file)
--- a/platform/gp2x/readpng.c
+++ b/platform/common/readpng.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <png.h>
 #include "readpng.h"
+#include "lprintf.h"
 
 void readpng(void *dest, const char *fname, readpng_what what)
 {
@@ -18,14 +19,14 @@ void readpng(void *dest, const char *fname, readpng_what what)
        fp = fopen(fname, "rb");
        if (fp == NULL)
        {
-               printf(__FILE__ ": failed to open: %s\n", fname);
+               lprintf(__FILE__ ": failed to open: %s\n", fname);
                return;
        }
 
        png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
        if (!png_ptr)
        {
-               printf(__FILE__ ": png_create_read_struct() failed\n");
+               lprintf(__FILE__ ": png_create_read_struct() failed\n");
                fclose(fp);
                return;
        }
@@ -33,7 +34,7 @@ void readpng(void *dest, const char *fname, readpng_what what)
        info_ptr = png_create_info_struct(png_ptr);
        if (!info_ptr)
        {
-               printf(__FILE__ ": png_create_info_struct() failed\n");
+               lprintf(__FILE__ ": png_create_info_struct() failed\n");
                goto done;
        }
 
@@ -43,11 +44,11 @@ void readpng(void *dest, const char *fname, readpng_what what)
        row_ptr = png_get_rows(png_ptr, info_ptr);
        if (row_ptr == NULL)
        {
-               printf(__FILE__ ": png_get_rows() failed\n");
+               lprintf(__FILE__ ": png_get_rows() failed\n");
                goto done;
        }
 
-       // printf("%s: %ix%i @ %ibpp\n", fname, (int)info_ptr->width, (int)info_ptr->height, info_ptr->pixel_depth);
+       // lprintf("%s: %ix%i @ %ibpp\n", fname, (int)info_ptr->width, (int)info_ptr->height, info_ptr->pixel_depth);
 
        switch (what)
        {
@@ -57,7 +58,7 @@ void readpng(void *dest, const char *fname, readpng_what what)
                        unsigned short *dst = dest;
                        if (info_ptr->pixel_depth != 24)
                        {
-                               printf(__FILE__ ": bg image uses %ibpp, needed 24bpp\n", info_ptr->pixel_depth);
+                               lprintf(__FILE__ ": bg image uses %ibpp, needed 24bpp\n", info_ptr->pixel_depth);
                                break;
                        }
                        height = info_ptr->height;
@@ -85,13 +86,13 @@ void readpng(void *dest, const char *fname, readpng_what what)
                        unsigned char *dst = dest;
                        if (info_ptr->width != 128 || info_ptr->height != 160)
                        {
-                               printf(__FILE__ ": unexpected font image size %ix%i, needed 128x160\n",
+                               lprintf(__FILE__ ": unexpected font image size %ix%i, needed 128x160\n",
                                        (int)info_ptr->width, (int)info_ptr->height);
                                break;
                        }
                        if (info_ptr->pixel_depth != 8)
                        {
-                               printf(__FILE__ ": font image uses %ibpp, needed 8bpp\n", info_ptr->pixel_depth);
+                               lprintf(__FILE__ ": font image uses %ibpp, needed 8bpp\n", info_ptr->pixel_depth);
                                break;
                        }
                        for (y = 0; y < 16; y++)
@@ -115,13 +116,13 @@ void readpng(void *dest, const char *fname, readpng_what what)
                        unsigned char *dst = dest;
                        if (info_ptr->width != 8 || info_ptr->height != 10)
                        {
-                               printf(__FILE__ ": unexpected selector image size %ix%i, needed 8x10\n",
+                               lprintf(__FILE__ ": unexpected selector image size %ix%i, needed 8x10\n",
                                        (int)info_ptr->width, (int)info_ptr->height);
                                break;
                        }
                        if (info_ptr->pixel_depth != 8)
                        {
-                               printf(__FILE__ ": selector image uses %ibpp, needed 8bpp\n", info_ptr->pixel_depth);
+                               lprintf(__FILE__ ": selector image uses %ibpp, needed 8bpp\n", info_ptr->pixel_depth);
                                break;
                        }
                        for (y1 = 0; y1 < 10; y1++)

diff --git a/platform/gp2x/readpng.h b/platform/common/readpng.h
similarity index 100%
rename from platform/gp2x/readpng.h
rename to platform/common/readpng.h

diff --git a/platform/gizmondo/Makefile b/platform/gizmondo/Makefile
new file mode 100644 (file)
index 0000000..1824fe1
--- /dev/null
+++ b/platform/gizmondo/Makefile
@@ -0,0 +1,173 @@
+\r
+# you may or may not need to change this\r
+CROSS = /opt/cegcc/arm-wince-cegcc/bin/\r
+\r
+# settings\r
+asm_memory = 1\r
+asm_render = 1\r
+asm_ym2612 = 1\r
+asm_misc = 1\r
+asm_cdpico = 1\r
+asm_cdmemory = 1\r
+amalgamate = 0\r
+#profile = 1\r
+\r
+\r
+\r
+DEFINC = -I../.. -I. -D__GIZ__ -D_UNZIP_SUPPORT\r
+COPT_COMMON = -static -Wall -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math\r
+ifeq "$(profile)" "1"\r
+COPT_COMMON += -fprofile-generate\r
+endif\r
+ifeq "$(profile)" "2"\r
+COPT_COMMON += -fprofile-use\r
+endif\r
+COPT = $(COPT_COMMON) -mtune=arm920t\r
+ASFLAGS = -mcpu=arm920t -mfloat-abi=soft\r
+GCC = $(CROSS)gcc\r
+STRIP = $(CROSS)strip\r
+AS = $(CROSS)as\r
+LD = $(CROSS)ld\r
+\r
+# frontend\r
+OBJS += main.o menu.o giz.o emu.o\r
+\r
+# common\r
+OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+\r
+# Pico\r
+ifeq "$(amalgamate)" "1"\r
+OBJS += ../../PicoAll.o\r
+else\r
+OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \\r
+               ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \\r
+               ../../Pico/Patch.o\r
+# Pico - CD\r
+OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \\r
+               ../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o ../../Pico/cd/gfx_cd.o \\r
+               ../../Pico/cd/Area.o ../../Pico/cd/Misc.o ../../Pico/cd/pcm.o ../../Pico/cd/buffering.o\r
+endif\r
+\r
+# asm stuff\r
+ifeq "$(asm_render)" "1"\r
+DEFINC += -D_ASM_DRAW_C\r
+OBJS += ../../Pico/draw_asm.o ../../Pico/draw2_asm.o\r
+endif\r
+ifeq "$(asm_memory)" "1"\r
+DEFINC += -D_ASM_MEMORY_C\r
+OBJS += ../../Pico/memory_asm.o\r
+endif\r
+ifeq "$(asm_ym2612)" "1"\r
+DEFINC += -D_ASM_YM2612_C\r
+OBJS += ../../Pico/sound/ym2612_asm.o\r
+endif\r
+ifeq "$(asm_misc)" "1"\r
+DEFINC += -D_ASM_MISC_C\r
+OBJS += ../../Pico/misc_asm.o\r
+OBJS += ../../Pico/cd/misc_asm.o\r
+endif\r
+ifeq "$(asm_cdpico)" "1"\r
+DEFINC += -D_ASM_CD_PICO_C\r
+OBJS += ../../Pico/cd/pico_asm.o\r
+endif\r
+ifeq "$(asm_cdmemory)" "1"\r
+DEFINC += -D_ASM_CD_MEMORY_C\r
+OBJS += ../../Pico/cd/memory_asm.o\r
+endif\r
+\r
+# Pico - sound\r
+ifneq "$(amalgamate)" "1"\r
+OBJS += ../../Pico/sound/sound.o\r
+endif\r
+OBJS += ../../Pico/sound/mix_asm.o\r
+OBJS += ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o\r
+# zlib\r
+OBJS += ../../zlib/gzio.o ../../zlib/inffast.o ../../zlib/inflate.o ../../zlib/inftrees.o ../../zlib/trees.o \\r
+       ../../zlib/deflate.o ../../zlib/crc32.o ../../zlib/adler32.o ../../zlib/zutil.o ../../zlib/compress.o\r
+# unzip\r
+OBJS += ../../unzip/unzip.o ../../unzip/unzip_stream.o\r
+# mp3\r
+OBJS += mp3.o\r
+# CPU cores\r
+# Cyclone\r
+DEFINC += -DEMU_C68K\r
+OBJS += ../../cpu/Cyclone/proj/Cyclone.o\r
+# drz80\r
+DEFINC += -D_USE_DRZ80\r
+OBJS += ../../cpu/DrZ80/drz80.o\r
+\r
+\r
+all: PicoDrive.exe\r
+\r
+PicoDrive.exe : $(OBJS)\r
+       @echo $@\r
+       @$(GCC) -o $@ $(COPT) $^ -lm -lpng -Lkgsdk/ -lKGSDK -Wl,-Map=PicoDrive.map\r
+ifeq ($(DEBUG),)\r
+       @$(STRIP) $@\r
+endif\r
+\r
+\r
+.c.o:\r
+       @echo $<\r
+       @$(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+#.s.o:\r
+#      @echo $<\r
+#      $(GCC) $(COPT) $(DEFINC) -c $< -o $@\r
+\r
+../../Pico/draw_asm.o : ../../Pico/Draw.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/draw2_asm.o : ../../Pico/Draw2.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/memory_asm.o : ../../Pico/Memory.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/sound/ym2612_asm.o : ../../Pico/sound/ym2612.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/misc_asm.o : ../../Pico/misc.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s\r
+       @echo $<\r
+       @$(AS) $(ASFLAGS) $< -o $@\r
+\r
+# build Cyclone\r
+../../cpu/Cyclone/proj/Cyclone.s :\r
+       @echo building Cyclone...\r
+       @make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h\r
+\r
+\r
+\r
+# cleanup\r
+clean: tidy\r
+       @$(RM) PicoDrive.exe\r
+tidy:\r
+       @$(RM) $(OBJS)\r
+\r
+\r
+clean_prof:\r
+       find ../.. -name '*.gcno' -delete\r
+       find ../.. -name '*.gcda' -delete\r
+\r
+# ----------- release -----------\r
+ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
+ifeq ($(VER),)\r
+$(error need VER)\r
+endif\r
+endif\r
+\r
+rel: PicoDrive.exe kgsdk/ARMV4IRel/KGSDK.dll ../readme.txt config.txt\r
+       zip -9 -j ../../PicoDrive_$(VER).zip $^\r
+       zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
+\r

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
new file mode 100644 (file)
index 0000000..3d5fae7
--- /dev/null
+++ b/platform/gizmondo/emu.c
@@ -0,0 +1,33 @@
+#include <windows.h>
+
+#include "emu.h"
+
+char romFileName[MAX_PATH];
+int engineState;
+currentConfig_t currentConfig;
+
+unsigned char *rom_data = NULL;
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
+int state_slot = 0;
+int reset_timing = 0;
+int config_slot = 0, config_slot_current = 0;
+
+
+
+
+int  emu_ReloadRom(void){}
+void emu_Init(void){}
+void emu_Deinit(void){}
+int  emu_SaveLoadGame(int load, int sram){}
+void emu_Loop(void){}
+void emu_ResetGame(void){}
+int  emu_ReadConfig(int game, int no_defaults){}
+int  emu_WriteConfig(int game){}
+char *emu_GetSaveFName(int load, int is_sram, int slot){}
+int  emu_check_save_file(int slot){}
+void emu_set_save_cbs(int gz){}
+void emu_forced_frame(void){}
+int  emu_cd_check(char **bios_file){}
+int  find_bios(int region, char **bios_file){}
+void scaling_update(void){}
+

diff --git a/platform/gizmondo/emu.h b/platform/gizmondo/emu.h
new file mode 100644 (file)
index 0000000..e9b58c9
--- /dev/null
+++ b/platform/gizmondo/emu.h
@@ -0,0 +1,59 @@
+// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// Free for non-commercial use.\r
+\r
+// For commercial use, separate licencing terms must be obtained.\r
+\r
+\r
+\r
+// engine states\r
+enum TPicoGameState {\r
+       PGS_Paused = 1,\r
+       PGS_Running,\r
+       PGS_Quit,\r
+       PGS_KeyConfig,\r
+       PGS_ReloadRom,\r
+       PGS_Menu,\r
+       PGS_RestartRun,\r
+};\r
+\r
+typedef struct {\r
+       char lastRomFile[512];\r
+       int EmuOpt;             // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,\r
+                                       // <reserved>, no_save_cfg_on_exit, <unused>, 16_bit_mode\r
+                                       // <reserved>, confirm_save, show_cd_leds, confirm_load\r
+                                       // <reserved>, <reserved>\r
+       int PicoOpt;            // used for config saving only, see Pico.h\r
+       int PsndRate;           // ditto\r
+       int PicoRegion;         // ditto\r
+       int Frameskip;\r
+       int CPUclock;           // unused, placeholder for config compatibility\r
+       int KeyBinds[32];\r
+       int volume;\r
+       int gamma;              // unused\r
+       int JoyBinds[4][32];    // unused\r
+       int PicoAutoRgnOrder;\r
+       int PicoCDBuffers;\r
+       int scaling;            // unused\r
+} currentConfig_t;\r
+\r
+extern char romFileName[];\r
+extern int engineState;\r
+extern currentConfig_t currentConfig;\r
+\r
+\r
+int  emu_ReloadRom(void);\r
+void emu_Init(void);\r
+void emu_Deinit(void);\r
+int  emu_SaveLoadGame(int load, int sram);\r
+void emu_Loop(void);\r
+void emu_ResetGame(void);\r
+int  emu_ReadConfig(int game, int no_defaults);\r
+int  emu_WriteConfig(int game);\r
+char *emu_GetSaveFName(int load, int is_sram, int slot);\r
+int  emu_check_save_file(int slot);\r
+void emu_set_save_cbs(int gz);\r
+void emu_forced_frame(void);\r
+int  emu_cd_check(char **bios_file);\r
+int  find_bios(int region, char **bios_file);\r
+void scaling_update(void);\r
+\r

diff --git a/platform/gizmondo/giz.c b/platform/gizmondo/giz.c
new file mode 100644 (file)
index 0000000..16bad7a
--- /dev/null
+++ b/platform/gizmondo/giz.c
@@ -0,0 +1,72 @@
+#include <windows.h>
+#include <stdio.h>
+#include <version.h>
+
+#include "giz.h"
+#include "kgsdk/Framework.h"
+#include "kgsdk/Framework2D.h"
+
+#define LOG_FILE "log.log"
+
+void *giz_screen = NULL;
+static FILE *logf = NULL;
+
+void lprintf_al(const char *fmt, ...)
+{
+       va_list vl;
+
+       if (logf == NULL)
+       {
+               logf = fopen(LOG_FILE, "w");
+               if (logf == NULL)
+                       return;
+       }
+
+       //if (strchr(fmt, '\n'))
+       //      fprintf(logf, "%lu: ", GetTickCount());
+       va_start(vl, fmt);
+       vfprintf(logf, fmt, vl);
+       va_end(vl);
+       fflush(logf);
+}
+
+static void giz_log_close(void)
+{
+       if (logf != NULL)
+       {
+               fclose(logf);
+               logf = NULL;
+       }
+}
+
+void giz_init(HINSTANCE hInstance, HINSTANCE hPrevInstance)
+{
+       int ret;
+
+       giz_screen = NULL;
+
+       lprintf("PicoDrive v" VERSION " (c) notaz, 2006,2007\n");
+       lprintf("%s %s\n\n", __DATE__, __TIME__);
+
+       ret = Framework_Init(hInstance, hPrevInstance);
+       if (!ret)
+       {
+               lprintf_al("Framework_Init() failed\n");
+               exit(1);
+       }
+       ret = Framework2D_Init();
+       if (!ret)
+       {
+               lprintf_al("Framework2D_Init() failed\n");
+               exit(1);
+       }
+}
+
+void giz_deinit(void)
+{
+       Framework2D_Close();
+       Framework_Close();
+
+       giz_log_close();
+}
+

diff --git a/platform/gizmondo/giz.h b/platform/gizmondo/giz.h
new file mode 100644 (file)
index 0000000..478f602
--- /dev/null
+++ b/platform/gizmondo/giz.h
@@ -0,0 +1,22 @@
+extern void *giz_screen;
+
+void giz_init();
+void giz_deinit(void);
+void lprintf_al(const char *fmt, ...);
+
+#define lprintf lprintf_al
+
+// button mappings, include kgsdk/Framework.h to use
+#define BTN_LEFT  (1 << FRAMEWORK_BUTTON_DPAD_LEFT)
+#define BTN_RIGHT (1 << FRAMEWORK_BUTTON_DPAD_RIGHT)
+#define BTN_UP    (1 << FRAMEWORK_BUTTON_DPAD_UP)
+#define BTN_DOWN  (1 << FRAMEWORK_BUTTON_DPAD_DOWN)
+#define BTN_STOP  (1 << FRAMEWORK_BUTTON_STOP)
+#define BTN_PLAY  (1 << FRAMEWORK_BUTTON_PLAY)
+#define BTN_FWD   (1 << FRAMEWORK_BUTTON_FORWARD)
+#define BTN_REW   (1 << FRAMEWORK_BUTTON_REWIND)
+#define BTN_L     (1 << FRAMEWORK_BUTTON_LEFT_SHOULDER)
+#define BTN_R     (1 << FRAMEWORK_BUTTON_RIGHT_SHOULDER)
+#define BTN_HOME  (1 << FRAMEWORK_BUTTON_HOME)
+
+

diff --git a/platform/gizmondo/main.c b/platform/gizmondo/main.c
new file mode 100644 (file)
index 0000000..21216b7
--- /dev/null
+++ b/platform/gizmondo/main.c
@@ -0,0 +1,63 @@
+// (c) Copyright 2006 notaz, All rights reserved.\r
+// Free for non-commercial use.\r
+\r
+// For commercial use, separate licencing terms must be obtained.\r
+\r
+#include <windows.h>\r
+\r
+#include "giz.h"\r
+#include "menu.h"\r
+#include "../common/menu.h"\r
+#include "emu.h"\r
+#include "version.h"\r
+\r
+\r
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)\r
+{\r
+       emu_ReadConfig(0, 0);\r
+       giz_init(hInstance, hPrevInstance);\r
+       emu_Init();\r
+       menu_init();\r
+\r
+       engineState = PGS_Menu;\r
+\r
+       for (;;)\r
+       {\r
+               switch (engineState)\r
+               {\r
+                       case PGS_Menu:\r
+                               menu_loop();\r
+                               break;\r
+\r
+                       case PGS_ReloadRom:\r
+                               if (emu_ReloadRom())\r
+                                       engineState = PGS_Running;\r
+                               else {\r
+                                       lprintf("PGS_ReloadRom == 0\n");\r
+                                       engineState = PGS_Menu;\r
+                               }\r
+                               break;\r
+\r
+                       case PGS_RestartRun:\r
+                               engineState = PGS_Running;\r
+\r
+                       case PGS_Running:\r
+                               emu_Loop();\r
+                               break;\r
+\r
+                       case PGS_Quit:\r
+                               goto endloop;\r
+\r
+                       default:\r
+                               lprintf("engine got into unknown state (%i), exitting\n", engineState);\r
+                               goto endloop;\r
+               }\r
+       }\r
+\r
+       endloop:\r
+\r
+       emu_Deinit();\r
+       giz_deinit();\r
+\r
+       return 0;\r
+}\r

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
new file mode 100644 (file)
index 0000000..c4ecd0b
--- /dev/null
+++ b/platform/gizmondo/menu.c
@@ -0,0 +1,1532 @@
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
+// Free for non-commercial use.\r
+\r
+// For commercial use, separate licencing terms must be obtained.\r
+\r
+// don't like to use loads of #ifdefs, so duplicating GP2X code\r
+// horribly instead\r
+\r
+#include <stdio.h>\r
+#include <string.h>\r
+#include <stdlib.h>\r
+#include <unistd.h> // for getcwd cegcc implementation\r
+#include <windows.h>\r
+\r
+#include "giz.h"\r
+#include "emu.h"\r
+#include "menu.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/menu.h"\r
+#include "../common/readpng.h"\r
+#include "version.h"\r
+#include "kgsdk/Framework.h"\r
+#include "kgsdk/Framework2D.h"\r
+\r
+#include <Pico/PicoInt.h>\r
+#include <Pico/Patch.h>\r
+#include <zlib/zlib.h>\r
+\r
+extern char romFileName[MAX_PATH];\r
+extern char *rom_data;\r
+extern int  state_slot;\r
+extern int  config_slot, config_slot_current;\r
+\r
+#define gizKeyUnkn "???"\r
+static const char * const gizKeyNames[] = {\r
+       "LEFT",          "RIGHT",          "UP",       "DOWN",     "STOP",       "PLAY",   "FORWARD",  "REWIND",\r
+       "LEFT_SHOULDER", "RIGHT_SHOULDER", "HOME",     "VOLUME",   "BRIGHTNESS", "ALARM",  "POWER",    gizKeyUnkn,\r
+       gizKeyUnkn,      gizKeyUnkn,       gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,\r
+       gizKeyUnkn,      gizKeyUnkn,       gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,\r
+};\r
+\r
+static unsigned char bg_buffer[321*240*2];\r
+char menuErrorMsg[40] = {0, };\r
+\r
+static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);\r
+static void menu_prepare_bg(int use_game_bg);\r
+\r
+static unsigned int inp_prev = 0;\r
+static int inp_prevjoy = 0;\r
+\r
+static unsigned long wait_for_input(unsigned int interesting)\r
+{\r
+       unsigned int ret;\r
+       static int repeats = 0, wait = 50;\r
+       int release = 0, i;\r
+\r
+       if (repeats == 2 || repeats == 4) wait /= 2;\r
+       if (repeats == 6) wait = 15;\r
+\r
+       for (i = 0; i < 6 && inp_prev == Framework_PollGetButtons(); i++) {\r
+               if (i == 0) repeats++;\r
+               Sleep(wait);\r
+       }\r
+\r
+       while ( !((ret = Framework_PollGetButtons()) & interesting) ) {\r
+               Sleep(50);\r
+               release = 1;\r
+       }\r
+\r
+       if (release || ret != inp_prev) {\r
+               repeats = 0;\r
+               wait = 50;\r
+       }\r
+       inp_prev = ret;\r
+       inp_prevjoy = 0;\r
+\r
+       // we don't need diagonals in menus\r
+       if ((ret&BTN_UP)   && (ret&BTN_LEFT))  ret &= ~BTN_LEFT;\r
+       if ((ret&BTN_UP)   && (ret&BTN_RIGHT)) ret &= ~BTN_RIGHT;\r
+       if ((ret&BTN_DOWN) && (ret&BTN_LEFT))  ret &= ~BTN_LEFT;\r
+       if ((ret&BTN_DOWN) && (ret&BTN_RIGHT)) ret &= ~BTN_RIGHT;\r
+\r
+       return ret;\r
+}\r
+\r
+\r
+static void menu_draw_begin(int use_bgbuff)\r
+{\r
+       if (giz_screen == NULL)\r
+       {\r
+               Framework2D_WaitVSync();\r
+               giz_screen = Framework2D_LockBuffer();\r
+       }\r
+       else\r
+       {\r
+               lprintf("%s: screen was not NULL\n", __FUNCTION__);\r
+       }\r
+       memcpy32(giz_screen, (int *)bg_buffer, 321*240*2/4);\r
+}\r
+\r
+\r
+static void menu_draw_end(void)\r
+{\r
+       Framework2D_UnlockBuffer();\r
+       giz_screen = NULL;\r
+}\r
+\r
+\r
+// --------- loading ROM screen ----------\r
+\r
+static void load_progress_cb(int percent)\r
+{\r
+       int ln, len = percent * 320 / 100;\r
+       unsigned short *dst;\r
+\r
+       menu_draw_begin(0);\r
+       dst = (unsigned short *)giz_screen + 321*20;\r
+\r
+       if (len > 320) len = 320;\r
+       for (ln = 10; ln > 0; ln--, dst += 320)\r
+               memset(dst, 0xff, len*2);\r
+       menu_draw_end();\r
+}\r
+\r
+void menu_romload_prepare(const char *rom_name)\r
+{\r
+       const char *p = rom_name + strlen(rom_name);\r
+       while (p > rom_name && *p != '/') p--;\r
+\r
+       if (rom_data == NULL)\r
+               memset(giz_screen, 0, 321*240*2);\r
+       menu_draw_begin(1);\r
+\r
+       smalltext_out16(1, 1, "Loading", 0xffff);\r
+       smalltext_out16_lim(1, 10, p, 0xffff, 53);\r
+       menu_draw_end();\r
+       PicoCartLoadProgressCB = load_progress_cb;\r
+}\r
+\r
+void menu_romload_end(void)\r
+{\r
+       PicoCartLoadProgressCB = NULL;\r
+       menu_draw_begin(0);\r
+       smalltext_out16(1, 30, "Starting emulation...", 0xffff);\r
+       menu_draw_end();\r
+}\r
+\r
+// -------------- ROM selector --------------\r
+\r
+// rrrr rggg gggb bbbb\r
+#if 0\r
+static unsigned short file2color(const char *fname)\r
+{\r
+       const char *ext = fname + strlen(fname) - 3;\r
+       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso" };\r
+       static const char *other_exts[] = { "gmv", "pat" };\r
+       int i;\r
+\r
+       if (ext < fname) ext = fname;\r
+       for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++)\r
+               if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff;\r
+       for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++)\r
+               if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;\r
+       return 0xffff;\r
+}\r
+\r
+static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
+{\r
+       int start, i, pos;\r
+\r
+       start = 12 - sel;\r
+       n--; // exclude current dir (".")\r
+\r
+       menu_draw_begin(1);\r
+\r
+       if (rom_data == NULL) {\r
+               menu_darken_bg(giz_screen, giz_screen, 321*240, 0);\r
+       }\r
+\r
+       menu_darken_bg((char *)giz_screen + 321*120*2, (char *)giz_screen + 321*120*2, 321*8, 0);\r
+\r
+       if(start - 2 >= 0)\r
+               smalltext_out16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);\r
+       for (i = 0; i < n; i++) {\r
+               pos = start + i;\r
+               if (pos < 0)  continue;\r
+               if (pos > 23) break;\r
+               if (namelist[i+1]->d_type == DT_DIR) {\r
+                       smalltext_out16_lim(14,   pos*10, "/", 0xfff6, 1);\r
+                       smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3);\r
+               } else {\r
+                       unsigned short color = file2color(namelist[i+1]->d_name);\r
+                       smalltext_out16_lim(14,   pos*10, namelist[i+1]->d_name, color, 53-2);\r
+               }\r
+       }\r
+       text_out16(5, 120, ">");\r
+       menu_draw_end();\r
+}\r
+\r
+static int scandir_cmp(const void *p1, const void *p2)\r
+{\r
+       struct dirent **d1 = (struct dirent **)p1, **d2 = (struct dirent **)p2;\r
+       if ((*d1)->d_type == (*d2)->d_type) return alphasort(d1, d2);\r
+       if ((*d1)->d_type == DT_DIR) return -1; // put before\r
+       if ((*d2)->d_type == DT_DIR) return  1;\r
+       return alphasort(d1, d2);\r
+}\r
+\r
+static char *filter_exts[] = {\r
+       ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
+       ".jpg", ".gpe", ".cue"\r
+};\r
+\r
+static int scandir_filter(const struct dirent *ent)\r
+{\r
+       const char *p;\r
+       int i;\r
+\r
+       if (ent == NULL || ent->d_name == NULL) return 0;\r
+       if (strlen(ent->d_name) < 5) return 1;\r
+\r
+       p = ent->d_name + strlen(ent->d_name) - 4;\r
+\r
+       for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)\r
+       {\r
+               if (strcmp(p, filter_exts[i]) == 0) return 0;\r
+       }\r
+\r
+       return 1;\r
+}\r
+\r
+static char *romsel_loop(char *curr_path)\r
+{\r
+       struct dirent **namelist;\r
+       DIR *dir;\r
+       int n, sel = 0;\r
+       unsigned long inp = 0;\r
+       char *ret = NULL, *fname = NULL;\r
+\r
+       // is this a dir or a full path?\r
+       if ((dir = opendir(curr_path))) {\r
+               closedir(dir);\r
+       } else {\r
+               char *p;\r
+               for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--);\r
+               *p = 0;\r
+               fname = p+1;\r
+       }\r
+\r
+       n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);\r
+       if (n < 0) {\r
+               // try root\r
+               n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
+               if (n < 0) {\r
+                       // oops, we failed\r
+                       lprintf("dir: "); lprintf(curr_path); lprintf("\n");\r
+                       perror("scandir");\r
+                       return NULL;\r
+               }\r
+       }\r
+\r
+       // try to find sel\r
+       if (fname != NULL) {\r
+               int i;\r
+               for (i = 1; i < n; i++) {\r
+                       if (strcmp(namelist[i]->d_name, fname) == 0) {\r
+                               sel = i - 1;\r
+                               break;\r
+                       }\r
+               }\r
+       }\r
+\r
+       for (;;)\r
+       {\r
+               draw_dirlist(curr_path, namelist, n, sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_PLAY|BTN_STOP);\r
+               if(inp & BTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
+               if(inp & BTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
+               if(inp & BTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
+               if(inp & BTN_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
+               if(inp & BTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp & BTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
+               if(inp & BTN_PLAY)     { // enter dir/select\r
+                       again:\r
+                       if (namelist[sel+1]->d_type == DT_REG) {\r
+                               strcpy(romFileName, curr_path);\r
+                               strcat(romFileName, "/");\r
+                               strcat(romFileName, namelist[sel+1]->d_name);\r
+                               ret = romFileName;\r
+                               break;\r
+                       } else if (namelist[sel+1]->d_type == DT_DIR) {\r
+                               int newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
+                               char *p, *newdir = malloc(newlen);\r
+                               if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
+                                       char *start = curr_path;\r
+                                       p = start + strlen(start) - 1;\r
+                                       while (*p == '/' && p > start) p--;\r
+                                       while (*p != '/' && p > start) p--;\r
+                                       if (p <= start) strcpy(newdir, "/");\r
+                                       else { strncpy(newdir, start, p-start); newdir[p-start] = 0; }\r
+                               } else {\r
+                                       strcpy(newdir, curr_path);\r
+                                       p = newdir + strlen(newdir) - 1;\r
+                                       while (*p == '/' && p >= newdir) *p-- = 0;\r
+                                       strcat(newdir, "/");\r
+                                       strcat(newdir, namelist[sel+1]->d_name);\r
+                               }\r
+                               ret = romsel_loop(newdir);\r
+                               free(newdir);\r
+                               break;\r
+                       } else {\r
+                               // unknown file type, happens on NTFS mounts. Try to guess.\r
+                               FILE *tstf; int tmp;\r
+                               strcpy(romFileName, curr_path);\r
+                               strcat(romFileName, "/");\r
+                               strcat(romFileName, namelist[sel+1]->d_name);\r
+                               tstf = fopen(romFileName, "rb");\r
+                               if (tstf != NULL)\r
+                               {\r
+                                       if (fread(&tmp, 1, 1, tstf) > 0 || ferror(tstf) == 0)\r
+                                               namelist[sel+1]->d_type = DT_REG;\r
+                                       else    namelist[sel+1]->d_type = DT_DIR;\r
+                                       fclose(tstf);\r
+                                       goto again;\r
+                               }\r
+                       }\r
+               }\r
+               if(inp & BTN_STOP) break; // cancel\r
+       }\r
+\r
+       if (n > 0) {\r
+               while(n--) free(namelist[n]);\r
+               free(namelist);\r
+       }\r
+\r
+       return ret;\r
+}\r
+#endif\r
+static char *romsel_loop(char *curr_path)\r
+{\r
+       return NULL;\r
+}\r
+\r
+// ------------ patch/gg menu ------------\r
+\r
+static void draw_patchlist(int sel)\r
+{\r
+       int start, i, pos, active;\r
+\r
+       start = 12 - sel;\r
+\r
+       menu_draw_begin(1);\r
+\r
+       for (i = 0; i < PicoPatchCount; i++) {\r
+               pos = start + i;\r
+               if (pos < 0)  continue;\r
+               if (pos > 23) break;\r
+               active = PicoPatches[i].active;\r
+               smalltext_out16_lim(14,     pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff, 3);\r
+               smalltext_out16_lim(14+6*4, pos*10, PicoPatches[i].name, active ? 0xfff6 : 0xffff, 53-6);\r
+       }\r
+       pos = start + i;\r
+       if (pos < 24) smalltext_out16_lim(14, pos*10, "done", 0xffff, 4);\r
+\r
+       text_out16(5, 120, ">");\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+static void patches_menu_loop(void)\r
+{\r
+       int menu_sel = 0;\r
+       unsigned long inp = 0;\r
+\r
+       for(;;)\r
+       {\r
+               draw_patchlist(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_PLAY|BTN_STOP);\r
+               if(inp & BTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
+               if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
+               if(inp &(BTN_LEFT|BTN_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
+               if(inp &(BTN_RIGHT|BTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
+               if(inp & BTN_PLAY) { // action\r
+                       if (menu_sel < PicoPatchCount)\r
+                               PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;\r
+                       else    return;\r
+               }\r
+               if(inp & BTN_STOP) return;\r
+       }\r
+\r
+}\r
+\r
+// ------------ savestate loader ------------\r
+\r
+static int state_slot_flags = 0;\r
+\r
+static void state_check_slots(void)\r
+{\r
+       int slot;\r
+\r
+       state_slot_flags = 0;\r
+\r
+       for (slot = 0; slot < 10; slot++)\r
+       {\r
+               if (emu_check_save_file(slot))\r
+               {\r
+                       state_slot_flags |= 1 << slot;\r
+               }\r
+       }\r
+}\r
+\r
+static void draw_savestate_bg(int slot)\r
+{\r
+       struct PicoVideo tmp_pv;\r
+       unsigned short tmp_cram[0x40];\r
+       unsigned short tmp_vsram[0x40];\r
+       void *tmp_vram, *file;\r
+       char *fname;\r
+\r
+       fname = emu_GetSaveFName(1, 0, slot);\r
+       if (!fname) return;\r
+\r
+       tmp_vram = malloc(sizeof(Pico.vram));\r
+       if (tmp_vram == NULL) return;\r
+\r
+       memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));\r
+       memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));\r
+       memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));\r
+       memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));\r
+\r
+       if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
+               file = gzopen(fname, "rb");\r
+               emu_set_save_cbs(1);\r
+       } else {\r
+               file = fopen(fname, "rb");\r
+               emu_set_save_cbs(0);\r
+       }\r
+\r
+       if (file) {\r
+               if (PicoMCD & 1) {\r
+                       PicoCdLoadStateGfx(file);\r
+               } else {\r
+                       areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
+                       areaRead(Pico.vram, 1, sizeof(Pico.vram), file);\r
+                       areaSeek(file, 0x2000, SEEK_CUR);\r
+                       areaRead(Pico.cram, 1, sizeof(Pico.cram), file);\r
+                       areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file);\r
+                       areaSeek(file, 0x221a0, SEEK_SET);\r
+                       areaRead(&Pico.video, 1, sizeof(Pico.video), file);\r
+               }\r
+               areaClose(file);\r
+       }\r
+\r
+       emu_forced_frame();\r
+       menu_prepare_bg(1);\r
+\r
+       memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
+       memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
+       memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));\r
+       memcpy(&Pico.video, &tmp_pv,  sizeof(Pico.video));\r
+       free(tmp_vram);\r
+}\r
+\r
+static void draw_savestate_menu(int menu_sel, int is_loading)\r
+{\r
+       int tl_x = 25, tl_y = 60, y, i;\r
+\r
+       if (state_slot_flags & (1 << menu_sel))\r
+               draw_savestate_bg(menu_sel);\r
+       menu_draw_begin(1);\r
+\r
+       text_out16(tl_x, 30, is_loading ? "Load state" : "Save state");\r
+\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);\r
+\r
+       /* draw all 10 slots */\r
+       y = tl_y;\r
+       for (i = 0; i < 10; i++, y+=10)\r
+       {\r
+               text_out16(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
+       }\r
+       text_out16(tl_x, y, "back");\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+static int savestate_menu_loop(int is_loading)\r
+{\r
+       static int menu_sel = 10;\r
+       int menu_sel_max = 10;\r
+       unsigned long inp = 0;\r
+\r
+       state_check_slots();\r
+\r
+       for(;;)\r
+       {\r
+               draw_savestate_menu(menu_sel, is_loading);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_PLAY|BTN_STOP);\r
+               if(inp & BTN_UP  ) {\r
+                       do {\r
+                               menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;\r
+                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+               }\r
+               if(inp & BTN_DOWN) {\r
+                       do {\r
+                               menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;\r
+                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+               }\r
+               if(inp & BTN_PLAY) { // save/load\r
+                       if (menu_sel < 10) {\r
+                               state_slot = menu_sel;\r
+                               if (emu_SaveLoadGame(is_loading, 0)) {\r
+                                       strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");\r
+                                       return 1;\r
+                               }\r
+                               return 0;\r
+                       } else  return 1;\r
+               }\r
+               if(inp & BTN_STOP) return 1;\r
+       }\r
+}\r
+\r
+// -------------- key config --------------\r
+\r
+static char *action_binds(int player_idx, int action_mask)\r
+{\r
+       static char strkeys[32*5];\r
+       int i;\r
+\r
+       strkeys[0] = 0;\r
+       for (i = 0; i < 32; i++) // i is key index\r
+       {\r
+               if (currentConfig.KeyBinds[i] & action_mask)\r
+               {\r
+                       if (player_idx >= 0 && ((currentConfig.KeyBinds[i] >> 16) & 3) != player_idx) continue;\r
+                       if (strkeys[0]) { strcat(strkeys, " + "); strcat(strkeys, gizKeyNames[i]); break; }\r
+                       else strcpy(strkeys, gizKeyNames[i]);\r
+               }\r
+       }\r
+\r
+       return strkeys;\r
+}\r
+\r
+static void unbind_action(int action)\r
+{\r
+       int i;\r
+\r
+       for (i = 0; i < 32; i++)\r
+               currentConfig.KeyBinds[i] &= ~action;\r
+}\r
+\r
+static int count_bound_keys(int action)\r
+{\r
+       int i, keys = 0;\r
+\r
+       for (i = 0; i < 32; i++)\r
+               if (currentConfig.KeyBinds[i] & action) keys++;\r
+\r
+       return keys;\r
+}\r
+\r
+typedef struct { char *name; int mask; } bind_action_t;\r
+\r
+static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_idx, int sel)\r
+{\r
+       int x, y, tl_y = 40, i;\r
+\r
+       menu_draw_begin(1);\r
+       if (player_idx >= 0) {\r
+               text_out16(80, 20, "Player %i controls", player_idx + 1);\r
+               x = 100;\r
+       } else {\r
+               text_out16(80, 20, "Emulator controls");\r
+               x = 40;\r
+       }\r
+\r
+       menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);\r
+\r
+       y = tl_y;\r
+       for (i = 0; i < opt_cnt; i++, y+=10)\r
+               text_out16(x, y, "%s : %s", opts[i].name, action_binds(player_idx, opts[i].mask));\r
+\r
+       text_out16(x, y, "Done");\r
+\r
+       if (sel < opt_cnt) {\r
+               text_out16(30, 180, "Press a button to bind/unbind");\r
+               text_out16(30, 190, "Use SELECT to clear");\r
+               text_out16(30, 200, "To bind UP/DOWN, hold SELECT");\r
+               text_out16(30, 210, "Select \"Done\" to exit");\r
+       } else {\r
+               text_out16(30, 190, "Use Options -> Save cfg");\r
+               text_out16(30, 200, "to save controls");\r
+               text_out16(30, 210, "Press B or X to exit");\r
+       }\r
+       menu_draw_end();\r
+}\r
+\r
+static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)\r
+{\r
+       int sel = 0, menu_sel_max = opt_cnt, prev_select = 0, i;\r
+       unsigned long inp = 0;\r
+\r
+       for (;;)\r
+       {\r
+               draw_key_config(opts, opt_cnt, player_idx, sel);\r
+               inp = wait_for_input(CONFIGURABLE_KEYS);\r
+               if (!(inp & BTN_HOME)) {\r
+                       prev_select = 0;\r
+                       if(inp & BTN_UP  ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }\r
+                       if(inp & BTN_DOWN) { sel++; if (sel > menu_sel_max) sel = 0; continue; }\r
+               }\r
+               if (sel >= opt_cnt) {\r
+                       if (inp & (BTN_PLAY|BTN_STOP)) break;\r
+                       else continue;\r
+               }\r
+               // if we are here, we want to bind/unbind something\r
+               if ((inp & BTN_HOME) && !prev_select)\r
+                       unbind_action(opts[sel].mask);\r
+               prev_select = inp & BTN_HOME;\r
+               inp &= CONFIGURABLE_KEYS;\r
+               inp &= ~BTN_HOME;\r
+               for (i = 0; i < 32; i++)\r
+                       if (inp & (1 << i)) {\r
+                               if (count_bound_keys(opts[sel].mask) >= 2)\r
+                                       currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only\r
+                               else currentConfig.KeyBinds[i] ^=  opts[sel].mask;\r
+                               if (player_idx >= 0) {\r
+                                       currentConfig.KeyBinds[i] &= ~(3 << 16);\r
+                                       currentConfig.KeyBinds[i] |= player_idx << 16;\r
+                               }\r
+                       }\r
+       }\r
+}\r
+\r
+static void draw_kc_sel(int menu_sel)\r
+{\r
+       int tl_x = 25+40, tl_y = 60, y;\r
+\r
+       y = tl_y;\r
+       menu_draw_begin(1);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
+\r
+       text_out16(tl_x, y,       "Player 1");\r
+       text_out16(tl_x, (y+=10), "Player 2");\r
+       text_out16(tl_x, (y+=10), "Emulator controls");\r
+       text_out16(tl_x, (y+=10), "Done");\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+// PicoPad[] format: MXYZ SACB RLDU\r
+static bind_action_t ctrl_actions[] =\r
+{\r
+       { "UP     ", 0x001 },\r
+       { "DOWN   ", 0x002 },\r
+       { "LEFT   ", 0x004 },\r
+       { "RIGHT  ", 0x008 },\r
+       { "A      ", 0x040 },\r
+       { "B      ", 0x010 },\r
+       { "C      ", 0x020 },\r
+       { "START  ", 0x080 },\r
+       { "MODE   ", 0x800 },\r
+       { "X      ", 0x400 },\r
+       { "Y      ", 0x200 },\r
+       { "Z      ", 0x100 },\r
+};\r
+\r
+// player2_flag, ?, ?, ?, ?, ?, ?, menu\r
+// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
+// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
+static bind_action_t emuctrl_actions[] =\r
+{\r
+       { "Load State     ", 1<<28 },\r
+       { "Save State     ", 1<<27 },\r
+       { "Prev Save Slot ", 1<<25 },\r
+       { "Next Save Slot ", 1<<24 },\r
+       { "Switch Renderer", 1<<26 },\r
+       { "Volume Down    ", 1<<30 },\r
+       { "Volume Up      ", 1<<29 },\r
+       { "Enter Menu     ", 1<<23 },\r
+};\r
+\r
+static void kc_sel_loop(void)\r
+{\r
+       int menu_sel = 3, menu_sel_max = 3;\r
+       unsigned long inp = 0;\r
+       int is_6button = currentConfig.PicoOpt & 0x020;\r
+\r
+       while (1)\r
+       {\r
+               draw_kc_sel(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_PLAY|BTN_STOP);\r
+               if (inp & BTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               if (inp & BTN_PLAY) {\r
+                       switch (menu_sel) {\r
+                               case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return;\r
+                               case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;\r
+                               case 2: key_config_loop(emuctrl_actions,\r
+                                               sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
+                               case 3: if (rom_data == NULL) emu_WriteConfig(0); return;\r
+                               default: return;\r
+                       }\r
+               }\r
+               if (inp & BTN_STOP) return;\r
+       }\r
+}\r
+\r
+\r
+// --------- sega/mega cd options ----------\r
+\r
+menu_entry cdopt_entries[] =\r
+{\r
+       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_USA, NULL, 0, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1 },\r
+       { "CD LEDs",                   MB_ONOFF, MA_CDOPT_LEDS,         &currentConfig.EmuOpt,  0x0400, 0, 0, 1 },\r
+       { "CDDA audio (using mp3s)",   MB_ONOFF, MA_CDOPT_CDDA,         &currentConfig.PicoOpt, 0x0800, 0, 0, 1 },\r
+       { "PCM audio",                 MB_ONOFF, MA_CDOPT_PCM,          &currentConfig.PicoOpt, 0x0400, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_CDOPT_READAHEAD,    NULL, 0, 0, 0, 1 },\r
+       { "SaveRAM cart",              MB_ONOFF, MA_CDOPT_SAVERAM,      &currentConfig.PicoOpt, 0x8000, 0, 0, 1 },\r
+       { "Scale/Rot. fx (slow)",      MB_ONOFF, MA_CDOPT_SCALEROT_CHIP,&currentConfig.PicoOpt, 0x1000, 0, 0, 1 },\r
+       { "Better sync (slow)",        MB_ONOFF, MA_CDOPT_BETTER_SYNC,  &currentConfig.PicoOpt, 0x2000, 0, 0, 1 },\r
+       { "done",                      MB_NONE,  MA_CDOPT_DONE,         NULL, 0, 0, 0, 1 },\r
+};\r
+\r
+#define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))\r
+\r
+\r
+struct bios_names_t\r
+{\r
+       char us[32], eu[32], jp[32];\r
+};\r
+\r
+static void menu_cdopt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
+{\r
+       struct bios_names_t *bios_names = param;\r
+       char ra_buff[16];\r
+\r
+       switch (entry->id)\r
+       {\r
+               case MA_CDOPT_TESTBIOS_USA: text_out16(x, y, "USA BIOS:     %s", bios_names->us); break;\r
+               case MA_CDOPT_TESTBIOS_EUR: text_out16(x, y, "EUR BIOS:     %s", bios_names->eu); break;\r
+               case MA_CDOPT_TESTBIOS_JAP: text_out16(x, y, "JAP BIOS:     %s", bios_names->jp); break;\r
+               case MA_CDOPT_READAHEAD:\r
+                       if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
+                       else strcpy(ra_buff, "     OFF");\r
+                       text_out16(x, y, "ReadAhead buffer      %s", ra_buff);\r
+                       break;\r
+               default:break;\r
+       }\r
+}\r
+\r
+static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)\r
+{\r
+       int tl_x = 25, tl_y = 60;\r
+       menu_id selected_id;\r
+       char ra_buff[16];\r
+\r
+       if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
+       else strcpy(ra_buff, "     OFF");\r
+\r
+       menu_draw_begin(1);\r
+\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);\r
+\r
+       me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
+\r
+       selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
+       if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) ||\r
+               (selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) ||\r
+               (selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND")))\r
+                       text_out16(tl_x, 210, "Press start to test selected BIOS");\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+static void cd_menu_loop_options(void)\r
+{\r
+       static int menu_sel = 0;\r
+       int menu_sel_max = 10;\r
+       unsigned long inp = 0;\r
+       struct bios_names_t bios_names;\r
+       menu_id selected_id;\r
+       char *bios, *p;\r
+\r
+       if (find_bios(4, &bios)) { // US\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
+       } else  strcpy(bios_names.us, "NOT FOUND");\r
+\r
+       if (find_bios(8, &bios)) { // EU\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
+       } else  strcpy(bios_names.eu, "NOT FOUND");\r
+\r
+       if (find_bios(1, &bios)) { // JP\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
+       } else  strcpy(bios_names.jp, "NOT FOUND");\r
+\r
+       for(;;)\r
+       {\r
+               draw_cd_menu_options(menu_sel, &bios_names);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_PLAY|BTN_STOP|BTN_REW);\r
+               if (inp & BTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
+               if (inp & (BTN_LEFT|BTN_RIGHT)) { // multi choise\r
+                       if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0) &&\r
+                           selected_id == MA_CDOPT_READAHEAD) {\r
+                               if (inp & BTN_LEFT) {\r
+                                       PicoCDBuffers >>= 1;\r
+                                       if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
+                               } else {\r
+                                       if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
+                                       else PicoCDBuffers <<= 1;\r
+                                       if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
+                               }\r
+                       }\r
+               }\r
+               if (inp & BTN_PLAY) { // toggleable options\r
+                       if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&\r
+                           selected_id == MA_CDOPT_DONE) {\r
+                               return;\r
+                       }\r
+                       switch (selected_id) { // BIOS testers\r
+                               case MA_CDOPT_TESTBIOS_USA:\r
+                                       if (find_bios(4, &bios)) { // test US\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_CDOPT_TESTBIOS_EUR:\r
+                                       if (find_bios(8, &bios)) { // test EU\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_CDOPT_TESTBIOS_JAP:\r
+                                       if (find_bios(1, &bios)) { // test JP\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               default:\r
+                                       break;\r
+                       }\r
+               }\r
+               if (inp & (BTN_STOP|BTN_REW)) return;\r
+       }\r
+}\r
+\r
+\r
+// --------- advanced options ----------\r
+\r
+menu_entry opt2_entries[] =\r
+{\r
+       { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &currentConfig.PicoOpt,0x0004, 0, 0, 1 },\r
+       { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &currentConfig.PicoOpt,0x0001, 0, 0, 1 },\r
+       { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&currentConfig.PicoOpt,0x0002, 0, 0, 1 },\r
+       { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1 },\r
+       { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1 },\r
+       { "done",                      MB_NONE,  MA_OPT2_DONE,          NULL, 0, 0, 0, 1 },\r
+};\r
+\r
+#define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))\r
+\r
+\r
+static void draw_amenu_options(int menu_sel)\r
+{\r
+       int tl_x = 25, tl_y = 50;\r
+\r
+       menu_draw_begin(1);\r
+\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);\r
+\r
+       me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+static void amenu_loop_options(void)\r
+{\r
+       static int menu_sel = 0;\r
+       int menu_sel_max;\r
+       unsigned long inp = 0;\r
+       menu_id selected_id;\r
+\r
+       menu_sel_max = me_count_enabled(opt2_entries, OPT2_ENTRY_COUNT) - 1;\r
+\r
+       for(;;)\r
+       {\r
+               draw_amenu_options(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_PLAY|BTN_STOP|BTN_REW);\r
+               if (inp & BTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               selected_id = me_index2id(opt2_entries, OPT2_ENTRY_COUNT, menu_sel);\r
+               if (inp & (BTN_LEFT|BTN_RIGHT)) { // multi choise\r
+                       if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0) &&\r
+                           selected_id == MA_OPT2_GAMMA) {\r
+                               while ((inp = Framework_PollGetButtons(1)) & (BTN_LEFT|BTN_RIGHT)) {\r
+                                       currentConfig.gamma += (inp & BTN_LEFT) ? -1 : 1;\r
+                                       if (currentConfig.gamma <   1) currentConfig.gamma =   1;\r
+                                       if (currentConfig.gamma > 300) currentConfig.gamma = 300;\r
+                                       draw_amenu_options(menu_sel);\r
+                                       Sleep(18);\r
+                               }\r
+                       }\r
+               }\r
+               if (inp & BTN_PLAY) { // toggleable options\r
+                       if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, 1) &&\r
+                           selected_id == MA_OPT2_DONE) {\r
+                               return;\r
+                       }\r
+               }\r
+               if (inp & (BTN_STOP|BTN_REW)) return;\r
+       }\r
+}\r
+\r
+// -------------- options --------------\r
+\r
+\r
+menu_entry opt_entries[] =\r
+{\r
+       { NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1 },\r
+       { "Scale low res mode",        MB_ONOFF, MA_OPT_SCALING,       &currentConfig.scaling, 0x001, 0, 3, 1 },\r
+       { "Accurate timing (slower)",  MB_ONOFF, MA_OPT_ACC_TIMING,    &currentConfig.PicoOpt, 0x040, 0, 0, 1 },\r
+       { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES,   &currentConfig.PicoOpt, 0x080, 0, 0, 1 },\r
+       { "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x002, 0, 0, 1 },\r
+       { NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1 },\r
+       { "Enable sound",              MB_ONOFF, MA_OPT_ENABLE_SOUND,  &currentConfig.EmuOpt,  0x004, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1 },\r
+       { "6 button pad",              MB_ONOFF, MA_OPT_6BUTTON_PAD,   &currentConfig.PicoOpt, 0x020, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_OPT_REGION,        NULL, 0, 0, 0, 1 },\r
+       { "Use SRAM/BRAM savestates",  MB_ONOFF, MA_OPT_SRAM_STATES,   &currentConfig.EmuOpt,  0x001, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1 },\r
+       { "Save slot",                 MB_RANGE, MA_OPT_SAVE_SLOT,     &state_slot, 0, 0, 9, 1 },\r
+       { "[Sega/Mega CD options]",    MB_NONE,  MA_OPT_SCD_OPTS,      NULL, 0, 0, 0, 1 },\r
+       { "[advanced options]",        MB_NONE,  MA_OPT_ADV_OPTS,      NULL, 0, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_OPT_SAVECFG,       NULL, 0, 0, 0, 1 },\r
+       { "Save cfg for current game only",MB_NONE,MA_OPT_SAVECFG_GAME,NULL, 0, 0, 0, 1 },\r
+       { NULL,                        MB_NONE,  MA_OPT_LOADCFG,       NULL, 0, 0, 0, 1 },\r
+};\r
+\r
+#define OPT_ENTRY_COUNT (sizeof(opt_entries) / sizeof(opt_entries[0]))\r
+\r
+\r
+static const char *region_name(unsigned int code)\r
+{\r
+       static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };\r
+       static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
+       int u, i = 0;\r
+       if (code) {\r
+               code <<= 1;\r
+               while((code >>= 1)) i++;\r
+               if (i > 4) return "unknown";\r
+               return names[i];\r
+       } else {\r
+               static char name[24];\r
+               strcpy(name, "Auto:");\r
+               for (u = 0; u < 3; u++) {\r
+                       i = 0; code = ((PicoAutoRgnOrder >> u*4) & 0xf) << 1;\r
+                       while((code >>= 1)) i++;\r
+                       strcat(name, names_short[i]);\r
+               }\r
+               return name;\r
+       }\r
+}\r
+\r
+\r
+static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
+{\r
+       char *str, str24[24];\r
+\r
+       switch (entry->id)\r
+       {\r
+               case MA_OPT_RENDERER:\r
+                       if (currentConfig.PicoOpt&0x10)\r
+                               str = " 8bit fast";\r
+                       else if (currentConfig.EmuOpt&0x80)\r
+                               str = "16bit accurate";\r
+                       else\r
+                               str = " 8bit accurate";\r
+                       text_out16(x, y, "Renderer:            %s", str);\r
+                       break;\r
+               case MA_OPT_FRAMESKIP:\r
+                       if (currentConfig.Frameskip < 0)\r
+                            strcpy(str24, "Auto");\r
+                       else sprintf(str24, "%i", currentConfig.Frameskip);\r
+                       text_out16(x, y, "Frameskip                  %s", str24);\r
+                       break;\r
+               case MA_OPT_SOUND_QUALITY:\r
+                       str = (currentConfig.PicoOpt&0x08)?"stereo":"mono";\r
+                       text_out16(x, y, "Sound Quality:     %5iHz %s", currentConfig.PsndRate, str);\r
+                       break;\r
+               case MA_OPT_REGION:\r
+                       text_out16(x, y, "Region:              %s", region_name(currentConfig.PicoRegion));\r
+                       break;\r
+               case MA_OPT_CONFIRM_STATES:\r
+                       switch ((currentConfig.EmuOpt >> 9) & 5) {\r
+                               default: str = "OFF";    break;\r
+                               case 1:  str = "writes"; break;\r
+                               case 4:  str = "loads";  break;\r
+                               case 5:  str = "both";   break;\r
+                       }\r
+                       text_out16(x, y, "Confirm savestate          %s", str);\r
+                       break;\r
+               case MA_OPT_SAVECFG:\r
+                       str24[0] = 0;\r
+                       if (config_slot != 0) sprintf(str24, " (profile: %i)", config_slot);\r
+                       text_out16(x, y, "Save cfg as default%s", str24);\r
+                       break;\r
+               case MA_OPT_LOADCFG:\r
+                       text_out16(x, y, "Load cfg from profile %i", config_slot);\r
+                       break;\r
+               default:\r
+                       lprintf("%s: unimplemented (%i)\n", __FUNCTION__, entry->id);\r
+                       break;\r
+       }\r
+}\r
+\r
+\r
+\r
+static void draw_menu_options(int menu_sel)\r
+{\r
+       int tl_x = 25, tl_y = 24;\r
+\r
+       menu_draw_begin(1);\r
+\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);\r
+\r
+       me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+static int sndrate_prevnext(int rate, int dir)\r
+{\r
+       int i, rates[] = { 8000, 11025, 16000, 22050, 44100 };\r
+\r
+       for (i = 0; i < 5; i++)\r
+               if (rates[i] == rate) break;\r
+\r
+       i += dir ? 1 : -1;\r
+       if (i > 4) return dir ? 44100 : 22050;\r
+       if (i < 0) return dir ? 11025 : 8000;\r
+       return rates[i];\r
+}\r
+\r
+static void region_prevnext(int right)\r
+{\r
+       // jp_ntsc=1, jp_pal=2, usa=4, eu=8\r
+       static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
+       int i;\r
+       if (right) {\r
+               if (!currentConfig.PicoRegion) {\r
+                       for (i = 0; i < 6; i++)\r
+                               if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
+                       if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];\r
+                       else currentConfig.PicoRegion=1;\r
+               }\r
+               else currentConfig.PicoRegion<<=1;\r
+               if (currentConfig.PicoRegion > 8) currentConfig.PicoRegion = 8;\r
+       } else {\r
+               if (!currentConfig.PicoRegion) {\r
+                       for (i = 0; i < 6; i++)\r
+                               if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
+                       if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];\r
+               }\r
+               else currentConfig.PicoRegion>>=1;\r
+       }\r
+}\r
+\r
+static void menu_options_save(void)\r
+{\r
+       PicoOpt = currentConfig.PicoOpt;\r
+       PsndRate = currentConfig.PsndRate;\r
+       PicoRegionOverride = currentConfig.PicoRegion;\r
+       if (!(PicoOpt & 0x20)) {\r
+               // unbind XYZ MODE, just in case\r
+               unbind_action(0xf00);\r
+       }\r
+       scaling_update();\r
+}\r
+\r
+static int menu_loop_options(void)\r
+{\r
+       static int menu_sel = 0;\r
+       int menu_sel_max, ret;\r
+       unsigned long inp = 0;\r
+       menu_id selected_id;\r
+\r
+       currentConfig.PicoOpt = PicoOpt;\r
+       currentConfig.PsndRate = PsndRate;\r
+       currentConfig.PicoRegion = PicoRegionOverride;\r
+\r
+       me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_data != NULL);\r
+       me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
+       menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
+       if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
+\r
+       while (1)\r
+       {\r
+               draw_menu_options(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_PLAY|BTN_STOP|BTN_REW);\r
+               if (inp & BTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               selected_id = me_index2id(opt_entries, OPT_ENTRY_COUNT, menu_sel);\r
+               if (inp & (BTN_LEFT|BTN_RIGHT)) { // multi choise\r
+                       if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0)) {\r
+                               switch (selected_id) {\r
+                                       case MA_OPT_RENDERER:\r
+                                               if (inp & BTN_LEFT) {\r
+                                                       if      (  currentConfig.PicoOpt&0x10) currentConfig.PicoOpt&= ~0x10;\r
+                                                       else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |=  0x80;\r
+                                                       else if (  currentConfig.EmuOpt &0x80) break;\r
+                                               } else {\r
+                                                       if      (  currentConfig.PicoOpt&0x10) break;\r
+                                                       else if (!(currentConfig.EmuOpt &0x80))currentConfig.PicoOpt|=  0x10;\r
+                                                       else if (  currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
+                                               }\r
+                                               break;\r
+                                       case MA_OPT_SOUND_QUALITY:\r
+                                               if ((inp & BTN_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
+                                                       currentConfig.PsndRate = 8000;  currentConfig.PicoOpt|= 0x08;\r
+                                               } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {\r
+                                                       currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
+                                               } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT);\r
+                                               break;\r
+                                       case MA_OPT_REGION:\r
+                                               region_prevnext(inp & BTN_RIGHT);\r
+                                               break;\r
+                                       case MA_OPT_CONFIRM_STATES: {\r
+                                                        int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
+                                                        n += (inp & BTN_LEFT) ? -1 : 1;\r
+                                                        if (n < 0) n = 0; else if (n > 3) n = 3;\r
+                                                        n |= n << 1; n &= ~2;\r
+                                                        currentConfig.EmuOpt &= ~0xa00;\r
+                                                        currentConfig.EmuOpt |= n << 9;\r
+                                                        break;\r
+                                                }\r
+                                       case MA_OPT_SAVE_SLOT:\r
+                                                if (inp & BTN_RIGHT) {\r
+                                                        state_slot++; if (state_slot > 9) state_slot = 0;\r
+                                                } else {state_slot--; if (state_slot < 0) state_slot = 9;\r
+                                                }\r
+                                                break;\r
+                                       case MA_OPT_SAVECFG:\r
+                                       case MA_OPT_SAVECFG_GAME:\r
+                                       case MA_OPT_LOADCFG:\r
+                                                config_slot += (inp&BTN_RIGHT) ? 1 : -1;\r
+                                                if (config_slot > 9) config_slot = 0;\r
+                                                if (config_slot < 0) config_slot = 9;\r
+                                                me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
+                                                menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
+                                                if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
+                                                break;\r
+                                       default:\r
+                                               //lprintf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
+                                               break;\r
+                               }\r
+                       }\r
+               }\r
+               if (inp & BTN_PLAY) {\r
+                       if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1))\r
+                       {\r
+                               switch (selected_id)\r
+                               {\r
+                                       case MA_OPT_SCD_OPTS:\r
+                                               cd_menu_loop_options();\r
+                                               if (engineState == PGS_ReloadRom)\r
+                                                       return 0; // test BIOS\r
+                                               break;\r
+                                       case MA_OPT_ADV_OPTS:\r
+                                               amenu_loop_options();\r
+                                               break;\r
+                                       case MA_OPT_SAVECFG: // done (update and write)\r
+                                               menu_options_save();\r
+                                               if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
+                                               else strcpy(menuErrorMsg, "failed to write config");\r
+                                               return 1;\r
+                                       case MA_OPT_SAVECFG_GAME: // done (update and write for current game)\r
+                                               menu_options_save();\r
+                                               if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
+                                               else strcpy(menuErrorMsg, "failed to write config");\r
+                                               return 1;\r
+                                       case MA_OPT_LOADCFG:\r
+                                               ret = emu_ReadConfig(1, 1);\r
+                                               if (!ret) ret = emu_ReadConfig(0, 1);\r
+                                               if (ret)  strcpy(menuErrorMsg, "config loaded");\r
+                                               else      strcpy(menuErrorMsg, "failed to load config");\r
+                                               return 1;\r
+                                       default:\r
+                                               //lprintf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
+                                               break;\r
+                               }\r
+                       }\r
+               }\r
+               if(inp & (BTN_STOP|BTN_REW)) {\r
+                       menu_options_save();\r
+                       return 0;  // done (update, no write)\r
+               }\r
+       }\r
+}\r
+\r
+// -------------- credits --------------\r
+\r
+static void draw_menu_credits(void)\r
+{\r
+       int tl_x = 15, tl_y = 64, y;\r
+       menu_draw_begin(1);\r
+\r
+       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
+       y = tl_y;\r
+       text_out16(tl_x, y, "Credits:");\r
+       text_out16(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r
+       text_out16(tl_x, (y+=10), "      base code of PicoDrive");\r
+       text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
+       text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
+       text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");\r
+       text_out16(tl_x, (y+=10), "Stephane Dallongeville:");\r
+       text_out16(tl_x, (y+=10), "      opensource Gens");\r
+       text_out16(tl_x, (y+=10), "Haze: Genesis hw info");\r
+       text_out16(tl_x, (y+=10), "Reesy: TODO");\r
+       text_out16(tl_x, (y+=10), "TODO: gizmondo hardware");\r
+       text_out16(tl_x, (y+=10), "ketchupgun: skin design");\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+// -------------- root menu --------------\r
+\r
+menu_entry main_entries[] =\r
+{\r
+       { "Resume game",        MB_NONE, MA_MAIN_RESUME_GAME, NULL, 0, 0, 0, 0 },\r
+       { "Save State",         MB_NONE, MA_MAIN_SAVE_STATE,  NULL, 0, 0, 0, 0 },\r
+       { "Load State",         MB_NONE, MA_MAIN_LOAD_STATE,  NULL, 0, 0, 0, 0 },\r
+       { "Reset game",         MB_NONE, MA_MAIN_RESET_GAME,  NULL, 0, 0, 0, 0 },\r
+       { "Load new ROM/ISO",   MB_NONE, MA_MAIN_LOAD_ROM,    NULL, 0, 0, 0, 1 },\r
+       { "Change options",     MB_NONE, MA_MAIN_OPTIONS,     NULL, 0, 0, 0, 1 },\r
+       { "Configure controls", MB_NONE, MA_MAIN_CONTROLS,    NULL, 0, 0, 0, 1 },\r
+       { "Credits",            MB_NONE, MA_MAIN_CREDITS,     NULL, 0, 0, 0, 1 },\r
+       { "Patches / GameGenie",MB_NONE, MA_MAIN_PATCHES,     NULL, 0, 0, 0, 0 },\r
+       { "Exit",               MB_NONE, MA_MAIN_EXIT,        NULL, 0, 0, 0, 1 }\r
+};\r
+\r
+#define MAIN_ENTRY_COUNT (sizeof(main_entries) / sizeof(main_entries[0]))\r
+\r
+static void draw_menu_root(int menu_sel)\r
+{\r
+       const int tl_x = 70, tl_y = 70;\r
+\r
+       menu_draw_begin(1);\r
+\r
+       text_out16(tl_x, 20, "PicoDrive v" VERSION);\r
+\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);\r
+\r
+       me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);\r
+\r
+       // error\r
+       if (menuErrorMsg[0]) {\r
+               memset((char *)giz_screen + 321*224*2, 0, 321*16*2);\r
+               text_out16(5, 226, menuErrorMsg);\r
+       }\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+static void menu_loop_root(void)\r
+{\r
+       static int menu_sel = 0;\r
+       int ret, menu_sel_max;\r
+       unsigned long inp = 0;\r
+\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_data != NULL);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE,  rom_data != NULL);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_LOAD_STATE,  rom_data != NULL);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESET_GAME,  rom_data != NULL);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_PATCHES,     PicoPatches != NULL);\r
+\r
+       menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1;\r
+       if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
+\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_menu_root(menu_sel);\r
+       while (Framework_PollGetButtons(1) & (BTN_PLAY|BTN_STOP|BTN_HOME)) Sleep(50);\r
+\r
+       for (;;)\r
+       {\r
+               draw_menu_root(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_PLAY|BTN_STOP|BTN_HOME|BTN_L|BTN_R);\r
+               if(inp & BTN_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if(inp & BTN_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               if(inp &(BTN_HOME|BTN_STOP)){\r
+                       if (rom_data) {\r
+                               while (Framework_PollGetButtons(1) & (BTN_HOME|BTN_STOP)) Sleep(50); // wait until select is released\r
+                               engineState = PGS_Running;\r
+                               break;\r
+                       }\r
+               }\r
+               if(inp & BTN_PLAY)  {\r
+                       switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))\r
+                       {\r
+                               case MA_MAIN_RESUME_GAME:\r
+                                       if (rom_data) {\r
+                                               while (Framework_PollGetButtons(1) & BTN_PLAY) Sleep(50);\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_MAIN_SAVE_STATE:\r
+                                       if (rom_data) {\r
+                                               if(savestate_menu_loop(0))\r
+                                                       continue;\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_MAIN_LOAD_STATE:\r
+                                       if (rom_data) {\r
+                                               if(savestate_menu_loop(1))\r
+                                                       continue;\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_MAIN_RESET_GAME:\r
+                                       if (rom_data) {\r
+                                               emu_ResetGame();\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case MA_MAIN_LOAD_ROM:\r
+                               {\r
+                                       char curr_path[MAX_PATH], *selfname;\r
+                                       FILE *tstf;\r
+                                       if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r
+                                       {\r
+                                               fclose(tstf);\r
+                                               strcpy(curr_path, currentConfig.lastRomFile);\r
+                                       }\r
+                                       else\r
+                                               getcwd(curr_path, MAX_PATH);\r
+                                       selfname = romsel_loop(curr_path);\r
+                                       if (selfname) {\r
+                                               lprintf("selected file: %s\n", selfname);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               }\r
+                               case MA_MAIN_OPTIONS:\r
+                                       ret = menu_loop_options();\r
+                                       if (ret == 1) continue; // status update\r
+                                       if (engineState == PGS_ReloadRom)\r
+                                               return; // BIOS test\r
+                                       break;\r
+                               case MA_MAIN_CONTROLS:\r
+                                       kc_sel_loop();\r
+                                       break;\r
+                               case MA_MAIN_CREDITS:\r
+                                       draw_menu_credits();\r
+                                       Sleep(500);\r
+                                       inp = wait_for_input(BTN_PLAY|BTN_STOP);\r
+                                       break;\r
+                               case MA_MAIN_EXIT:\r
+                                       engineState = PGS_Quit;\r
+                                       return;\r
+                               case MA_MAIN_PATCHES:\r
+                                       if (rom_data && PicoPatches) {\r
+                                               patches_menu_loop();\r
+                                               PicoPatchApply();\r
+                                               strcpy(menuErrorMsg, "Patches applied");\r
+                                               continue;\r
+                                       }\r
+                                       break;\r
+                               default:\r
+                                       lprintf("%s: something unknown selected\n", __FUNCTION__);\r
+                                       break;\r
+                       }\r
+               }\r
+               menuErrorMsg[0] = 0; // clear error msg\r
+       }\r
+}\r
+\r
+// warning: alignment\r
+static void menu_darken_bg(void *dst, const void *src, int pixels, int darker)\r
+{\r
+       unsigned int *dest = dst;\r
+       const unsigned int *srce = src;\r
+       pixels /= 2;\r
+       if (darker)\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *srce++;\r
+                       *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *srce++;\r
+                       *dest++ = (p&0xf79ef79e)>>1;\r
+               }\r
+       }\r
+}\r
+\r
+static void menu_prepare_bg(int use_game_bg)\r
+{\r
+       if (use_game_bg)\r
+       {\r
+               // darken the active framebuffer\r
+               memset(bg_buffer, 0, 321*8*2);\r
+               menu_darken_bg(bg_buffer + 321*8*2, (char *)giz_screen + 321*8*2, 321*224, 1);\r
+               memset(bg_buffer + 321*232*2, 0, 321*8*2);\r
+       }\r
+       else\r
+       {\r
+               // should really only happen once, on startup..\r
+               readpng(bg_buffer, "skin/background.png", READPNG_BG);\r
+       }\r
+}\r
+\r
+static void menu_gfx_prepare(void)\r
+{\r
+       menu_prepare_bg(rom_data != NULL);\r
+\r
+       menu_draw_begin(1);\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+void menu_loop(void)\r
+{\r
+       menu_gfx_prepare();\r
+\r
+       menu_loop_root();\r
+\r
+       menuErrorMsg[0] = 0;\r
+}\r
+\r
+\r
+// --------- CD tray close menu ----------\r
+\r
+static void draw_menu_tray(int menu_sel)\r
+{\r
+       int tl_x = 70, tl_y = 90, y;\r
+\r
+       menu_draw_begin(1);\r
+\r
+       text_out16(tl_x, 20, "The unit is about to");\r
+       text_out16(tl_x, 30, "close the CD tray.");\r
+\r
+       y = tl_y;\r
+       text_out16(tl_x, y,       "Load new CD image");\r
+       text_out16(tl_x, (y+=10), "Insert nothing");\r
+\r
+       // draw cursor\r
+       text_out16(tl_x - 16, tl_y + menu_sel*10, ">");\r
+       // error\r
+       if (menuErrorMsg[0]) text_out16(5, 226, menuErrorMsg);\r
+       menu_draw_end();\r
+}\r
+\r
+\r
+int menu_loop_tray(void)\r
+{\r
+       int menu_sel = 0, menu_sel_max = 1;\r
+       unsigned long inp = 0;\r
+       char curr_path[MAX_PATH], *selfname;\r
+       FILE *tstf;\r
+\r
+       menu_gfx_prepare();\r
+\r
+       if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r
+       {\r
+               fclose(tstf);\r
+               strcpy(curr_path, currentConfig.lastRomFile);\r
+       }\r
+       else\r
+       {\r
+               getcwd(curr_path, MAX_PATH);\r
+       }\r
+\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_menu_tray(menu_sel);\r
+       while (Framework_PollGetButtons(1) & BTN_PLAY) Sleep(50);\r
+\r
+       for (;;)\r
+       {\r
+               draw_menu_tray(menu_sel);\r
+               inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_PLAY);\r
+               if(inp & BTN_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if(inp & BTN_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               if(inp & BTN_PLAY   )  {\r
+                       switch (menu_sel) {\r
+                               case 0: // select image\r
+                                       selfname = romsel_loop(curr_path);\r
+                                       if (selfname) {\r
+                                               int ret = -1, cd_type;\r
+                                               cd_type = emu_cd_check(NULL);\r
+                                               if (cd_type > 0)\r
+                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (ret != 0) {\r
+                                                       sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
+                                                       lprintf("%s\n", menuErrorMsg);\r
+                                                       continue;\r
+                                               }\r
+                                               engineState = PGS_RestartRun;\r
+                                               return 1;\r
+                                       }\r
+                                       break;\r
+                               case 1: // insert nothing\r
+                                       engineState = PGS_RestartRun;\r
+                                       return 0;\r
+                       }\r
+               }\r
+               menuErrorMsg[0] = 0; // clear error msg\r
+       }\r
+}\r
+\r
+\r

diff --git a/platform/gizmondo/menu.h b/platform/gizmondo/menu.h
new file mode 100644 (file)
index 0000000..ae1bccd
--- /dev/null
+++ b/platform/gizmondo/menu.h
@@ -0,0 +1,19 @@
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
+// Free for non-commercial use.\r
+\r
+// For commercial use, separate licencing terms must be obtained.\r
+\r
+extern char menuErrorMsg[40];\r
+\r
+void menu_init(void);\r
+void text_out16(int x, int y, const char *texto, ...);\r
+void menu_loop(void);\r
+int  menu_loop_tray(void);\r
+void menu_romload_prepare(const char *rom_name);\r
+void menu_romload_end(void);\r
+\r
+// TODO: add more?\r
+#define CONFIGURABLE_KEYS \\r
+       (BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_STOP|BTN_PLAY|BTN_FWD|BTN_REW| \\r
+               BTN_L|BTN_R)\r
+\r

diff --git a/platform/gizmondo/mp3.c b/platform/gizmondo/mp3.c
new file mode 100644 (file)
index 0000000..086257c
--- /dev/null
+++ b/platform/gizmondo/mp3.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int  mp3_get_bitrate(FILE *f, int size){}
+void mp3_start_play(FILE *f, int pos){}
+int  mp3_get_offset(void){} // 0-1023
+void mp3_update(int *buffer, int length, int stereo){}
+
+

diff --git a/platform/gizmondo/port_config.h b/platform/gizmondo/port_config.h
new file mode 100644 (file)
index 0000000..a6a15af
--- /dev/null
+++ b/platform/gizmondo/port_config.h
@@ -0,0 +1,18 @@
+// port specific settings\r
+\r
+#ifndef PORT_CONFIG_H\r
+#define PORT_CONFIG_H\r
+\r
+#define CPU_CALL\r
+\r
+// draw2.c\r
+#define START_ROW  0 // which row of tiles to start rendering at?\r
+#define END_ROW   28 // ..end\r
+\r
+// pico.c\r
+#define CAN_HANDLE_240_LINES   1\r
+\r
+//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
+#define dprintf(x...)\r
+\r
+#endif //PORT_CONFIG_H\r

diff --git a/platform/gizmondo/port_config.s b/platform/gizmondo/port_config.s
new file mode 100644 (file)
index 0000000..89c44d9
--- /dev/null
+++ b/platform/gizmondo/port_config.s
@@ -0,0 +1,10 @@
+@ vim:filetype=armasm\r
+\r
+@ .equiv START_ROW,    1\r
+@ .equiv END_ROW,              27\r
+@ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
+.equiv START_ROW,              0\r
+.equiv END_ROW,                28\r
+\r
+@ this should be set to one only for GP2X port\r
+.equiv EXTERNAL_YM2612, 0\r

diff --git a/platform/gizmondo/version.h b/platform/gizmondo/version.h
new file mode 100644 (file)
index 0000000..a3ccbd3
--- /dev/null
+++ b/platform/gizmondo/version.h
@@ -0,0 +1,2 @@
+#define VERSION "1.33"\r
+\r

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 66a5d2b..075b827 100644 (file)
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -14,8 +14,9 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
 #include "mp3.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/menu.h"\r
 #include "../../Pico/PicoInt.h"\r
 #include "../../Pico/sound/mix.h"\r
 \r

diff --git a/platform/gp2x/Makefile b/platform/gp2x/Makefile
index 0eee0eb..5b8b039 100644 (file)
--- a/platform/gp2x/Makefile
+++ b/platform/gp2x/Makefile
@@ -48,10 +48,13 @@ LD = $(CROSS)ld
 OBJCOPY = $(CROSS)objcopy\r
 \r
 # frontend\r
-OBJS += main.o menu.o fonts.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o readpng.o\r
+OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o\r
 # 940 core control\r
 OBJS += 940ctl.o\r
 \r
+# common\r
+OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+\r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
 OBJS += ../../PicoAll.o\r
@@ -148,7 +151,7 @@ up: PicoDrive.gpe
 #      @cmd //C copy PicoDrive.gpe \\\\10.0.1.2\\gp2x\\mnt\\sd\\games\\PicoDrive\\\r
 \r
 \r
-testrefr.gpe : test.o gp2x.o asmutils.o\r
+testrefr.gpe : test.o gp2x.o\r
        @echo $@\r
        @$(GCC) $(COPT) $^ -o $@\r
        @$(STRIP) $@\r

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index a9a931a..adb10a3 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -18,9 +18,9 @@
 #include "gp2x.h"\r
 #include "usbjoy.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/fonts.h"\r
 #include "cpuctrl.h"\r
-#include "fonts.h"\r
 \r
 #include <Pico/PicoInt.h>\r
 #include <Pico/Patch.h>\r
@@ -52,7 +52,7 @@ static int combo_keys = 0, combo_acts = 0;    // keys and actions which need button
 static int gp2x_old_gamma = 100;\r
 static unsigned char *movie_data = NULL;\r
 static int movie_size = 0;\r
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer\r
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
 int state_slot = 0;\r
 int reset_timing = 0;\r
 int config_slot = 0, config_slot_current = 0;\r
@@ -389,10 +389,10 @@ static void emu_msg_tray_open(void);
 void emu_Init(void)\r
 {\r
        // make temp buffer for alt renderer\r
-       framebuff = malloc((8+320)*(8+240+8));\r
-       if (!framebuff)\r
+       PicoDraw2FB = malloc((8+320)*(8+240+8));\r
+       if (!PicoDraw2FB)\r
        {\r
-               printf("framebuff == 0\n");\r
+               printf("PicoDraw2FB == 0\n");\r
        }\r
 \r
        // make dirs for saves, cfgs, etc.\r
@@ -626,7 +626,7 @@ void emu_Deinit(void)
                }\r
        }\r
 \r
-       free(framebuff);\r
+       free(PicoDraw2FB);\r
 \r
        PicoExit();\r
 \r
@@ -768,7 +768,7 @@ static void blit(const char *fps, const char *notice)
                        // feed new palette to our device\r
                        gp2x_video_setpalette(localPal, 0x40);\r
                }\r
-               vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+               vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        } else if (!(emu_opt&0x80)) {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal) {\r
@@ -1112,7 +1112,7 @@ void emu_forced_frame(void)
                clearArea(1);\r
        } else  vidCpyM2 = vidCpyM2_40col;\r
 \r
-       vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+       vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
        gp2x_video_setpalette(localPal, 0x40);\r
 */\r

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index 3b5d125..4995f08 100644 (file)
--- a/platform/gp2x/gp2x.c
+++ b/platform/gp2x/gp2x.c
@@ -34,7 +34,7 @@
 \r
 #include "gp2x.h"\r
 #include "usbjoy.h"\r
-#include "asmutils.h"\r
+#include "../common/arm_utils.h"\r
 \r
 volatile unsigned short *gp2x_memregs;\r
 //static\r

diff --git a/platform/gp2x/main.c b/platform/gp2x/main.c
index e4e3bcf..13eb5a8 100644 (file)
--- a/platform/gp2x/main.c
+++ b/platform/gp2x/main.c
@@ -11,6 +11,7 @@
 \r
 #include "gp2x.h"\r
 #include "menu.h"\r
+#include "../common/menu.h"\r
 #include "emu.h"\r
 #include "940ctl.h"\r
 #include "version.h"\r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 71ddf68..a8d1f9e 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -13,10 +13,10 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "fonts.h"\r
 #include "usbjoy.h"\r
-#include "asmutils.h"\r
-#include "readpng.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/menu.h"\r
+#include "../common/readpng.h"\r
 #include "version.h"\r
 \r
 #include <Pico/PicoInt.h>\r
@@ -33,389 +33,18 @@ extern int  mmuhack_status;
 extern int  state_slot;\r
 extern int  config_slot, config_slot_current;\r
 \r
-static unsigned char menu_font_data[10240];\r
-static char *gp2xKeyNames[] = {\r
+static const char *gp2xKeyNames[] = {\r
        "UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",\r
        "START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",\r
        "???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",\r
        "???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"\r
 };\r
-static int menu_text_color = 0xffff; // default to white\r
-static int menu_sel_color = -1; // disabled\r
 \r
 char menuErrorMsg[40] = {0, };\r
 \r
 static void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
-// draws text to current bbp16 screen\r
-static void text_out16_(int x, int y, const char *text, int color)\r
-{\r
-       int i, l, u, tr, tg, tb, len;\r
-       unsigned short *dest = (unsigned short *)gp2x_screen + x + y*320;\r
-       tr = (color & 0xf800) >> 8;\r
-       tg = (color & 0x07e0) >> 3;\r
-       tb = (color & 0x001f) << 3;\r
-\r
-       if (text == (void *)1)\r
-       {\r
-               // selector symbol\r
-               text = "";\r
-               len = 1;\r
-       }\r
-       else\r
-               len = strlen(text);\r
-\r
-       for (i = 0; i < len; i++)\r
-       {\r
-               unsigned char  *src = menu_font_data + (unsigned int)text[i]*4*10;\r
-               unsigned short *dst = dest;\r
-               for (l = 0; l < 10; l++, dst += 320-8)\r
-               {\r
-                       for (u = 8/2; u > 0; u--, src++)\r
-                       {\r
-                               int c, r, g, b;\r
-                               c = *src >> 4;\r
-                               r = (*dst & 0xf800) >> 8;\r
-                               g = (*dst & 0x07e0) >> 3;\r
-                               b = (*dst & 0x001f) << 3;\r
-                               r = (c^0xf)*r/15 + c*tr/15;\r
-                               g = (c^0xf)*g/15 + c*tg/15;\r
-                               b = (c^0xf)*b/15 + c*tb/15;\r
-                               *dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
-                               c = *src & 0xf;\r
-                               r = (*dst & 0xf800) >> 8;\r
-                               g = (*dst & 0x07e0) >> 3;\r
-                               b = (*dst & 0x001f) << 3;\r
-                               r = (c^0xf)*r/15 + c*tr/15;\r
-                               g = (c^0xf)*g/15 + c*tg/15;\r
-                               b = (c^0xf)*b/15 + c*tb/15;\r
-                               *dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
-                       }\r
-               }\r
-               dest += 8;\r
-       }\r
-}\r
-\r
-void text_out16(int x, int y, const char *texto, ...)\r
-{\r
-       va_list args;\r
-       char    buffer[512];\r
-\r
-       va_start(args,texto);\r
-       vsprintf(buffer,texto,args);\r
-       va_end(args);\r
-\r
-       text_out16_(x,y,buffer,menu_text_color);\r
-}\r
-\r
-\r
-static void smalltext_out16(int x, int y, const char *texto, int color)\r
-{\r
-       int i;\r
-       unsigned char  *src;\r
-       unsigned short *dst;\r
-\r
-       for (i = 0;; i++, x += 6)\r
-       {\r
-               unsigned char c = (unsigned char) texto[i];\r
-               int h = 8;\r
-\r
-               if (!c) break;\r
-\r
-               src = fontdata6x8[c];\r
-               dst = (unsigned short *)gp2x_screen + x + y*320;\r
-\r
-               while (h--)\r
-               {\r
-                       int w = 0x20;\r
-                       while (w)\r
-                       {\r
-                               if( *src & w ) *dst = color;\r
-                               dst++;\r
-                               w>>=1;\r
-                       }\r
-                       src++;\r
-\r
-                       dst += 320-6;\r
-               }\r
-       }\r
-}\r
-\r
-static void smalltext_out16_lim(int x, int y, const char *texto, int color, int max)\r
-{\r
-       char    buffer[320/6+1];\r
-\r
-       strncpy(buffer, texto, 320/6);\r
-       if (max > 320/6) max = 320/6;\r
-       if (max < 0) max = 0;\r
-       buffer[max] = 0;\r
-\r
-       smalltext_out16(x, y, buffer, color);\r
-}\r
-\r
-static void draw_selection(int x, int y, int w)\r
-{\r
-       int i, h;\r
-       unsigned short *dst, *dest;\r
-\r
-       text_out16_(x, y, (void *)1, (menu_sel_color < 0) ? menu_text_color : menu_sel_color);\r
-\r
-       if (menu_sel_color < 0) return; // no selection hilight\r
-\r
-       if (y > 0) y--;\r
-       dest = (unsigned short *)gp2x_screen + x + y*320 + 14;\r
-       for (h = 11; h > 0; h--)\r
-       {\r
-               dst = dest;\r
-               for (i = w; i > 0; i--)\r
-                       *dst++ = menu_sel_color;\r
-               dest += 320;\r
-       }\r
-}\r
-\r
-static void menu_flip(void)\r
-{\r
-       gp2x_video_flush_cache();\r
-       gp2x_video_flip2();\r
-}\r
-\r
-\r
-typedef enum\r
-{\r
-       MB_NONE = 1,            /* no auto processing */\r
-       MB_ONOFF,               /* ON/OFF setting */\r
-       MB_RANGE,               /* [min-max] setting */\r
-} menu_behavior;\r
-\r
-typedef enum\r
-{\r
-       MA_NONE = 1,\r
-       MA_MAIN_RESUME_GAME,\r
-       MA_MAIN_SAVE_STATE,\r
-       MA_MAIN_LOAD_STATE,\r
-       MA_MAIN_RESET_GAME,\r
-       MA_MAIN_LOAD_ROM,\r
-       MA_MAIN_OPTIONS,\r
-       MA_MAIN_CONTROLS,\r
-       MA_MAIN_CREDITS,\r
-       MA_MAIN_PATCHES,\r
-       MA_MAIN_EXIT,\r
-       MA_OPT_RENDERER,\r
-       MA_OPT_SCALING,\r
-       MA_OPT_ACC_TIMING,\r
-       MA_OPT_ACC_SPRITES,\r
-       MA_OPT_SHOW_FPS,\r
-       MA_OPT_FRAMESKIP,\r
-       MA_OPT_ENABLE_SOUND,\r
-       MA_OPT_SOUND_QUALITY,\r
-       MA_OPT_ARM940_SOUND,\r
-       MA_OPT_6BUTTON_PAD,\r
-       MA_OPT_REGION,\r
-       MA_OPT_SRAM_STATES,\r
-       MA_OPT_CONFIRM_STATES,\r
-       MA_OPT_SAVE_SLOT,\r
-       MA_OPT_CPU_CLOCKS,\r
-       MA_OPT_SCD_OPTS,\r
-       MA_OPT_ADV_OPTS,\r
-       MA_OPT_SAVECFG,\r
-       MA_OPT_SAVECFG_GAME,\r
-       MA_OPT_LOADCFG,\r
-       MA_OPT2_GAMMA,\r
-       MA_OPT2_A_SN_GAMMA,\r
-       MA_OPT2_VSYNC,\r
-       MA_OPT2_ENABLE_Z80,\r
-       MA_OPT2_ENABLE_YM2612,\r
-       MA_OPT2_ENABLE_SN76496,\r
-       MA_OPT2_GZIP_STATES,\r
-       MA_OPT2_NO_LAST_ROM,\r
-       MA_OPT2_RAMTIMINGS,\r
-       MA_OPT2_SQUIDGEHACK,\r
-       MA_OPT2_DONE,\r
-       MA_CDOPT_TESTBIOS_USA,\r
-       MA_CDOPT_TESTBIOS_EUR,\r
-       MA_CDOPT_TESTBIOS_JAP,\r
-       MA_CDOPT_LEDS,\r
-       MA_CDOPT_CDDA,\r
-       MA_CDOPT_PCM,\r
-       MA_CDOPT_READAHEAD,\r
-       MA_CDOPT_SAVERAM,\r
-       MA_CDOPT_SCALEROT_CHIP,\r
-       MA_CDOPT_BETTER_SYNC,\r
-       MA_CDOPT_DONE,\r
-} menu_id;\r
-\r
-typedef struct\r
-{\r
-       char *name;\r
-       menu_behavior beh;\r
-       menu_id id;\r
-       void *var;              /* for on-off settings */\r
-       int mask;\r
-       signed char min;        /* for ranged integer settings, to be sign-extended */\r
-       signed char max;\r
-       char enabled;\r
-} menu_entry;\r
-\r
-static int me_id2offset(const menu_entry *entries, int count, menu_id id)\r
-{\r
-       int i;\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               if (entries[i].id == id) return i;\r
-       }\r
-\r
-       printf("%s: id %i not found\n", __FUNCTION__, id);\r
-       return 0;\r
-}\r
-\r
-static void me_enable(menu_entry *entries, int count, menu_id id, int enable)\r
-{\r
-       int i = me_id2offset(entries, count, id);\r
-       entries[i].enabled = enable;\r
-}\r
-\r
-static int me_count_enabled(const menu_entry *entries, int count)\r
-{\r
-       int i, ret = 0;\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               if (entries[i].enabled) ret++;\r
-       }\r
-\r
-       return ret;\r
-}\r
-\r
-static menu_id me_index2id(const menu_entry *entries, int count, int index)\r
-{\r
-       int i;\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               if (entries[i].enabled)\r
-               {\r
-                       if (index == 0) break;\r
-                       index--;\r
-               }\r
-       }\r
-       if (i >= count) i = count - 1;\r
-       return entries[i].id;\r
-}\r
-\r
-typedef void (me_draw_custom_f)(const menu_entry *entry, int x, int y, void *param);\r
-\r
-static void me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param)\r
-{\r
-       int i, y1 = y;\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               if (!entries[i].enabled) continue;\r
-               if (entries[i].name == NULL)\r
-               {\r
-                       if (cust_draw != NULL)\r
-                               cust_draw(&entries[i], x, y1, param);\r
-                       y1 += 10;\r
-                       continue;\r
-               }\r
-               text_out16(x, y1, entries[i].name);\r
-               if (entries[i].beh == MB_ONOFF)\r
-                       text_out16(x + 27*8, y1, (*(int *)entries[i].var & entries[i].mask) ? "ON" : "OFF");\r
-               else if (entries[i].beh == MB_RANGE)\r
-                       text_out16(x + 27*8, y1, "%i", *(int *)entries[i].var);\r
-               y1 += 10;\r
-       }\r
-}\r
-\r
-static int me_process(menu_entry *entries, int count, menu_id id, int is_next)\r
-{\r
-       int i = me_id2offset(entries, count, id);\r
-       menu_entry *entry = &entries[i];\r
-       switch (entry->beh)\r
-       {\r
-               case MB_ONOFF:\r
-                       *(int *)entry->var ^= entry->mask;\r
-                       return 1;\r
-               case MB_RANGE:\r
-                       *(int *)entry->var += is_next ? 1 : -1;\r
-                       if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->min;\r
-                       if (*(int *)entry->var > (int)entry->max) *(int *)entry->var = (int)entry->max;\r
-                       return 1;\r
-               default:\r
-                       return 0;\r
-       }\r
-}\r
-\r
-\r
-static int parse_hex_color(char *buff)\r
-{\r
-       char *endp = buff;\r
-       int t = (int) strtoul(buff, &endp, 16);\r
-       if (endp != buff) return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);\r
-       return -1;\r
-}\r
-\r
-void menu_init(void)\r
-{\r
-       int c, l;\r
-       unsigned char *fd = menu_font_data;\r
-       char buff[256];\r
-       FILE *f;\r
-\r
-       // generate default font from fontdata8x8\r
-       memset(menu_font_data, 0, sizeof(menu_font_data));\r
-       for (c = 0; c < 256; c++)\r
-       {\r
-               for (l = 0; l < 8; l++)\r
-               {\r
-                       unsigned char fd8x8 = fontdata8x8[c*8+l];\r
-                       if (fd8x8&0x80) *fd |= 0xf0;\r
-                       if (fd8x8&0x40) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x20) *fd |= 0xf0;\r
-                       if (fd8x8&0x10) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x08) *fd |= 0xf0;\r
-                       if (fd8x8&0x04) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x02) *fd |= 0xf0;\r
-                       if (fd8x8&0x01) *fd |= 0x0f; fd++;\r
-               }\r
-               fd += 8*2/2; // 2 empty lines\r
-       }\r
-\r
-       // load custom font and selector (stored as 1st symbol in font table)\r
-       readpng(menu_font_data, "skin/font.png", READPNG_FONT);\r
-       memcpy(menu_font_data, menu_font_data + ((int)'>')*4*10, 4*10); // default selector symbol is '>'\r
-       readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
-\r
-       // load custom colors\r
-       f = fopen("skin/skin.txt", "r");\r
-       if (f != NULL)\r
-       {\r
-               printf("found skin.txt\n");\r
-               while (!feof(f))\r
-               {\r
-                       fgets(buff, sizeof(buff), f);\r
-                       if (buff[0] == '#'  || buff[0] == '/')  continue; // comment\r
-                       if (buff[0] == '\r' || buff[0] == '\n') continue; // empty line\r
-                       if (strncmp(buff, "text_color=", 11) == 0)\r
-                       {\r
-                               int tmp = parse_hex_color(buff+11);\r
-                               if (tmp >= 0) menu_text_color = tmp;\r
-                               else printf("skin.txt: parse error for text_color\n");\r
-                       }\r
-                       else if (strncmp(buff, "selection_color=", 16) == 0)\r
-                       {\r
-                               int tmp = parse_hex_color(buff+16);\r
-                               if (tmp >= 0) menu_sel_color = tmp;\r
-                               else printf("skin.txt: parse error for selection_color\n");\r
-                       }\r
-                       else\r
-                               printf("skin.txt: parse error: %s\n", buff);\r
-               }\r
-               fclose(f);\r
-       }\r
-}\r
-\r
 static unsigned long inp_prev = 0;\r
 static int inp_prevjoy = 0;\r
 \r
@@ -500,6 +129,11 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        return ret;\r
 }\r
 \r
+static void menu_flip(void)\r
+{\r
+       gp2x_video_flush_cache();\r
+       gp2x_video_flip2();\r
+}\r
 \r
 \r
 // --------- loading ROM screen ----------\r
@@ -887,7 +521,7 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
 \r
        text_out16(tl_x, 30, is_loading ? "Load state" : "Save state");\r
 \r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);\r
 \r
        /* draw all 10 slots */\r
        y = tl_y;\r
@@ -1029,7 +663,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
                x = 40;\r
        }\r
 \r
-       draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);\r
+       menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);\r
 \r
        y = tl_y;\r
        for (i = 0; i < opt_cnt; i++, y+=10)\r
@@ -1110,7 +744,7 @@ static void draw_kc_sel(int menu_sel)
 \r
        y = tl_y;\r
        gp2x_pd_clone_buffer2();\r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
 \r
        text_out16(tl_x, y,       "Player 1");\r
        text_out16(tl_x, (y+=10), "Player 2");\r
@@ -1246,7 +880,7 @@ static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)
 \r
        gp2x_pd_clone_buffer2();\r
 \r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);\r
 \r
        me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
 \r
@@ -1347,7 +981,7 @@ menu_entry opt2_entries[] =
 {\r
        { NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1 },\r
        { "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1 },\r
-       { "Perfecf vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1 },\r
+       { "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1 },\r
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &currentConfig.PicoOpt,0x0004, 0, 0, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &currentConfig.PicoOpt,0x0001, 0, 0, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&currentConfig.PicoOpt,0x0002, 0, 0, 1 },\r
@@ -1377,7 +1011,7 @@ static void draw_amenu_options(int menu_sel)
 \r
        gp2x_pd_clone_buffer2();\r
 \r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);\r
 \r
        me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, menu_opt2_cust_draw, NULL);\r
 \r
@@ -1546,7 +1180,7 @@ static void draw_menu_options(int menu_sel)
 \r
        gp2x_pd_clone_buffer2();\r
 \r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);\r
 \r
        me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);\r
 \r
@@ -1785,7 +1419,7 @@ static void draw_menu_root(int menu_sel)
 \r
        text_out16(tl_x, 20, "PicoDrive v" VERSION);\r
 \r
-       draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);\r
+       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);\r
 \r
        me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);\r
 \r
@@ -2008,7 +1642,7 @@ int menu_loop_tray(void)
        char curr_path[PATH_MAX], *selfname;\r
        FILE *tstf;\r
 \r
-       gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+       gp2x_memset_all_buffers(0, 0, 320*240*2);\r
        menu_gfx_prepare();\r
 \r
        if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r

diff --git a/platform/gp2x/menu.h b/platform/gp2x/menu.h
index 62ec051..bd216a4 100644 (file)
--- a/platform/gp2x/menu.h
+++ b/platform/gp2x/menu.h
@@ -5,8 +5,6 @@
 \r
 extern char menuErrorMsg[40];\r
 \r
-void menu_init(void);\r
-void text_out16(int x, int y, const char *texto, ...);\r
 void menu_loop(void);\r
 int  menu_loop_tray(void);\r
 void menu_romload_prepare(const char *rom_name);\r

diff --git a/platform/linux/Makefile b/platform/linux/Makefile
index a85ef43..3380ae9 100644 (file)
--- a/platform/linux/Makefile
+++ b/platform/linux/Makefile
@@ -24,8 +24,12 @@ COPT    += `pkg-config --cflags gthread-2.0`
 LDFLAGS += `pkg-config --libs gthread-2.0`
 
 # frontend
-OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/fonts.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o \
-               gp2x.o 940ctl_ym2612.o ../gp2x/readpng.o
+OBJS += ../gp2x/main.o ../gp2x/menu.o ../gp2x/emu.o ../gp2x/usbjoy.o blit.o \
+               gp2x.o 940ctl_ym2612.o
+
+# common
+OBJS += ../common/menu.o ../common/fonts.o ../common/readpng.o
+
 # Pico
 OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Memory.o ../../Pico/Misc.o \
                ../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o \