Module Name: src
Committed By: martin
Date: Fri Nov 3 10:01:13 UTC 2023
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-10]: boot.c devopen.c efidisk.c
efimemory.c
src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-10]: efibootia32.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #452):
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.7
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.8
sys/arch/i386/stand/efiboot/boot.c: revision 1.23
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.10
sys/arch/i386/stand/efiboot/devopen.c: revision 1.14
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.10
x86/efiboot: Nix trailing whitespace.
whitespace -> tab, blank line, no binary changes.
``int i'' is used only for SUPPORT_NFS || SUPPORT_TFTP.
To generate a diff of this commit:
cvs rdiff -u -r1.21.4.1 -r1.21.4.2 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.9 -r1.9.26.1 src/sys/arch/i386/stand/efiboot/efidisk.c \
src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.5.26.1 -r1.5.26.2 \
src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.1 src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.2
--- src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.1 Sat May 13 13:26:56 2023
+++ src/sys/arch/i386/stand/efiboot/boot.c Fri Nov 3 10:01:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.21.4.1 2023/05/13 13:26:56 martin Exp $ */
+/* $NetBSD: boot.c,v 1.21.4.2 2023/11/03 10:01:13 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -483,7 +483,7 @@ command_dev(char *arg)
if (*arg == '\0') {
efi_disk_show();
efi_net_show();
-
+
if (default_part_name != NULL)
printf("default NAME=%s\n", default_part_name);
else
@@ -647,7 +647,7 @@ void
command_reloc(char *arg)
{
char *ep;
-
+
if (*arg == '\0') {
switch (efi_reloc_type) {
case RELOC_NONE:
Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.13 src/sys/arch/i386/stand/efiboot/devopen.c:1.13.4.1
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.13 Mon Dec 27 12:19:27 2021
+++ src/sys/arch/i386/stand/efiboot/devopen.c Fri Nov 3 10:01:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.13 2021/12/27 12:19:27 simonb Exp $ */
+/* $NetBSD: devopen.c,v 1.13.4.1 2023/11/03 10:01:13 martin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -154,13 +154,13 @@ devopen(struct open_file *f, const char
const char *xname = NULL;
int unit, partition;
int biosdev;
- int i, error;
+ int error;
#if defined(SUPPORT_NFS) || defined(SUPPORT_TFTP)
struct devdesc desc;
const struct netboot_fstab *nf;
char *filename;
size_t fsnamelen;
- int n;
+ int i, n;
#endif
error = parsebootfile(fname, &fsname, &devname, &unit, &partition,
Index: src/sys/arch/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.9 src/sys/arch/i386/stand/efiboot/efidisk.c:1.9.26.1
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.9 Tue Dec 17 01:37:52 2019
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Fri Nov 3 10:01:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.9 2019/12/17 01:37:52 manu Exp $ */
+/* $NetBSD: efidisk.c,v 1.9.26.1 2023/11/03 10:01:13 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -70,9 +70,9 @@ dealloc_biosdisk_part(struct biosdisk_pa
part[i].part_name = NULL;
}
}
-
+
dealloc(part, sizeof(*part) * nparts);
-
+
return;
}
@@ -194,7 +194,6 @@ efi_raidframe_probe(struct efi_raidframe
return;
}
-
void
efi_disk_show(void)
{
@@ -293,7 +292,7 @@ efi_disk_show(void)
raidframe[i].size,
&part, &nparts))
continue;
-
+
first = 1;
for (j = 0; j < nparts; j++) {
bool bootme = part[j].attr & GPT_ENT_ATTR_BOOTME;
Index: src/sys/arch/i386/stand/efiboot/efimemory.c
diff -u src/sys/arch/i386/stand/efiboot/efimemory.c:1.9 src/sys/arch/i386/stand/efiboot/efimemory.c:1.9.26.1
--- src/sys/arch/i386/stand/efiboot/efimemory.c:1.9 Fri Sep 13 02:19:45 2019
+++ src/sys/arch/i386/stand/efiboot/efimemory.c Fri Nov 3 10:01:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efimemory.c,v 1.9 2019/09/13 02:19:45 manu Exp $ */
+/* $NetBSD: efimemory.c,v 1.9.26.1 2023/11/03 10:01:13 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -221,7 +221,7 @@ efi_memory_get_memmap(struct bi_memmap_e
next = NextMemoryDescriptor(md, DescriptorSize);
}
-
+
*memmapp = memmap;
*num = NoEntries;
return 0;
Index: src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
diff -u src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.5.26.1 src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.5.26.2
--- src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.5.26.1 Sat May 13 13:26:57 2023
+++ src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c Fri Nov 3 10:01:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efibootia32.c,v 1.5.26.1 2023/05/13 13:26:57 martin Exp $ */
+/* $NetBSD: efibootia32.c,v 1.5.26.2 2023/11/03 10:01:13 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -57,16 +57,15 @@ efi_md_init(void)
startprog32 = (void *)(u_long)addr;
CopyMem(startprog32, startprog32_start, startprog32_size);
- addr = EFI_ALLOCATE_MAX_ADDRESS;
- sz = EFI_SIZE_TO_PAGES(multiboot32_size);
- status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
- EfiLoaderData, sz, &addr);
- if (EFI_ERROR(status))
- panic("%s: AllocatePages() failed: %d page(s): %" PRIxMAX,
- __func__, sz, (uintmax_t)status);
- multiboot32 = (void *)(u_long)addr;
- CopyMem(multiboot32, multiboot32_start, multiboot32_size);
-
+ addr = EFI_ALLOCATE_MAX_ADDRESS;
+ sz = EFI_SIZE_TO_PAGES(multiboot32_size);
+ status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
+ EfiLoaderData, sz, &addr);
+ if (EFI_ERROR(status))
+ panic("%s: AllocatePages() failed: %d page(s): %" PRIxMAX,
+ __func__, sz, (uintmax_t)status);
+ multiboot32 = (void *)(u_long)addr;
+ CopyMem(multiboot32, multiboot32_start, multiboot32_size);
}
/* ARGSUSED */
