Changeset bf3dd35 in mainline

Timestamp:

2012-01-31T22:03:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

03cdd2b

Parents:

20de14d

Message:

There is no need to have km_map() for aligned addresses and
km_map_structure() for unaligned addresses.

• Make km_map() static and rename it to km_map_aligned().
• Rename km_map_structure() to km_map().

Location:

kernel

Files:

• genarch/src/acpi/acpi.c (modified) (1 diff)
• generic/include/mm/km.h (modified) (1 diff)
• generic/src/mm/km.c (modified) (2 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -102 +102 @@
 
         /* Start with mapping the header only. */
-        vhdr = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+        vhdr = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
             sizeof(struct acpi_sdt_header), PAGE_READ | PAGE_NOT_CACHEABLE); 
 
         /* Now we can map the entire structure. */
-        vsdt = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+        vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
             vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         

kernel/generic/include/mm/km.h

@@ -50 +50 @@
 
 extern uintptr_t km_map(uintptr_t, size_t, unsigned int);
-extern uintptr_t km_map_structure(uintptr_t, size_t, unsigned int);
 
 extern uintptr_t km_temporary_page_get(uintptr_t *, frame_flags_t);

kernel/generic/src/mm/km.c

@@ -124 +124 @@
 }
 
-uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
+static uintptr_t
+km_map_aligned(uintptr_t paddr, size_t size, unsigned int flags)
 {
         uintptr_t vaddr;
@@ -145 +146 @@
 }
 
-uintptr_t km_map_structure(uintptr_t paddr, size_t size, unsigned int flags)
+uintptr_t km_map(uintptr_t paddr, size_t size, unsigned int flags)
 {
         size_t offs = paddr - ALIGN_DOWN(paddr, FRAME_SIZE); 
         uintptr_t page;
 
-        page = km_map(ALIGN_DOWN(paddr, FRAME_SIZE), size + offs, flags);
+        page = km_map_aligned(ALIGN_DOWN(paddr, FRAME_SIZE), size + offs,
+            flags);
         return page + offs;
 }