Changeset bd55bbb in mainline

Timestamp:

2006-05-21T20:17:17Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

48c1ef9

Parents:

cf464d1

Message:

Fixed mips to compile with fb (missing hw_map).
Fixed mips hw virt/phys addresses of fb.
Moved fb_init to post_mm, because it needs malloc().

Files:

• arch/mips32/src/console.c (modified) (2 diffs)
• arch/mips32/src/mips32.c (modified) (2 diffs)
• arch/mips32/src/mm/page.c (modified) (1 diff)
• generic/src/ipc/sysipc.c (modified) (1 diff)

arch/mips32/src/console.c

@@ -32 +32 @@
 #include <arch/drivers/serial.h>
 #include <arch/drivers/msim.h>
-#include <genarch/fb/fb.h>
 
 void console_init(void)
@@ -42 +41 @@
         } else {
                 msim_console();
-#ifdef CONFIG_FB
-                fb_init(0xb2000000, 640, 480, 24, 1920); // gxemul framebuffer
-#endif
         }
 }

arch/mips32/src/mips32.c

@@ -46 +46 @@
 #include <console/chardev.h>
 #include <arch/debugger.h>
+#include <genarch/fb/fb.h>
 
 #include <arch/asm/regname.h>
@@ -112 +113 @@
 void arch_post_mm_init(void)
 {
+#ifdef CONFIG_FB
+                fb_init(0x12000000, 640, 480, 24, 1920); // gxemul framebuffer
+#endif
 }
 

arch/mips32/src/mm/page.c

@@ -35 +35 @@
         page_mapping_operations = &pt_mapping_operations;
 }
+
+/** Map device into kernel space
+ * - on mips, all devices are already mapped into kernel space,
+ *   translate the physical address to uncached area
+ */
+__address hw_map(__address physaddr, size_t size)
+{
+        return physaddr + 0xa0000000;
+}

generic/src/ipc/sysipc.c

@@ -514 +514 @@
         /* Include phone address('id') of the caller in the request,
          * copy whole call->data, not only call->data.args */
-        STRUCT_TO_USPACE(calldata, &call->data);
+        if (STRUCT_TO_USPACE(calldata, &call->data)) {
+                return 0;
+        }
         return (__native)call;
 }