debug menu unified, more debug tools

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

diff --git a/common/common.h b/common/common.h
new file mode 100644 (file)
index 0000000..9653db1
--- /dev/null
+++ b/common/common.h
@@ -0,0 +1,75 @@
+// platform specific things for common menu code
+
+#ifdef __GP2X__
+#include "../gp2x/gp2x.h"
+
+#define BTN_UP    GP2X_UP
+#define BTN_DOWN  GP2X_DOWN
+#define BTN_LEFT  GP2X_LEFT
+#define BTN_RIGHT GP2X_RIGHT
+
+#define BTN_NORTH GP2X_Y
+#define BTN_SOUTH GP2X_X
+#define BTN_WEST  GP2X_A
+#define BTN_EAST  GP2X_B
+#define BTN_L     GP2X_L
+#define BTN_R     GP2X_R
+
+unsigned long wait_for_input(unsigned long interesting);
+void gp2x_pd_clone_buffer2(void);
+void menu_darken_bg(void *dst, int pixels, int darker);
+void menu_flip(void);
+
+#define SCREEN_WIDTH  320
+#define SCREEN_HEIGHT 240
+#define SCREEN_BUFFER gp2x_screen
+
+#define read_buttons(which) \
+       wait_for_input(which)
+#define menu_draw_begin() \
+       gp2x_pd_clone_buffer2()
+#define clear_screen() \
+       memset(gp2x_screen, 0, 320*240*2)
+#define darken_screen() \
+       menu_darken_bg(gp2x_screen, 320*240, 0)
+#define menu_draw_end() \
+       menu_flip()
+
+// ------------------------------------
+
+#elif defined(__GIZ__)
+
+// TODO
+//#include "../gizmondo/giz.h"
+#define SCREEN_WIDTH 321
+#define SCREEN_BUFFER menu_screen
+extern unsigned char *menu_screen;
+
+// ------------------------------------
+
+#elif defined(PSP)
+
+#include "../psp/psp.h"
+
+#define BTN_NORTH BTN_TRIANGLE
+#define BTN_SOUTH BTN_X
+#define BTN_WEST  BTN_SQUARE
+#define BTN_EAST  BTN_CIRCLE
+
+unsigned long wait_for_input(unsigned int interesting, int is_key_config);
+void menu_draw_begin(void);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_draw_end(void);
+
+#define SCREEN_WIDTH  512
+#define SCREEN_HEIGHT 272
+#define SCREEN_BUFFER psp_screen
+
+#define read_buttons(which) \
+       wait_for_input(which, 0)
+#define clear_screen() \
+       memset(SCREEN_BUFFER, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2)
+#define darken_screen() \
+       menu_darken_bg(psp_screen, psp_screen, SCREEN_WIDTH*SCREEN_HEIGHT, 0)
+
+#endif

diff --git a/common/menu.c b/common/menu.c
index 359517a..2775859 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -12,21 +12,9 @@
 #include "fonts.h"\r
 #include "readpng.h"\r
 #include "lprintf.h"\r
+#include "common.h"\r
+#include "emu.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 menu_screen\r
- extern unsigned char *menu_screen;\r
-#elif defined(PSP)\r
- #include "../psp/psp.h"\r
- #define SCREEN_WIDTH 512\r
- #define SCREEN_BUFFER psp_screen\r
-#endif\r
 \r
 char menuErrorMsg[64] = { 0, };\r
 \r
@@ -362,3 +350,111 @@ const char *me_region_name(unsigned int code, int auto_order)
        }\r
 }\r
 \r
