Commit 24e6722b8a6268b893a38d3a8a04c6dabf53fafd

Authored by Heinrich Schuchardt
1 parent c0a8a95263

efi_loader: definition of efi_virtual_address_map()

Use efi_uintn_t where the UEFI spec uses UINTN. Use efi_uintn_t also for
the result of the division of two efi_uintn_t.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Showing 2 changed files with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -238,8 +238,8 @@
238 238 efi_status_t (EFIAPI *set_wakeup_time)(char enabled,
239 239 struct efi_time *time);
240 240 efi_status_t (EFIAPI *set_virtual_address_map)(
241   - unsigned long memory_map_size,
242   - unsigned long descriptor_size,
  241 + efi_uintn_t memory_map_size,
  242 + efi_uintn_t descriptor_size,
243 243 uint32_t descriptor_version,
244 244 struct efi_mem_desc *virtmap);
245 245 efi_status_t (EFIAPI *convert_pointer)(
lib/efi_loader/efi_runtime.c
... ... @@ -427,8 +427,8 @@
427 427 * Return: status code EFI_UNSUPPORTED
428 428 */
429 429 static __efi_runtime efi_status_t EFIAPI efi_set_virtual_address_map_runtime(
430   - unsigned long memory_map_size,
431   - unsigned long descriptor_size,
  430 + efi_uintn_t memory_map_size,
  431 + efi_uintn_t descriptor_size,
432 432 uint32_t descriptor_version,
433 433 struct efi_mem_desc *virtmap)
434 434 {
435 435  
436 436  
... ... @@ -571,17 +571,17 @@
571 571 * Return: status code
572 572 */
573 573 static efi_status_t EFIAPI efi_set_virtual_address_map(
574   - unsigned long memory_map_size,
575   - unsigned long descriptor_size,
  574 + efi_uintn_t memory_map_size,
  575 + efi_uintn_t descriptor_size,
576 576 uint32_t descriptor_version,
577 577 struct efi_mem_desc *virtmap)
578 578 {
579   - int n = memory_map_size / descriptor_size;
580   - int i;
  579 + efi_uintn_t n = memory_map_size / descriptor_size;
  580 + efi_uintn_t i;
581 581 int rt_code_sections = 0;
582 582 struct efi_event *event;
583 583  
584   - EFI_ENTRY("%lx %lx %x %p", memory_map_size, descriptor_size,
  584 + EFI_ENTRY("%zx %zx %x %p", memory_map_size, descriptor_size,
585 585 descriptor_version, virtmap);
586 586  
587 587 /*