Changeset adec5b45 in mainline for kernel/arch/ppc32

Timestamp:

2012-01-27T22:19:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccd0aa

Parents:

d4673296

Message:

Rename hw_map() to km_map() and add protection flags argument
to make it more generic.

Location:

kernel/arch/ppc32/src

Files:

• drivers/pic.c (modified) (1 diff)
• ppc32.c (modified) (1 diff)

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

@@ -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

@@ -209 +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 */