Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi: hii: add guid package support

Browse source 
Allow for handling GUID package in HII database protocol.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
AKASHI Takahiro 2019-01-21 12:12:58 +09:00 • committed by Alexander Graf
parent c9bfb22296
commit 9ab0bdd9fe
2 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/efi_api.h
View file

@ -744,6 +744,15 @@ struct efi_hii_package_header {
#define EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN 0xE0 #define EFI_HII_PACKAGE_TYPE_SYSTEM_BEGIN 0xE0
#define EFI_HII_PACKAGE_TYPE_SYSTEM_END 0xFF #define EFI_HII_PACKAGE_TYPE_SYSTEM_END 0xFF
/*
* HII GUID package
*/
struct efi_hii_guid_package {
struct efi_hii_package_header header;
efi_guid_t guid;
char data[];
} __packed;
/* /*
* HII string package * HII string package
*/ */

48
lib/efi_loader/efi_hii.c
View file

@ -23,6 +23,7 @@ struct efi_hii_packagelist {
efi_handle_t driver_handle; efi_handle_t driver_handle;
u32 max_string_id; u32 max_string_id;
struct list_head string_tables; /* list of efi_string_table */ struct list_head string_tables; /* list of efi_string_table */
struct list_head guid_list;
/* we could also track fonts, images, etc */ /* we could also track fonts, images, etc */
}; };
@ -80,6 +81,11 @@ struct efi_string_table {
struct efi_string_info *strings; struct efi_string_info *strings;
}; };
struct efi_guid_data {
struct list_head link;
struct efi_hii_guid_package package;
};
static void free_strings_table(struct efi_string_table *stbl) static void free_strings_table(struct efi_string_table *stbl)
{ {
int i; int i;
@ -218,6 +224,35 @@ error:
return ret; return ret;
} }
static void remove_guid_package(struct efi_hii_packagelist *hii)
{
struct efi_guid_data *data;
while (!list_empty(&hii->guid_list)) {
data = list_first_entry(&hii->guid_list,
struct efi_guid_data, link);
list_del(&data->link);
free(data);
}
}
static efi_status_t
add_guid_package(struct efi_hii_packagelist *hii,
struct efi_hii_guid_package *package)
{
struct efi_guid_data *data;
data = calloc(sizeof(*data), 1);
if (!data)
return EFI_OUT_OF_RESOURCES;
/* TODO: we don't know any about data field */
memcpy(&data->package, package, sizeof(*package));
list_add_tail(&data->link, &hii->guid_list);
return EFI_SUCCESS;
}
static struct efi_hii_packagelist *new_packagelist(void) static struct efi_hii_packagelist *new_packagelist(void)
{ {
struct efi_hii_packagelist *hii; struct efi_hii_packagelist *hii;
@ -225,6 +260,7 @@ static struct efi_hii_packagelist *new_packagelist(void)
hii = malloc(sizeof(*hii)); hii = malloc(sizeof(*hii));
hii->max_string_id = 0; hii->max_string_id = 0;
INIT_LIST_HEAD(&hii->string_tables); INIT_LIST_HEAD(&hii->string_tables);
INIT_LIST_HEAD(&hii->guid_list);
return hii; return hii;
} }
@ -232,6 +268,7 @@ static struct efi_hii_packagelist *new_packagelist(void)
static void free_packagelist(struct efi_hii_packagelist *hii) static void free_packagelist(struct efi_hii_packagelist *hii)
{ {
remove_strings_package(hii); remove_strings_package(hii);
remove_guid_package(hii);
list_del(&hii->link); list_del(&hii->link);
free(hii); free(hii);
@ -259,8 +296,8 @@ add_packages(struct efi_hii_packagelist *hii,
switch (efi_hii_package_type(package)) { switch (efi_hii_package_type(package)) {
case EFI_HII_PACKAGE_TYPE_GUID: case EFI_HII_PACKAGE_TYPE_GUID:
printf("\tGuid package not supported\n"); ret = add_guid_package(hii,
ret = EFI_INVALID_PARAMETER; (struct efi_hii_guid_package *)package);
break; break;
case EFI_HII_PACKAGE_FORMS: case EFI_HII_PACKAGE_FORMS:
printf("\tForm package not supported\n"); printf("\tForm package not supported\n");
@ -395,8 +432,7 @@ update_package_list(const struct efi_hii_database_protocol *this,
switch (efi_hii_package_type(package)) { switch (efi_hii_package_type(package)) {
case EFI_HII_PACKAGE_TYPE_GUID: case EFI_HII_PACKAGE_TYPE_GUID:
printf("\tGuid package not supported\n"); remove_guid_package(hii);
ret = EFI_INVALID_PARAMETER;
break; break;
case EFI_HII_PACKAGE_FORMS: case EFI_HII_PACKAGE_FORMS:
printf("\tForm package not supported\n"); printf("\tForm package not supported\n");
@ -482,8 +518,8 @@ list_package_lists(const struct efi_hii_database_protocol *this,
case EFI_HII_PACKAGE_TYPE_ALL: case EFI_HII_PACKAGE_TYPE_ALL:
break; break;
case EFI_HII_PACKAGE_TYPE_GUID: case EFI_HII_PACKAGE_TYPE_GUID:
printf("\tGuid package not supported\n"); if (!list_empty(&hii->guid_list))
ret = EFI_INVALID_PARAMETER; break;
continue; continue;
case EFI_HII_PACKAGE_FORMS: case EFI_HII_PACKAGE_FORMS:
printf("\tForm package not supported\n"); printf("\tForm package not supported\n");