Changeset 2b3dd78 in mainline for boot

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:

boot

Files:

• arch/arm32/include/arch/arch.h (modified) (1 diff)
• arch/mips32/include/arch/arch.h (modified) (1 diff)
• arch/ppc32/include/arch/arch.h (modified) (1 diff)
• arch/riscv64/include/arch/mm.h (modified) (1 diff)
• generic/include/printf.h (modified) (1 diff)
• generic/include/printf_verify.h (modified) (1 diff)

boot/arch/arm32/include/arch/arch.h

@@ -55 +55 @@
 
 #ifdef MACHINE_beagleboardxm
-        #define PA_OFFSET 0
+#define PA_OFFSET 0
 #elif defined MACHINE_beaglebone
-        #define PA_OFFSET 0
+#define PA_OFFSET 0
 #else
-        #define PA_OFFSET 0x80000000
+#define PA_OFFSET 0x80000000
 #endif
 
 #ifndef __ASM__
-        #define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
+#define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
 #else
-        #define PA2KA(addr)  ((addr) + PA_OFFSET)
+#define PA2KA(addr)  ((addr) + PA_OFFSET)
 #endif
 

boot/arch/mips32/include/arch/arch.h

@@ -56 +56 @@
 
 #ifndef __ASM__
-        #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
-        #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
-        #define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
-        #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
+#define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+#define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
+#define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
+#define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
 #else
-        #define PA2KA(addr)    ((addr) + 0x80000000)
-        #define KSEG2PA(addr)  ((addr) - 0xa0000000)
+#define PA2KA(addr)    ((addr) + 0x80000000)
+#define KSEG2PA(addr)  ((addr) - 0xa0000000)
 #endif
 

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

@@ -38 +38 @@
 
 #ifndef __ASM__
-        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
 #else
-        #define PA2KA(addr)  ((addr) + 0x80000000)
+#define PA2KA(addr)  ((addr) + 0x80000000)
 #endif
 

boot/arch/riscv64/include/arch/mm.h

@@ -34 +34 @@
 
 #ifndef __ASM__
-        #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
-        #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 #else
-        #define KA2PA(x)  ((x) - 0xffff800000000000)
-        #define PA2KA(x)  ((x) + 0xffff800000000000)
+#define KA2PA(x)  ((x) - 0xffff800000000000)
+#define PA2KA(x)  ((x) + 0xffff800000000000)
 #endif
 

boot/generic/include/printf.h

@@ -41 +41 @@
 extern int puts(const char *);
 extern int printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 

boot/generic/include/printf_verify.h

@@ -33 +33 @@
 #define BOOT_PRINTF_VERIFY_H_
 
-#ifndef NVERIFY_PRINTF
+#ifndef _HELENOS_NVERIFY_PRINTF
 
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(gnu_printf, start, end)))
 
-#else /* NVERIFY_PRINTF */
+#else /* _HELENOS_NVERIFY_PRINTF */
 
-#define PRINTF_ATTRIBUTE(start, end)
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
 
-#endif /* NVERIFY_PRINTF */
+#endif /* _HELENOS_NVERIFY_PRINTF */
 
 #endif