Changeset b5143bd in mainline for boot

Timestamp:

2015-06-06T01:50:56Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0453261

Parents:

94e46c9 (diff), 87a2f9b (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:

mainline changes

Location:

boot

Files:

• arch/arm32/src/mm.c (modified) (2 diffs)
• arch/ppc32/include/asm.h (modified) (1 diff)
• arch/sparc32/src/ambapp.c (modified) (3 diffs)
• arch/sparc32/src/mm.c (modified) (1 diff)
• generic/include/memstr.h (modified) (1 diff)

boot/arch/arm32/src/mm.c

@@ -193 +193 @@
 }
 
-static void enable_paging()
-{
-        /* c3   - each two bits controls access to the one of domains (16)
+static void enable_paging(void)
+{
+        /*
+         * c3   - each two bits controls access to the one of domains (16)
          * 0b01 - behave as a client (user) of a domain
          */
@@ -232 +233 @@
 
 /** Start the MMU - initialize page table and enable paging. */
-void mmu_start() {
+void mmu_start(void)
+{
         disable_paging();
 #ifdef PROCESSOR_ARCH_armv7_a

boot/arch/ppc32/include/asm.h

@@ -35 +35 @@
 extern void jump_to_kernel(void *, void *, size_t, void *)
     __attribute__((noreturn));
-extern void real_mode();
+extern void real_mode(void);
 
 #endif

boot/arch/sparc32/src/ambapp.c

@@ -58 +58 @@
 static void ambapp_scan_area(uintptr_t, unsigned int);
 
-void ambapp_scan()
+void ambapp_scan(void)
 {
         amba_fake = false;
@@ -104 +104 @@
 }
 
-void ambapp_qemu_fake_scan()
+void ambapp_qemu_fake_scan(void)
 {
         /* UART */
@@ -134 +134 @@
 }
 
-bool ambapp_fake()
+bool ambapp_fake(void)
 {
         return amba_fake;
 }
 
-void ambapp_print_devices()
+void ambapp_print_devices(void)
 {
         printf("ABMA devices:\n");

boot/arch/sparc32/src/mm.c

@@ -76 +76 @@
 }
 
-static void mmu_disable()
+static void mmu_disable(void)
 {
         uint32_t cr = asi_u32_read(ASI_MMUREGS, 0x000);

boot/generic/include/memstr.h

@@ -36 +36 @@
 
 extern void *memcpy(void *, const void *, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+    __attribute__((nonnull(1, 2)))
+    __attribute__((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memset(void *, int, size_t)
-    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
-extern void *memmove(void *, const void *, size_t);
+    __attribute__((nonnull(1)))
+    __attribute__((optimize("-fno-tree-loop-distribute-patterns")));
+extern void *memmove(void *, const void *, size_t)
+    __attribute__((nonnull(1, 2)));
 
 #endif