linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

efi_loader: expose protocols via GUID

Browse Source 
shim.efi (or rather gnu-efi's LibLocateProtocol() which shim.efi uses)
resolves protocols via efi_locate_handle() so the console protocols
need to be added to the efi object list.

Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: whitespace fixes]
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Rob Clark
2017-07-24 10:39:01 -04:00
committed by Alexander Graf
parent 641833db4a
commit a17e62cc53
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/efi_api.h
View File

@ -349,6 +349,11 @@ struct simple_text_output_mode {
bool cursor_visible; bool cursor_visible;
}; };
#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \
EFI_GUID(0x387477c2, 0x69c7, 0x11d2, \
0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
struct efi_simple_text_output_protocol { struct efi_simple_text_output_protocol {
void *reset; void *reset;
efi_status_t (EFIAPI *output_string)( efi_status_t (EFIAPI *output_string)(
@ -383,6 +388,10 @@ struct efi_input_key {
s16 unicode_char; s16 unicode_char;
}; };
#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
EFI_GUID(0x387477c1, 0x69c7, 0x11d2, \
0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
struct efi_simple_input_interface { struct efi_simple_input_interface {
efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this, efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this,
bool ExtendedVerification); bool ExtendedVerification);

14
lib/efi_loader/efi_console.c
View File

@ -442,10 +442,24 @@ static void EFIAPI efi_console_timer_notify(struct efi_event *event,
EFI_EXIT(EFI_SUCCESS); EFI_EXIT(EFI_SUCCESS);
} }
static struct efi_object efi_console_control_obj =
EFI_PROTOCOL_OBJECT(efi_guid_console_control, &efi_console_control);
static struct efi_object efi_console_output_obj =
EFI_PROTOCOL_OBJECT(EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID, &efi_con_out);
static struct efi_object efi_console_input_obj =
EFI_PROTOCOL_OBJECT(EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID, &efi_con_in);
/* This gets called from do_bootefi_exec(). */ /* This gets called from do_bootefi_exec(). */
int efi_console_register(void) int efi_console_register(void)
{ {
efi_status_t r; efi_status_t r;
/* Hook up to the device list */
list_add_tail(&efi_console_control_obj.link, &efi_obj_list);
list_add_tail(&efi_console_output_obj.link, &efi_obj_list);
list_add_tail(&efi_console_input_obj.link, &efi_obj_list);
r = efi_create_event(EVT_NOTIFY_WAIT, TPL_CALLBACK, r = efi_create_event(EVT_NOTIFY_WAIT, TPL_CALLBACK,
efi_key_notify, NULL, &efi_con_in.wait_for_key); efi_key_notify, NULL, &efi_con_in.wait_for_key);
if (r != EFI_SUCCESS) { if (r != EFI_SUCCESS) {