Module Name: src
Committed By: riastradh
Date: Sun May 14 09:07:54 UTC 2023
Modified Files:
src/sys/arch/i386/stand/efiboot: boot.c efidisk.c efimemory.c
src/sys/arch/i386/stand/efiboot/bootia32: efibootia32.c
Log Message:
x86/efiboot: Nix trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/efiboot/efidisk.c \
src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.6 -r1.7 \
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.22 src/sys/arch/i386/stand/efiboot/boot.c:1.23
--- src/sys/arch/i386/stand/efiboot/boot.c:1.22 Thu Apr 20 00:42:24 2023
+++ src/sys/arch/i386/stand/efiboot/boot.c Sun May 14 09:07:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.22 2023/04/20 00:42:24 manu Exp $ */
+/* $NetBSD: boot.c,v 1.23 2023/05/14 09:07:54 riastradh 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/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.9 src/sys/arch/i386/stand/efiboot/efidisk.c:1.10
--- 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 Sun May 14 09:07:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.9 2019/12/17 01:37:52 manu Exp $ */
+/* $NetBSD: efidisk.c,v 1.10 2023/05/14 09:07:54 riastradh 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.10
--- 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 Sun May 14 09:07:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efimemory.c,v 1.9 2019/09/13 02:19:45 manu Exp $ */
+/* $NetBSD: efimemory.c,v 1.10 2023/05/14 09:07:54 riastradh 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.6 src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.7
--- src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.6 Thu Apr 20 00:42:24 2023
+++ src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c Sun May 14 09:07:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efibootia32.c,v 1.6 2023/04/20 00:42:24 manu Exp $ */
+/* $NetBSD: efibootia32.c,v 1.7 2023/05/14 09:07:54 riastradh Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <non...@netbsd.org>
@@ -60,7 +60,7 @@ efi_md_init(void)
addr = EFI_ALLOCATE_MAX_ADDRESS;
sz = EFI_SIZE_TO_PAGES(multiboot32_size);
status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
- EfiLoaderData, sz, &addr);
+ EfiLoaderData, sz, &addr);
if (EFI_ERROR(status))
panic("%s: AllocatePages() failed: %d page(s): %" PRIxMAX,
__func__, sz, (uintmax_t)status);
