diff options
| author | Rob Clark <robdclark@gmail.com> | 2017-07-24 10:39:01 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2017-07-25 10:58:07 +0200 |
| commit | a17e62cc533b8eb59616fc21001be90685770a06 (patch) | |
| tree | ec6f1a07cdbf41d201dd11118a07be009e220790 | |
| parent | 641833db4a3bc417e991e7d37ce7cb99657beee0 (diff) | |
efi_loader: expose protocols via GUID
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>
| -rw-r--r-- | include/efi_api.h | 9 | ||||
| -rw-r--r-- | lib/efi_loader/efi_console.c | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index 8f881d2903..ec1b321e8e 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -349,6 +349,11 @@ struct simple_text_output_mode { 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 { void *reset; efi_status_t (EFIAPI *output_string)( @@ -383,6 +388,10 @@ struct efi_input_key { 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 { efi_status_t(EFIAPI *reset)(struct efi_simple_input_interface *this, bool ExtendedVerification); diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 95e632394f..5ebce4b544 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -442,10 +442,24 @@ static void EFIAPI efi_console_timer_notify(struct efi_event *event, 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(). */ int efi_console_register(void) { 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, efi_key_notify, NULL, &efi_con_in.wait_for_key); if (r != EFI_SUCCESS) { |