From: notaz <notasas@gmail.com>
Date: Sun, 28 Jul 2013 22:55:49 +0000 (+0300)
Subject: fix clang warnings
X-Git-Tag: v1.85~25
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=commitdiff_plain;h=da77daa962a65116b81149fdc9c2374d22d72dd0

fix clang warnings

so that they don't annoy me
---

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index e0d524f..1e07e7d 100644
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -1430,7 +1430,7 @@ static const u16 ssh2_code[] = {
   0x2200, 0x03e4  // slave start pointer in ROM
 };
 
-#define HWSWAP(x) (((x) << 16) | ((x) >> 16))
+#define HWSWAP(x) (((u16)(x) << 16) | ((x) >> 16))
 static void get_bios(void)
 {
   u16 *ps;
diff --git a/pico/carthw_cfg.c b/pico/carthw_cfg.c
index 68782e5..14aec3e 100644
--- a/pico/carthw_cfg.c
+++ b/pico/carthw_cfg.c
@@ -26,7 +26,7 @@ static const char builtin_carthw_cfg[] =
   "hw=ssf2_mapper\n"
   "prop=no_sram\n"
   "[]\n"
-  "check_str=0x150,\"PIER SOLAR™&THE GREAT ARCHITECTS© WaterMelon™\"\n"
+  "check_str=0x150,\"PIER SOLAR\x99&THE GREAT ARCHITECTS\xa9 WaterMelon\x99\"\n"
   "hw=piersolar_mapper\n"
   "sram_range=0xa13009,0xa1300b\n"
   "eeprom_type=3\n"
diff --git a/pico/media.c b/pico/media.c
index ef9b315..ade8ded 100644
--- a/pico/media.c
+++ b/pico/media.c
@@ -217,7 +217,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
   {
     // check for MegaCD image
     cd_img_type = PicoCdCheck(filename, &cd_region);
-    if (cd_img_type >= 0 && cd_img_type != CIT_NOT_CD)
+    if ((int)cd_img_type >= 0 && cd_img_type != CIT_NOT_CD)
     {
       // valid CD image, ask frontend for BIOS..
       rom_fname = NULL;
diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 3e7e71a..0745352 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -1082,7 +1082,8 @@ int menu_loop_tray(void)
 		ret = 0; /* no CD inserted */
 	}
 
-	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
+	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
+		;
 	in_set_config_int(0, IN_CFG_BLOCKING, 0);
 	plat_video_menu_leave();
 
diff --git a/platform/libpicofe b/platform/libpicofe
index ebf0e11..cab9194 160000
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit ebf0e111a84cbd73511cc2b935c7bd688638cf5e
+Subproject commit cab9194354b6340b4bf0c5154fecc4018a4f2a33