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

efi_loader: replace UINTN by efi_uintn_t

Browse source 
UINTN is used in the UEFI specification for unsigned integers
matching the bitness of the CPU.

Types in U-Boot should be lower case. The patch replaces it
by efi_uintn_t.

Suggested-by: Simon Glass <sjg@chromium.org>
Suggested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2017-11-06 21:17:47 +01:00 • committed by Alexander Graf
parent 7e82449495
commit 152cade326
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/efi_api.h
View file

@ -28,7 +28,7 @@ enum efi_timer_delay {
EFI_TIMER_RELATIVE = 2 EFI_TIMER_RELATIVE = 2
}; };
#define UINTN size_t #define efi_uintn_t size_t
typedef uint16_t *efi_string_t; typedef uint16_t *efi_string_t;
#define EVT_TIMER 0x80000000 #define EVT_TIMER 0x80000000
@ -48,8 +48,8 @@ struct efi_event;
/* EFI Boot Services table */ /* EFI Boot Services table */
struct efi_boot_services { struct efi_boot_services {
struct efi_table_hdr hdr; struct efi_table_hdr hdr;
efi_status_t (EFIAPI *raise_tpl)(UINTN new_tpl); efi_status_t (EFIAPI *raise_tpl)(efi_uintn_t new_tpl);
void (EFIAPI *restore_tpl)(UINTN old_tpl); void (EFIAPI *restore_tpl)(efi_uintn_t old_tpl);
efi_status_t (EFIAPI *allocate_pages)(int, int, unsigned long, efi_status_t (EFIAPI *allocate_pages)(int, int, unsigned long,
efi_physical_addr_t *); efi_physical_addr_t *);
@ -61,7 +61,7 @@ struct efi_boot_services {
efi_status_t (EFIAPI *free_pool)(void *); efi_status_t (EFIAPI *free_pool)(void *);
efi_status_t (EFIAPI *create_event)(uint32_t type, efi_status_t (EFIAPI *create_event)(uint32_t type,
UINTN notify_tpl, efi_uintn_t notify_tpl,
void (EFIAPI *notify_function) ( void (EFIAPI *notify_function) (
struct efi_event *event, struct efi_event *event,
void *context), void *context),

4
include/efi_loader.h
View file

@ -144,7 +144,7 @@ struct efi_object {
*/ */
struct efi_event { struct efi_event {
uint32_t type; uint32_t type;
UINTN notify_tpl; efi_uintn_t notify_tpl;
void (EFIAPI *notify_function)(struct efi_event *event, void *context); void (EFIAPI *notify_function)(struct efi_event *event, void *context);
void *notify_context; void *notify_context;
u64 trigger_next; u64 trigger_next;
@ -193,7 +193,7 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map);
/* Call this to set the current device name */ /* Call this to set the current device name */
void efi_set_bootdev(const char *dev, const char *devnr, const char *path); void efi_set_bootdev(const char *dev, const char *devnr, const char *path);
/* Call this to create an event */ /* Call this to create an event */
efi_status_t efi_create_event(uint32_t type, UINTN notify_tpl, efi_status_t efi_create_event(uint32_t type, efi_uintn_t notify_tpl,
void (EFIAPI *notify_function) ( void (EFIAPI *notify_function) (
struct efi_event *event, struct efi_event *event,
void *context), void *context),

12
lib/efi_loader/efi_boottime.c
View file

@ -21,7 +21,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* Task priority level */ /* Task priority level */
static UINTN efi_tpl = TPL_APPLICATION; static efi_uintn_t efi_tpl = TPL_APPLICATION;
/* This list contains all the EFI objects our payload has access to */ /* This list contains all the EFI objects our payload has access to */
LIST_HEAD(efi_obj_list); LIST_HEAD(efi_obj_list);
@ -165,9 +165,9 @@ void efi_signal_event(struct efi_event *event)
* @new_tpl new value of the task priority level * @new_tpl new value of the task priority level
* @return old value of the task priority level * @return old value of the task priority level
*/ */
static unsigned long EFIAPI efi_raise_tpl(UINTN new_tpl) static unsigned long EFIAPI efi_raise_tpl(efi_uintn_t new_tpl)
{ {
UINTN old_tpl = efi_tpl; efi_uintn_t old_tpl = efi_tpl;
EFI_ENTRY("0x%zx", new_tpl); EFI_ENTRY("0x%zx", new_tpl);
@ -190,7 +190,7 @@ static unsigned long EFIAPI efi_raise_tpl(UINTN new_tpl)
* *
* @old_tpl value of the task priority level to be restored * @old_tpl value of the task priority level to be restored
*/ */
static void EFIAPI efi_restore_tpl(UINTN old_tpl) static void EFIAPI efi_restore_tpl(efi_uintn_t old_tpl)
{ {
EFI_ENTRY("0x%zx", old_tpl); EFI_ENTRY("0x%zx", old_tpl);
@ -359,7 +359,7 @@ static struct efi_event efi_events[16];
* @event created event * @event created event
* @return status code * @return status code
*/ */
efi_status_t efi_create_event(uint32_t type, UINTN notify_tpl, efi_status_t efi_create_event(uint32_t type, efi_uintn_t notify_tpl,
void (EFIAPI *notify_function) ( void (EFIAPI *notify_function) (
struct efi_event *event, struct efi_event *event,
void *context), void *context),
@ -409,7 +409,7 @@ efi_status_t efi_create_event(uint32_t type, UINTN notify_tpl,
* @return status code * @return status code
*/ */
static efi_status_t EFIAPI efi_create_event_ext( static efi_status_t EFIAPI efi_create_event_ext(
uint32_t type, UINTN notify_tpl, uint32_t type, efi_uintn_t notify_tpl,
void (EFIAPI *notify_function) ( void (EFIAPI *notify_function) (
struct efi_event *event, struct efi_event *event,
void *context), void *context),

2
lib/efi_selftest/efi_selftest_tpl.c
View file

@ -113,7 +113,7 @@ static int execute(void)
{ {
size_t index; size_t index;
efi_status_t ret; efi_status_t ret;
UINTN old_tpl; efi_uintn_t old_tpl;
/* Set 10 ms timer */ /* Set 10 ms timer */
notification_count = 0; notification_count = 0;