From 8ea147c08132e3e4763e3435ffc7e784aabc504e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 9 Oct 2020 20:18:33 +0200 Subject: [PATCH] Turn these all static const --- menu/drivers/ozone/ozone_sidebar.c | 8 ++++---- menu/drivers/ozone/ozone_sidebar.h | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c index 08e24e3e9a..c7ff0c176a 100644 --- a/menu/drivers/ozone/ozone_sidebar.c +++ b/menu/drivers/ozone/ozone_sidebar.c @@ -31,7 +31,7 @@ #include "../../../configuration.h" -enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST] = { +static const enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST] = { MENU_ENUM_LABEL_VALUE_MAIN_MENU, MENU_ENUM_LABEL_VALUE_SETTINGS_TAB, MENU_ENUM_LABEL_VALUE_HISTORY_TAB, @@ -54,7 +54,7 @@ enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST] = { #endif }; -enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST] = { +static const enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST] = { MENU_SETTINGS, MENU_SETTINGS_TAB, MENU_HISTORY_TAB, @@ -77,7 +77,7 @@ enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST] = { #endif }; -enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = { +static const enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = { MENU_ENUM_LABEL_MAIN_MENU, MENU_ENUM_LABEL_SETTINGS_TAB, MENU_ENUM_LABEL_HISTORY_TAB, @@ -100,7 +100,7 @@ enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = { #endif }; -unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST] = { +static const unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST] = { OZONE_TAB_TEXTURE_MAIN_MENU, OZONE_TAB_TEXTURE_SETTINGS, OZONE_TAB_TEXTURE_HISTORY, diff --git a/menu/drivers/ozone/ozone_sidebar.h b/menu/drivers/ozone/ozone_sidebar.h index 8ce22eef1c..0fc9bd8850 100644 --- a/menu/drivers/ozone/ozone_sidebar.h +++ b/menu/drivers/ozone/ozone_sidebar.h @@ -47,12 +47,4 @@ enum OZONE_SYSTEM_TAB_LAST }; -extern enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST]; - -extern enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST]; - -extern enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST]; - -extern unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST]; - #endif