Changeset 3f7fe9e in mainline for boot

Timestamp:

2018-10-01T18:36:42Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5cef315

Parents:

1938b381

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-29 16:13:55)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-10-01 18:36:42)

Message:

Clean up headers

Depends on <limits.h> and <stdint.h> being provided, which is a step up from
depending on mostly undocumented predefined macros.
In principle, <limits.h> and <stdint.h> mostly describe properties of
the compiler, so even though we depend on certain values for their contents,
actually defining them in the library is kind of reversal of concerns.

Location:

boot

Files:

• arch/arm32/src/main.c (modified) (1 diff)
• arch/arm32/src/mm.c (modified) (1 diff)
• arch/mips32/src/main.c (modified) (1 diff)
• arch/ppc32/include/arch/main.h (modified) (1 diff)
• arch/ppc32/src/main.c (modified) (1 diff)
• arch/riscv64/src/main.c (modified) (2 diffs)
• arch/sparc64/include/arch/main.h (modified) (1 diff)
• genarch/include/genarch/ofw.h (modified) (1 diff)
• generic/include/stdint.h (deleted)

boot/arch/arm32/src/main.c

@@ -35 +35 @@
 
 #include <arch/main.h>
+#include <arch/types.h>
 #include <arch/asm.h>
 #include <arch/mm.h>

boot/arch/arm32/src/mm.c

@@ -38 +38 @@
 #include <arch/mm.h>
 #include <arch/cp15.h>
+#include <arch/types.h>
 
 #ifdef PROCESSOR_ARCH_armv7_a

boot/arch/mips32/src/main.c

@@ -30 +30 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
+#include <arch/types.h>
 #include <halt.h>
 #include <printf.h>

boot/arch/ppc32/include/arch/main.h

@@ -33 +33 @@
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
+#include <arch/types.h>
 
 typedef struct {

boot/arch/ppc32/src/main.c

@@ -30 +30 @@
 #include <arch/arch.h>
 #include <arch/asm.h>
+#include <arch/types.h>
 #include <genarch/ofw.h>
 #include <genarch/ofw_tree.h>

boot/arch/riscv64/src/main.c

@@ -32 +32 @@
 #include <arch/ucb.h>
 #include <arch/mm.h>
+#include <arch/types.h>
 #include <version.h>
 #include <stddef.h>
@@ -64 +65 @@
         bootinfo.memmap.zones[0].size = PHYSMEM_SIZE;
 
-        printf("\nMemory statistics (total %llu MB, starting at %p)\n\n",
+        printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n\n",
             bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start);
         printf(" %p: boot info structure\n", &bootinfo);

boot/arch/sparc64/include/arch/main.h

@@ -33 +33 @@
 #include <balloc.h>
 #include <genarch/ofw_tree.h>
+#include <arch/types.h>
 
 typedef struct {

boot/genarch/include/genarch/ofw.h

@@ -33 +33 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <_bits/native.h>
 
 #define MEMMAP_MAX_RECORDS  32