svn commit: r247458 - projects/uefi/sys/boot/amd64/efi

[Benno Rice]

Author: benno
Date: Thu Feb 28 10:56:21 2013
New Revision: 247458
URL: http://svnweb.freebsd.org/changeset/base/247458

Log:
  Give a few functions more appropriate names.

Modified:
  projects/uefi/sys/boot/amd64/efi/bootinfo.c
  projects/uefi/sys/boot/amd64/efi/elf64_freebsd.c

Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c
==============================================================================
--- projects/uefi/sys/boot/amd64/efi/bootinfo.c	Thu Feb 28 10:54:19 2013	(r247457)
+++ projects/uefi/sys/boot/amd64/efi/bootinfo.c	Thu Feb 28 10:56:21 2013	(r247458)
@@ -209,7 +209,7 @@ bi_copyenv(vm_offset_t start)
 }
 
 static vm_offset_t
-bi_copymodules64(vm_offset_t addr)
+bi_copymodules(vm_offset_t addr)
 {
 	struct preloaded_file	*fp;
 	struct file_metadata	*md;
@@ -236,7 +236,7 @@ bi_copymodules64(vm_offset_t addr)
 }
 
 static int
-ldr_bootinfo(struct preloaded_file *kfp)
+bi_load_efi_data(struct preloaded_file *kfp)
 {
 	EFI_MEMORY_DESCRIPTOR *mm;
 	EFI_PHYSICAL_ADDRESS addr;
@@ -306,7 +306,7 @@ ldr_bootinfo(struct preloaded_file *kfp)
  * - Module metadata are formatted and placed in kernel space.
  */
 int
-bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
+bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
 {
 	struct preloaded_file	*xp, *kfp;
 	struct devdesc		*rootdev;
@@ -360,11 +360,12 @@ bi_load64(char *args, vm_offset_t *modul
 	file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto);
 	file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp);
 	file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend);
-	ldr_bootinfo(kfp);
+
+	bi_load_efi_data(kfp);
 
 	/* Figure out the size and location of the metadata */
 	*modulep = addr;
-	size = bi_copymodules64(0);
+	size = bi_copymodules(0);
 	kernend = roundup(addr + size, PAGE_SIZE);
 	*kernendp = kernend;
 
@@ -373,7 +374,7 @@ bi_load64(char *args, vm_offset_t *modul
 	bcopy(&kernend, md->md_data, sizeof kernend);
 
 	/* copy module list and metadata */
-	(void)bi_copymodules64(addr);
+	(void)bi_copymodules(addr);
 
 	return(0);
 }

Modified: projects/uefi/sys/boot/amd64/efi/elf64_freebsd.c
==============================================================================
--- projects/uefi/sys/boot/amd64/efi/elf64_freebsd.c	Thu Feb 28 10:54:19 2013	(r247457)
+++ projects/uefi/sys/boot/amd64/efi/elf64_freebsd.c	Thu Feb 28 10:56:21 2013	(r247458)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 static EFI_GUID acpi_guid = ACPI_TABLE_GUID;
 static EFI_GUID acpi20_guid = ACPI_20_TABLE_GUID;
 
-extern int bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp);
+extern int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp);
 
 static int	elf64_exec(struct preloaded_file *amp);
 static int	elf64_obj_exec(struct preloaded_file *amp);
@@ -159,7 +159,7 @@ elf64_exec(struct preloaded_file *fp)
         PT2[i] |= PG_V | PG_RW | PG_PS | PG_U;
     }
 
-    err = bi_load64(fp->f_args, &modulep, &kernend);
+    err = bi_load(fp->f_args, &modulep, &kernend);
     if (err != 0)
 	return(err);