Changeset 39539da in mainline

Timestamp:

2005-11-21T22:15:05Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8cd20b70

Parents:

db79676

Message:

Rename map_page_to_frame() to page_mapping_insert() and find_mapping() to page_mapping_find().
New names should make it more apparent that these two belong together.

Files:

• arch/amd64/src/mm/page.c (modified) (1 diff)
• arch/ia32/src/drivers/ega.c (modified) (1 diff)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• arch/mips32/src/mm/tlb.c (modified) (1 diff)
• genarch/src/acpi/acpi.c (modified) (1 diff)
• generic/include/mm/page.h (modified) (1 diff)
• generic/src/mm/page.c (modified) (4 diffs)
• generic/src/mm/vm.c (modified) (2 diffs)
• test/mm/mapping1/test.c (modified) (1 diff)

arch/amd64/src/mm/page.c

@@ -54 +54 @@
                  */
                 for (i = 0; i < config.memory_size/FRAME_SIZE; i++) {
-                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
                 }
 

arch/ia32/src/drivers/ega.c

@@ -50 +50 @@
         __u8 hi, lo;
 
-        map_page_to_frame(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
         outb(0x3d4,0xe);
         hi = inb(0x3d5);

arch/ia32/src/mm/page.c

@@ -57 +57 @@
                  */
                 for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
-                        map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
+                        page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
 
                 trap_register(14, page_fault);

arch/ia32/src/smp/smp.c

@@ -64 +64 @@
 
         if (config.cpu_count > 1) {             
-                map_page_to_frame((__address)l_apic, (__address)l_apic, 
+                page_mapping_insert((__address)l_apic, (__address)l_apic, 
                                   PAGE_NOT_CACHEABLE, 0);
-                map_page_to_frame((__address) io_apic,
+                page_mapping_insert((__address) io_apic,
                                   (__address) io_apic,
                                   PAGE_NOT_CACHEABLE, 0);

arch/mips32/src/mm/tlb.c

@@ -367 +367 @@
          * Handler cannot succeed if badvaddr has no mapping.
          */
-        pte = find_mapping(badvaddr, 0);
+        pte = page_mapping_find(badvaddr, 0);
         if (!pte) {
                 printf("No such mapping.\n");

genarch/src/acpi/acpi.c

@@ -80 +80 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-        map_page_to_frame((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
         map_structure((__address) sdt, sdt->length);
 }

generic/include/mm/page.h

@@ -108 +108 @@
 
 extern void page_init(void);
-extern void map_page_to_frame(__address page, __address frame, int flags, __address root);
-extern pte_t *find_mapping(__address page, __address root);
+extern void page_mapping_insert(__address page, __address frame, int flags, __address root);
+extern pte_t *page_mapping_find(__address page, __address root);
 extern void map_structure(__address s, size_t size);
 

generic/src/mm/page.c

@@ -38 +38 @@
 {
         page_arch_init();
-        map_page_to_frame(0x0, 0x0, PAGE_NOT_PRESENT, 0);
+        page_mapping_insert(0x0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -58 +58 @@
 
         for (i = 0; i < cnt; i++)
-                map_page_to_frame(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+                page_mapping_insert(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -72 +72 @@
  * @param root Explicit PTL0 address.
  */
-void map_page_to_frame(__address page, __address frame, int flags, __address root)
+void page_mapping_insert(__address page, __address frame, int flags, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -119 +119 @@
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *find_mapping(__address page, __address root)
+pte_t *page_mapping_find(__address page, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;

generic/src/mm/vm.c

@@ -162 +162 @@
         ASSERT(m->ptl0);
         for (i=0; i<a->size; i++)
-                map_page_to_frame(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
+                page_mapping_insert(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
                 
         spinlock_unlock(&a->lock);
@@ -180 +180 @@
         ASSERT(m->ptl0);
         for (i=0; i<a->size; i++)               
-                map_page_to_frame(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
+                page_mapping_insert(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
         
         spinlock_unlock(&a->lock);

test/mm/mapping1/test.c

@@ -56 +56 @@
         
         printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0));
-        map_page_to_frame(PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
+        page_mapping_insert(PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
         printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1));   
-        map_page_to_frame(PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
+        page_mapping_insert(PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
         
         printf("Value at virtual address %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0));