From 9aff87f4b49933695d75346e4d53b8ef62b37374 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 26 Jul 2015 15:40:29 -0500 Subject: [PATCH] add controller info on system information --- menu/cbs/menu_cbs_get_value.c | 3 +++ menu/menu_displaylist.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 61886d6d48..ebb5bc5f58 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -907,6 +907,9 @@ static void menu_action_setting_disp_set_label(file_list_t* list, case MENU_LABEL_LOAD_CONTENT_HISTORY: *w = strlen(label); break; + case MENU_LABEL_SYSTEM_INFORMATION: + *w = 2; + break; } if (type >= MENU_SETTINGS_CORE_OPTION_START) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e113b531db..942e982453 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -302,6 +302,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) char tmp2[PATH_MAX_LENGTH] = {0}; const char *tmp_string = NULL; const frontend_ctx_driver_t *frontend = frontend_get_ptr(); + settings_t *settings = config_get_ptr(); snprintf(tmp, sizeof(tmp), "%s: %s", menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE), __DATE__); menu_list_push(info->list, tmp, "", @@ -338,6 +339,17 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) menu_list_push(info->list, cpu_str, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); } + for(int controller = 0; controller < MAX_USERS; controller++) + { + if (settings->input.autoconfigured[controller]) + { + snprintf(tmp, sizeof(tmp), "Port #%d device name: %s", controller, settings->input.device_names[controller]); + menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); + snprintf(tmp, sizeof(tmp), "Port #%d device VID/PID: %d/%d", controller, settings->input.vid[controller], settings->input.pid[controller]); + menu_list_push(info->list, tmp, "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0); + } + } + if (frontend) { int major = 0, minor = 0;