From e9916df9d0e356153eae4205753505c798acfc02 Mon Sep 17 00:00:00 2001 From: Guo Yunhe Date: Tue, 2 Jun 2020 10:28:00 +0300 Subject: [PATCH] Change keys to upper case --- frontend/drivers/platform_ctr.c | 2 +- gfx/common/ctr_common.h | 4 ++-- gfx/drivers/ctr_gfx.c | 18 +++++++++--------- gfx/drivers_display/gfx_display_ctr.c | 2 +- gfx/drivers_font/ctr_font.c | 2 +- intl/msg_hash_chs.h | 4 ++-- intl/msg_hash_es.h | 4 ++-- intl/msg_hash_fr.h | 4 ++-- intl/msg_hash_pl.h | 4 ++-- intl/msg_hash_tr.h | 4 ++-- intl/msg_hash_us.h | 4 ++-- menu/menu_setting.c | 10 +++++----- msg_hash.h | 4 ++-- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 40b639e103..a5bf3df564 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -171,7 +171,7 @@ static void frontend_ctr_deinit(void* data) /* Only O3DS and O3DSXL support running in 'dual-framebuffer' * mode with the parallax barrier disabled * (i.e. these are the only platforms that can use - * CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */ + * CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */ CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */ if ((device_model == 0) || (device_model == 1)) { diff --git a/gfx/common/ctr_common.h b/gfx/common/ctr_common.h index 161f07c856..17ce294a2b 100644 --- a/gfx/common/ctr_common.h +++ b/gfx/common/ctr_common.h @@ -45,8 +45,8 @@ typedef enum { CTR_VIDEO_MODE_3D = 0, CTR_VIDEO_MODE_2D, - CTR_VIDEO_MODE_2D_400x240, - CTR_VIDEO_MODE_2D_800x240, + CTR_VIDEO_MODE_2D_400X240, + CTR_VIDEO_MODE_2D_800X240, CTR_VIDEO_MODE_LAST } ctr_video_mode_enum; diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index 1cda23d1b2..8ae70891f3 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -87,8 +87,8 @@ static INLINE void ctr_check_3D_slider(ctr_video_t* ctr, ctr_video_mode_enum vid ctr->enable_3d = true; } break; - case CTR_VIDEO_MODE_2D_400x240: - case CTR_VIDEO_MODE_2D_800x240: + case CTR_VIDEO_MODE_2D_400X240: + case CTR_VIDEO_MODE_2D_800X240: if (ctr->supports_parallax_disable) { ctr->video_mode = video_mode; @@ -269,7 +269,7 @@ static void ctr_lcd_aptHook(APT_HookType hook, void* param) ctr->p3d_event_pending = false; } - if((hook == APTHOOK_ONSUSPEND) && (ctr->video_mode == CTR_VIDEO_MODE_2D_400x240)) + if((hook == APTHOOK_ONSUSPEND) && (ctr->video_mode == CTR_VIDEO_MODE_2D_400X240)) { memcpy(gfxTopRightFramebuffers[ctr->current_buffer_top], gfxTopLeftFramebuffers[ctr->current_buffer_top], @@ -483,7 +483,7 @@ static void* ctr_init(const video_info_t* video, /* Only O3DS and O3DSXL support running in 'dual-framebuffer' * mode with the parallax barrier disabled * (i.e. these are the only platforms that can use - * CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */ + * CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */ CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */ ctr->supports_parallax_disable = (device_model == 0) || (device_model == 1); @@ -810,7 +810,7 @@ static bool ctr_frame(void* data, const void* frame, GPU_SetViewport(NULL, VIRT_TO_PHYS(ctr->drawbuffers.top.left), 0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT, - ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); + ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); if (ctr->video_mode == CTR_VIDEO_MODE_3D) { @@ -859,7 +859,7 @@ static bool ctr_frame(void* data, const void* frame, GPU_SetViewport(NULL, VIRT_TO_PHYS(ctr->drawbuffers.top.left), 0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT, - ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); + ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1); if (ctr->video_mode == CTR_VIDEO_MODE_3D) @@ -895,11 +895,11 @@ static bool ctr_frame(void* data, const void* frame, ctrGuDisplayTransfer(true, ctr->drawbuffers.top.left, 240, - ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? 800 : 400, + ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? 800 : 400, CTRGU_RGBA8, gfxTopLeftFramebuffers[ctr->current_buffer_top], 240, CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE); - if ((ctr->video_mode == CTR_VIDEO_MODE_2D_400x240) || (ctr->video_mode == CTR_VIDEO_MODE_3D)) + if ((ctr->video_mode == CTR_VIDEO_MODE_2D_400X240) || (ctr->video_mode == CTR_VIDEO_MODE_3D)) ctrGuDisplayTransfer(true, ctr->drawbuffers.top.right, 240, 400, @@ -913,7 +913,7 @@ static bool ctr_frame(void* data, const void* frame, topFramebufferInfo. framebuf0_vaddr = (u32*)gfxTopLeftFramebuffers[ctr->current_buffer_top]; - if(ctr->video_mode == CTR_VIDEO_MODE_2D_800x240) + if(ctr->video_mode == CTR_VIDEO_MODE_2D_800X240) { topFramebufferInfo. framebuf1_vaddr = (u32*)(gfxTopLeftFramebuffers[ctr->current_buffer_top] + 240 * 3); diff --git a/gfx/drivers_display/gfx_display_ctr.c b/gfx/drivers_display/gfx_display_ctr.c index 78ee7726f9..f2143c1722 100644 --- a/gfx/drivers_display/gfx_display_ctr.c +++ b/gfx/drivers_display/gfx_display_ctr.c @@ -112,7 +112,7 @@ static void gfx_display_ctr_draw(gfx_display_ctx_draw_t *draw, GPU_SetViewport(NULL, VIRT_TO_PHYS(ctr->drawbuffers.top.left), 0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT, - ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 ? + ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, 1); diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c index 1726208675..94f7d7c24d 100644 --- a/gfx/drivers_font/ctr_font.c +++ b/gfx/drivers_font/ctr_font.c @@ -263,7 +263,7 @@ static void ctr_font_render_line( GPU_SetViewport(NULL, VIRT_TO_PHYS(ctr->drawbuffers.top.left), 0, 0, CTR_TOP_FRAMEBUFFER_HEIGHT, - ctr->video_mode == CTR_VIDEO_MODE_2D_800x240 + ctr->video_mode == CTR_VIDEO_MODE_2D_800X240 ? CTR_TOP_FRAMEBUFFER_WIDTH * 2 : CTR_TOP_FRAMEBUFFER_WIDTH); GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, v - ctr->vertex_cache.current); diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index f876212ca6..75bb8c99ae 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -8579,11 +8579,11 @@ MSG_HASH( "3DS 显示模式" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2D (像素效果)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2D (高分辨率)" ) #endif diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 4c014b66c7..9778e1d4dc 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -10227,11 +10227,11 @@ MSG_HASH( "Selecciona el modo de pantalla 2D o 3D. En el modo 3D, los píxeles serán rectangulares y se aplicará un efecto de profundidad al usar el menú rápido. El modo 2D es el mejor para el rendimiento." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2D (Efecto de cuadrícula de píxeles)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2D (Alta resolución)" ) #endif diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index cc00422421..5d4de4edfe 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -10241,11 +10241,11 @@ MSG_HASH( "Sélectionne le mode d'affichage entre les modes 2D et 3D. En mode '3D', les pixels sont carrés et un effet de profondeur est appliqué lors de l'affichage du menu rapide. Le mode '2D' offre la meilleure performance." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2D (Effet grille de pixels)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2D (Haute résolution)" ) #endif diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 57a415b993..8f257e514f 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -10177,11 +10177,11 @@ MSG_HASH( "Wybiera pomiędzy trybami wyświetlania 3D i 2D. W trybie '3D' piksele są kwadratowe a podczas przeglądania szybkiego menu zastosowany jest efekt głębi. Tryb „2D” zapewnia najlepszą wydajność." ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2D (efekt siatki pikseli)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2D (wysoka rozdzielczość)" ) #endif diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h index 6b222aa616..815b54774e 100644 --- a/intl/msg_hash_tr.h +++ b/intl/msg_hash_tr.h @@ -10281,11 +10281,11 @@ MSG_HASH( "2B" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2B (Piksel Izgara Efekti)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2B (Yüksek Çözünürlük)" ) #endif diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 6339cd11bf..d343d8e635 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -10941,11 +10941,11 @@ MSG_HASH( "2D" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, "2D (Pixel Grid Effect)" ) MSG_HASH( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, "2D (High Resolution)" ) #endif diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 805f9c8dc6..f2a1bf73b4 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -4839,16 +4839,16 @@ static void setting_get_string_representation_uint_video_3ds_display_mode( MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D), len); break; - case CTR_VIDEO_MODE_2D_400x240: + case CTR_VIDEO_MODE_2D_400X240: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240), + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240), len); break; - case CTR_VIDEO_MODE_2D_800x240: + case CTR_VIDEO_MODE_2D_800X240: strlcpy(s, msg_hash_to_str( - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240), + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240), len); break; } @@ -14819,7 +14819,7 @@ static bool setting_append_list( /* Only O3DS and O3DSXL support running in 'dual-framebuffer' * mode with the parallax barrier disabled * (i.e. these are the only platforms that can use - * CTR_VIDEO_MODE_2D_400x240 and CTR_VIDEO_MODE_2D_800x240) */ + * CTR_VIDEO_MODE_2D_400X240 and CTR_VIDEO_MODE_2D_800X240) */ CFGU_GetSystemModel(&device_model); /* (0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL) */ CONFIG_UINT( diff --git a/msg_hash.h b/msg_hash.h index 3d69493162..46eebd94ed 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1121,8 +1121,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_3D, MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D, - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240, - MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400X240, + MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800X240, MENU_ENUM_LABEL_FILE_CONFIG, MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,