+// ------------ debug menu ------------\r
+\r
+#include <sys/stat.h>\r
+#include <sys/types.h>\r
+\r
+#include <Pico/Pico.h>\r
+#include <Pico/Debug.h>\r
+\r
+void SekStepM68k(void);\r
+\r
+static void draw_text_debug(const char *str, int skip, int from)\r
+{\r
+       const char *p;\r
+       int len, line;\r
+\r
+       p = str;\r
+       while (skip-- > 0)\r
+       {\r
+               while (*p && *p != '\n') p++;\r
+               if (*p == 0 || p[1] == 0) return;\r
+               p++;\r
+       }\r
+\r
+       str = p;\r
+       for (line = from; line < SCREEN_HEIGHT/10; line++)\r
+       {\r
+               while (*p && *p != '\n') p++;\r
+               len = p - str;\r
+               if (len > 55) len = 55;\r
+               smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
+               if (*p == 0) break;\r
+               p++; str = p;\r
+       }\r
+}\r
+\r
+static void draw_frame_debug(void)\r
+{\r
+       char layer_str[48] = "layers:             ";\r
+       if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);\r
+       if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);\r
+       if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
+       if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
+\r
+       clear_screen();\r
+       emu_forcedFrame(0);\r
+       smalltext_out16(4, SCREEN_HEIGHT-8, layer_str, 0xffff);\r
+}\r
+\r
+void debug_menu_loop(void)\r
+{\r
+       int inp, mode = 0;\r
+       int spr_offs = 0, dumped = 0;\r
+\r
+       while (1)\r
+       {\r
+               switch (mode)\r
+               {\r
+                       case 0: menu_draw_begin();\r
+                               draw_text_debug(PDebugMain(), 0, 0);\r
+                               if (dumped) {\r
+                                       smalltext_out16(SCREEN_WIDTH-6*10, SCREEN_HEIGHT-8, "dumped", 0xffff);\r
+                                       dumped = 0;\r
+                               }\r
+                               break;\r
+                       case 1: draw_frame_debug(); break;\r
+                       case 2: clear_screen();\r
+                               emu_forcedFrame(0);\r
+                               darken_screen();\r
+                               PDebugShowSpriteStats(SCREEN_BUFFER, SCREEN_WIDTH); break;\r
+                       case 3: clear_screen();\r
+                               PDebugShowPalette(SCREEN_BUFFER, SCREEN_WIDTH);\r
+                               PDebugShowSprite((unsigned short *)SCREEN_BUFFER + SCREEN_WIDTH*120+SCREEN_WIDTH/2+16,\r
+                                       SCREEN_WIDTH, spr_offs);\r
+                               draw_text_debug(PDebugSpriteList(), spr_offs, 6);\r
+                               break;\r
+               }\r
+               menu_draw_end();\r
+\r
+               inp = read_buttons(BTN_EAST|BTN_SOUTH|BTN_WEST|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT);\r
+               if (inp & BTN_SOUTH) return;\r
+               if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }\r
+               if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }\r
+               switch (mode)\r
+               {\r
+                       case 0:\r
+                               if (inp & BTN_EAST) SekStepM68k();\r
+                               if ((inp & (BTN_WEST|BTN_LEFT)) == (BTN_WEST|BTN_LEFT)) {\r
+                                       mkdir("dumps", 0777);\r
+                                       PDebugDumpMem();\r
+                                       dumped = 1;\r
+                               }\r
+                               break;\r
+                       case 1:\r
+                               if (inp & BTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;\r
+                               if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
+                               if (inp & BTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
+                               if (inp & BTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
+                               break;\r
+                       case 3:\r
+                               if (inp & BTN_DOWN)  spr_offs++;\r
+                               if (inp & BTN_UP)    spr_offs--;\r
+                               if (spr_offs < 0) spr_offs = 0;\r
+                               break;\r
+               }\r
+       }\r
+}\r
+\r
+\r

diff --git a/common/menu.h b/common/menu.h
index bfa05c4..4c20b55 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -6,6 +6,7 @@ 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);
+void debug_menu_loop(void);
 
 extern char menuErrorMsg[64];
 

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 62bf697..b032133 100644 (file)
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -66,7 +66,7 @@ ifeq "$(amalgamate)" "1"
 OBJS += ../../PicoAll.o\r
 else\r
 OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
-               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o\r
+               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.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/cue.o Pico/cd/gfx_cd.o \\r
@@ -118,7 +118,7 @@ OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
 OBJS += unzip/unzip.o unzip/unzip_stream.o\r
 # debug\r
 ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/Debug.o cpu/musashi/m68kdasm.o\r
+OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
 endif\r
 # CPU cores\r
 ifeq "$(use_musashi)" "1"\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index a9b0825..9bc880a 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -37,13 +37,13 @@ const char * const keyNames[] = {
        "???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"\r
 };\r
 \r
-static void menu_darken_bg(void *dst, int pixels, int darker);\r
+void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
 static unsigned long inp_prev = 0;\r
 static int inp_prevjoy = 0;\r
 \r
-static unsigned long wait_for_input(unsigned long interesting)\r
+unsigned long wait_for_input(unsigned long interesting)\r
 {\r
        unsigned long ret;\r
        static int repeats = 0, wait = 20;\r
@@ -132,7 +132,7 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        return ret;\r
 }\r
 \r
