X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu.c;h=7fc7ba531cd70387b6dfe4ffa4e982fc743d3503;hb=9112b6ce9fd42ee46adb7e8148e587a7f60e35f4;hp=53ef33d0885b6d07023d874dcbd7fcb9e92beed7;hpb=e5f426aa2e86d56357b8af2795e73cc0c9b17e8f;p=picodrive.git

diff --git a/platform/common/menu.c b/platform/common/menu.c
index 53ef33d..7fc7ba5 100644
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -14,15 +14,22 @@
 #include "lprintf.h"
 
 #if   defined(__GP2X__)
-#include "../gp2x/gp2x.h"
-#define SCREEN_WIDTH 320
-#define SCREEN_BUFFER gp2x_screen
+ #include "../gp2x/gp2x.h"
+ #define SCREEN_WIDTH 320
+ #define SCREEN_BUFFER gp2x_screen
 #elif defined(__GIZ__)
-#include "../gizmondo/giz.h"
-#define SCREEN_WIDTH 321
-#define SCREEN_BUFFER giz_screen
+ //#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 SCREEN_WIDTH 512
+ #define SCREEN_BUFFER psp_screen
 #endif
 
+char menuErrorMsg[64] = { 0, };
+
 static unsigned char menu_font_data[10240];
 static int menu_text_color = 0xffff; // default to white
 static int menu_sel_color = -1; // disabled
@@ -157,7 +164,12 @@ static int parse_hex_color(char *buff)
 {
 	char *endp = buff;
 	int t = (int) strtoul(buff, &endp, 16);
-	if (endp != buff) return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);
+	if (endp != buff)
+#ifdef PSP
+		return ((t<<8)&0xf800) | ((t>>5)&0x07e0) | ((t>>19)&0x1f);
+#else
+		return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);
+#endif
 	return -1;
 }