fix clang warnings

so that they don't annoy me
This commit is contained in:
notaz 2013-07-29 01:55:49 +03:00
parent 3e9da86efe
commit da77daa962
5 changed files with 6 additions and 5 deletions

View file

@ -1430,7 +1430,7 @@ static const u16 ssh2_code[] = {
0x2200, 0x03e4 // slave start pointer in ROM 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) static void get_bios(void)
{ {
u16 *ps; u16 *ps;

View file

@ -26,7 +26,7 @@ static const char builtin_carthw_cfg[] =
"hw=ssf2_mapper\n" "hw=ssf2_mapper\n"
"prop=no_sram\n" "prop=no_sram\n"
"[]\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" "hw=piersolar_mapper\n"
"sram_range=0xa13009,0xa1300b\n" "sram_range=0xa13009,0xa1300b\n"
"eeprom_type=3\n" "eeprom_type=3\n"

View file

@ -217,7 +217,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
{ {
// check for MegaCD image // check for MegaCD image
cd_img_type = PicoCdCheck(filename, &cd_region); 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.. // valid CD image, ask frontend for BIOS..
rom_fname = NULL; rom_fname = NULL;

View file

@ -1082,7 +1082,8 @@ int menu_loop_tray(void)
ret = 0; /* no CD inserted */ 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); in_set_config_int(0, IN_CFG_BLOCKING, 0);
plat_video_menu_leave(); plat_video_menu_leave();

@ -1 +1 @@
Subproject commit ebf0e111a84cbd73511cc2b935c7bd688638cf5e Subproject commit cab9194354b6340b4bf0c5154fecc4018a4f2a33