-static void menu_flip(void)\r
+void menu_flip(void)\r
 {\r
        gp2x_video_flush_cache();\r
        gp2x_video_flip2();\r
@@ -429,74 +429,6 @@ rescan:
        return ret;\r
 }\r
 \r
-// ------------ debug menu ------------\r
-\r
-char *debugString(void);\r
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);\r
-void PicoDrawShowPalette(unsigned short *screen, int stride);\r
-\r
-static void draw_main_debug(void)\r
-{\r
-       char *p, *str = debugString();\r
-       int len, line;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       p = str;\r
-       for (line = 0; line < 24; line++)\r
-       {\r
-               while (*p && *p != '\n') p++;\r
-               len = p - str;\r
-               if (len > 55) len = 55;\r
-               smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
-               if (*p == 0) break;\r
-               p++; str = p;\r
-       }\r
-}\r
-\r
-static void draw_frame_debug(void)\r
-{\r
-       char layer_str[48] = "layers:             ";\r
-       if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);\r
-       if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);\r
-       if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
-       if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
-\r
-       memset(gp2x_screen, 0, 320*240*2);\r
-       emu_forcedFrame(0);\r
-       smalltext_out16(4, 232, layer_str, 0xffff);\r
-}\r
-\r
-static void debug_menu_loop(void)\r
-{\r
-       int inp, mode = 0;\r
-\r
-       while (1)\r
-       {\r
-               switch (mode)\r
-               {\r
-                       case 0: draw_main_debug(); break;\r
-                       case 1: draw_frame_debug(); break;\r
-                       case 2: gp2x_pd_clone_buffer2();\r
-                               PicoDrawShowSpriteStats(gp2x_screen, 320); break;\r
-                       case 3: memset(gp2x_screen, 0, 320*240*2);\r
-                               PicoDrawShowPalette(gp2x_screen, 320); break;\r
-               }\r
-               menu_flip();\r
-\r
-               inp = wait_for_input(GP2X_B|GP2X_X|GP2X_L|GP2X_R|GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT);\r
-               if (inp & (GP2X_B|GP2X_X)) return;\r
-               if (inp & GP2X_L) { mode--; if (mode < 0) mode = 3; }\r
-               if (inp & GP2X_R) { mode++; if (mode > 3) mode = 0; }\r
-               if (mode == 1) {\r
-                       if (inp & GP2X_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;\r
-                       if (inp & GP2X_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
-                       if (inp & GP2X_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
-                       if (inp & GP2X_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
-               }\r
-       }\r
-}\r
-\r
 // ------------ patch/gg menu ------------\r
 \r
 static void draw_patchlist(int sel)\r
@@ -1653,7 +1585,7 @@ static void menu_loop_root(void)
        }\r
 }\r
 \r
-static void menu_darken_bg(void *dst, int pixels, int darker)\r
+void menu_darken_bg(void *dst, int pixels, int darker)\r
 {\r
        unsigned int *screen = dst;\r
        pixels /= 2;\r

diff --git a/linux/Makefile b/linux/Makefile
index 68f73a1..5b33ba3 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -36,7 +36,7 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/config.o pl
 
 # 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 Pico/Patch.o
+               Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o
 # Pico - CD
 OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \
                Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \
@@ -73,7 +73,7 @@ endif
 # misc
 ifeq "$(use_fame)" "1"
 ifeq "$(use_musashi)" "1"
-OBJS += Pico/Debug.o
+OBJS += Pico/DebugCPU.o
 OBJS += cpu/musashi/m68kdasm.o
 endif
 endif

diff --git a/linux/port_config.h b/linux/port_config.h
index 5ccbacb..87bbe4b 100644 (file)
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -5,6 +5,14 @@
 
 #define NO_SYNC
 
+#define CASE_SENSITIVE_FS 1 // CS filesystem
+#define DONT_OPEN_MANY_FILES 0
+#define REDUCE_IO_CALLS 0
+#define SIMPLE_WRITE_SOUND 0
+
+// draw.c
+#define OVERRIDE_HIGHCOL 0
+
 // draw2.c
 #define START_ROW  0 // which row of tiles to start rendering at?
 #define END_ROW   28 // ..end

diff --git a/psp/Makefile b/psp/Makefile
index 075130e..21b2d6a 100644 (file)
--- a/psp/Makefile
+++ b/psp/Makefile
@@ -7,6 +7,7 @@ PSPSDK = $(shell psp-config --pspsdk-path)
 #use_mz80 = 1\r
 amalgamate = 0\r
 for_15fw = 1\r
+# :!touch platform/psp/psp.c\r
 \r
 \r
 CFLAGS += -I../.. -I. -DNO_SYNC\r
@@ -33,9 +34,9 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
 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 Pico/Draw_amips.o Pico/Memory_amips.o Pico/Misc_amips.o\r
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o Pico/VideoPort.o \\r
+               Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o \\r
+               Pico/Misc_amips.o Pico/Debug.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/cue.o Pico/cd/gfx_cd.o \\r
@@ -167,7 +168,7 @@ up: EBOOT.PBP
 # cleanup\r
 \r
 myclean:\r
-       rm -rf $(DIRS)\r
+       #rm -rf $(DIRS)\r
        $(RM) PicoDrive.map\r
        make -C ../../cpu/musashi clean\r
 \r

diff --git a/psp/menu.c b/psp/menu.c
index 966dee4..86b1022 100644 (file)
--- a/psp/menu.c
+++ b/psp/menu.c
@@ -43,13 +43,13 @@ const char * const keyNames[] = {
 static unsigned short bg_buffer[480*272] __attribute__((aligned(16)));
 #define menu_screen psp_screen
 
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
 static void menu_prepare_bg(int use_game_bg, int use_fg);
 
 
 static unsigned int inp_prev = 0;
 
-static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
+unsigned long wait_for_input(unsigned int interesting, int is_key_config)
 {
        unsigned int ret;
        static int repeats = 0, wait = 20;
@@ -92,7 +92,7 @@ static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
        return ret;
 }
 
-static void menu_draw_begin(void)
+void menu_draw_begin(void)
 {
        // short *src = (short *)bg_buffer, *dst = (short *)menu_screen;
        // int i;
@@ -108,7 +108,7 @@ static void menu_draw_begin(void)
 }
 
 
-static void menu_draw_end(void)
+void menu_draw_end(void)
 {
        psp_video_flip(1);
 }
@@ -434,74 +434,6 @@ static char *romsel_loop(char *curr_path)
        return ret;
 }
 
-// ------------ debug menu ------------
-
-char *debugString(void);
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
-void PicoDrawShowPalette(unsigned short *screen, int stride);
-
-static void draw_main_debug(void)
-{
-       char *p, *str = debugString();
-       int len, line;
-
-       menu_draw_begin();
-
-       p = str;
-       for (line = 0; line < 24; line++)
-       {
-               while (*p && *p != '\n') p++;
-               len = p - str;
-               if (len > 55) len = 55;
-               smalltext_out16_lim(1, line*10, str, 0xffff, len);
-               if (*p == 0) break;
-               p++; str = p;
-       }
-}
-
-static void draw_frame_debug(void)
-{
-       char layer_str[48] = "layers:             ";
-       if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
-       if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
-       if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
-       if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
-
-       memset(psp_screen, 0, 512*272*2);
-       emu_forcedFrame(0);
-       smalltext_out16(4, 264, layer_str, 0xffff);
-}
-
-static void debug_menu_loop(void)
-{
-       int inp, mode = 0;
-
-       while (1)
-       {
-               switch (mode)
-               {
-                       case 0: draw_main_debug(); break;
-                       case 1: draw_frame_debug(); break;
-                       case 2: menu_draw_begin();
-                               PicoDrawShowSpriteStats((unsigned short *)psp_screen+512*16+80, 512); break;
-                       case 3: memset(psp_screen, 0, 512*272*2);
-                               PicoDrawShowPalette(psp_screen, 512); break;
-               }
-               menu_draw_end();
-
-               inp = wait_for_input(BTN_X|BTN_CIRCLE|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT, 0);
-               if (inp & (BTN_X|BTN_CIRCLE)) return;
-               if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }
-               if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }
-               if (mode == 1) {
-                       if (inp & BTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
-                       if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
-                       if (inp & BTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
-                       if (inp & BTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
-               }
-       }
-}
-
 // ------------ patch/gg menu ------------
 
 static void draw_patchlist(int sel)
@@ -1735,8 +1667,7 @@ static void menu_loop_root(void)
        }
 }
 
-// warning: alignment
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
 {
        unsigned int *dest = dst;
        const unsigned int *srce = src;