From owner-svn-src-projects@FreeBSD.ORG Thu Feb 28 10:56:22 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2360E842; Thu, 28 Feb 2013 10:56:22 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id ED5E51B03; Thu, 28 Feb 2013 10:56:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1SAuL4s058841; Thu, 28 Feb 2013 10:56:21 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1SAuLX9058839; Thu, 28 Feb 2013 10:56:21 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302281056.r1SAuLX9058839@svn.freebsd.org> From: Benno Rice Date: Thu, 28 Feb 2013 10:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247458 - projects/uefi/sys/boot/amd64/efi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2013 10:56:22 -0000 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);