Changeset 9970a5a in mainline for kernel/arch/ppc32/src

Timestamp:

2012-01-27T23:24:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b3b571, fe56c08a

Parents:

d81eaf94 (diff), 221c9ec (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 from lp:~jakub/helenos/mm.

Location:

kernel/arch/ppc32/src

Files:

• drivers/pic.c (modified) (2 diffs)
• ppc32.c (modified) (3 diffs)

kernel/arch/ppc32/src/drivers/pic.c

@@ -34 +34 @@
 
 #include <arch/drivers/pic.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <byteorder.h>
 #include <bitops.h>
@@ -42 +42 @@
 void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg)
 {
-        pic = (uint32_t *) hw_map(base, size);
+        pic = (uint32_t *) km_map(base, size, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         *cir = pic_ack_interrupt;
         *cir_arg = NULL;

kernel/arch/ppc32/src/ppc32.c

@@ -46 +46 @@
 #include <userspace.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <abi/proc/uarg.h>
 #include <console/console.h>
@@ -71 +72 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -208 +209 @@
                 size_t size = 2 * PAGE_SIZE;
                 
-                cuda_t *cuda = (cuda_t *)
-                    (hw_map(aligned_addr, offset + size) + offset);
+                cuda_t *cuda = (cuda_t *) (km_map(aligned_addr, offset + size,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
                 
                 /* Initialize I/O controller */