From 0a710564e1fedc58db03dfb6b4bf866e2fb63af6 Mon Sep 17 00:00:00 2001 From: Yoshi Sugawara Date: Sun, 22 Jul 2018 11:32:52 -1000 Subject: [PATCH 1/2] issue 6751: read input of overlay for remapped keyboard keys --- input/input_mapper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/input/input_mapper.c b/input/input_mapper.c index b8f7931292..c9c6937a9b 100644 --- a/input/input_mapper.c +++ b/input/input_mapper.c @@ -124,7 +124,10 @@ void input_mapper_poll(input_mapper_t *handle) if (remap_valid) { unsigned current_button_value = BIT256_GET(current_input, j); - +#ifdef HAVE_OVERLAY + if (poll_overlay && i == 0) + current_button_value |= input_overlay_key_pressed(overlay_ptr, j); +#endif if ((current_button_value == 1) && (j != remap_button)) { MAPPER_SET_KEY (handle, From bbe1dcd48f352c7bba340e7f734148b4acf71d46 Mon Sep 17 00:00:00 2001 From: kurumushi Date: Mon, 23 Jul 2018 23:11:54 +0900 Subject: [PATCH 2/2] Add imc0: mount for ps vita This allows using the internal storage of the ps vita 2000 model when it's mounted on imc0: instead of ux0: --- frontend/drivers/platform_psp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 2d54b2eb22..61214d8dcc 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -468,6 +468,11 @@ static int frontend_psp_parse_drive_list(void *data, bool load_content) msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), enum_idx, FILE_TYPE_DIRECTORY, 0, 0); + menu_entries_append_enum(list, + "imc0:/", + msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), + enum_idx, + FILE_TYPE_DIRECTORY, 0, 0); #else menu_entries_append_enum(list, "ms0:/",