Module Name: src
Committed By: riastradh
Date: Sat Aug 24 20:23:12 UTC 2024
Modified Files:
src/sys/arch/i386/stand/lib: biosmemx.S bootinfo_memmap.c getextmemx.c
Log Message:
i386/stand/lib: Nix trailing whitespace and tidy comments a bit.
No functional change intended.
PR port-amd64/49470: NetBSD 7 BETA reboots after bootloader (HP 2133)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/stand/lib/biosmemx.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/lib/bootinfo_memmap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/getextmemx.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/lib/biosmemx.S
diff -u src/sys/arch/i386/stand/lib/biosmemx.S:1.12 src/sys/arch/i386/stand/lib/biosmemx.S:1.13
--- src/sys/arch/i386/stand/lib/biosmemx.S:1.12 Sat Aug 17 08:38:31 2024
+++ src/sys/arch/i386/stand/lib/biosmemx.S Sat Aug 24 20:23:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: biosmemx.S,v 1.12 2024/08/17 08:38:31 andvar Exp $ */
+/* $NetBSD: biosmemx.S,v 1.13 2024/08/24 20:23:11 riastradh Exp $ */
/*
* Copyright (c) 1997, 1999
@@ -91,18 +91,23 @@ ENTRY(getextmem2)
* buffer[2]: length (bytes)
* buffer[4]: type
* buffer[5]: ACPI 3.0 Extended Attributes bitfield (unused)
+ *
* Some buggy BIOSes may write to 24 bytes even if only 20 were requested.
* Therefore, the buffer is defined for 6 elements to avoid stack buffer
* overruns. See PR install/49470.
*
- * More details can be found in the
- * Advanced Configuration and Power Interface (ACPI) Specification, Release 6.5,
- * 2022-08-29, UEFI Forum, Inc.,
- * Sec. 15.1 `INT 15H E820H - Query System Address Map', pp. 756-757
- * https://uefi.org/sites/default/files/resources/ACPI_Spec_6_5_Aug29.pdf#page=824
- * https://uefi.org/specs/ACPI/6.5/15_System_Address_Map_Interfaces.html#int-15h-e820h-query-system-address-map
- * as well as OSDev.org wiki page
- * https://wiki.osdev.org/Detecting_Memory_(x86)#BIOS_Function:_INT_0x15,_EAX_=_0xE820.
+ * More details can be found in the:
+ *
+ * Advanced Configuration and Power Interface (ACPI)
+ * Specification, Release 6.5, 2022-08-29, UEFI Forum, Inc.,
+ * Sec. 15.1 `INT 15H E820H - Query System Address Map',
+ * pp. 756-757
+ * https://uefi.org/sites/default/files/resources/ACPI_Spec_6_5_Aug29.pdf#page=824
+ * https://uefi.org/specs/ACPI/6.5/15_System_Address_Map_Interfaces.html#int-15h-e820h-query-system-address-map
+ *
+ * as well as this OSDev.org wiki page:
+ *
+ * https://wiki.osdev.org/Detecting_Memory_(x86)#BIOS_Function:_INT_0x15,_EAX_=_0xE820
*/
ENTRY(getmementry)
pushl %ebp
Index: src/sys/arch/i386/stand/lib/bootinfo_memmap.c
diff -u src/sys/arch/i386/stand/lib/bootinfo_memmap.c:1.7 src/sys/arch/i386/stand/lib/bootinfo_memmap.c:1.8
--- src/sys/arch/i386/stand/lib/bootinfo_memmap.c:1.7 Sat Aug 17 08:38:31 2024
+++ src/sys/arch/i386/stand/lib/bootinfo_memmap.c Sat Aug 24 20:23:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo_memmap.c,v 1.7 2024/08/17 08:38:31 andvar Exp $ */
+/* $NetBSD: bootinfo_memmap.c,v 1.8 2024/08/24 20:23:11 riastradh Exp $ */
/*
* Copyright (c) 1999
@@ -37,9 +37,9 @@ extern int getmementry(int *, int *);
void
bi_getmemmap(void)
{
- /*
- * Allocate 6 words, not 5, to work around buggy firmware -- see comment
- * on getmementry in biosmemx.S.
+ /*
+ * Allocate 6 words, not 5, to work around buggy firmware --
+ * see comment on getmementry in biosmemx.S.
*/
int buf[6], i, nranges, n;
Index: src/sys/arch/i386/stand/lib/getextmemx.c
diff -u src/sys/arch/i386/stand/lib/getextmemx.c:1.11 src/sys/arch/i386/stand/lib/getextmemx.c:1.12
--- src/sys/arch/i386/stand/lib/getextmemx.c:1.11 Sat Aug 17 08:38:31 2024
+++ src/sys/arch/i386/stand/lib/getextmemx.c Sat Aug 24 20:23:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getextmemx.c,v 1.11 2024/08/17 08:38:31 andvar Exp $ */
+/* $NetBSD: getextmemx.c,v 1.12 2024/08/24 20:23:11 riastradh Exp $ */
/*
* Copyright (c) 1997, 1999
@@ -39,8 +39,8 @@ int
getextmemx(void)
{
/*
- * Allocate 6 words, not 5, to work around buggy firmware -- see comment
- * on getmementry in biosmemx.S.
+ * Allocate 6 words, not 5, to work around buggy firmware --
+ * see comment on getmementry in biosmemx.S.
*/
int buf[6], i;
int extmem = getextmem1();
