Changeset b3f8fb7 in mainline for kernel/arch/ia64/src

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

Location:

kernel/arch/ia64/src

Files:

• ddi/ddi.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/tlb.c (modified) (1 diff)
• mm/vhpt.c (modified) (3 diffs)
• ski/ski.c (modified) (1 diff)

kernel/arch/ia64/src/ddi/ddi.c

@@ -36 +36 @@
 #include <proc/task.h>
 #include <arch/types.h>
-#include <typedefs.h>
 
 /** Enable I/O space range for task.

kernel/arch/ia64/src/mm/page.c

@@ -40 +40 @@
 #include <arch/mm/vhpt.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <print.h>
 #include <mm/page.h>

kernel/arch/ia64/src/mm/tlb.c

@@ -48 +48 @@
 #include <arch/pal/pal.h>
 #include <arch/asm.h>
-#include <typedefs.h>
 #include <panic.h>
 #include <print.h>

kernel/arch/ia64/src/mm/vhpt.c

@@ -33 +33 @@
 */
 
+#include <memstr.h>
 #include <arch/mm/vhpt.h>
 #include <mm/frame.h>
@@ -41 +42 @@
 uintptr_t vhpt_set_up(void)
 {
-        vhpt_base = frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA | FRAME_ATOMIC);
-        if(!vhpt_base) 
+        vhpt_base = frame_alloc(VHPT_WIDTH - FRAME_WIDTH, FRAME_KA | FRAME_ATOMIC);
+        if (!vhpt_base) 
                 panic("Kernel configured with VHPT but no memory for table.");
         vhpt_invalidate_all();
@@ -62 +63 @@
         rid = ASID2RID(asid, vrn);
                                                                                                                                                                                                                                 
-  rr_save.word = rr_read(vrn);
-  rr.word = rr_save.word;
-  rr.map.rid = rid;
-  rr_write(vrn, rr.word);
-  srlz_i();
+        rr_save.word = rr_read(vrn);
+        rr.word = rr_save.word;
+        rr.map.rid = rid;
+        rr_write(vrn, rr.word);
+        srlz_i();
         
         ventry = (vhpt_entry_t *) thash(va);
-  tag = ttag(va);
-  rr_write(vrn, rr_save.word);
-  srlz_i();
-  srlz_d();
+        tag = ttag(va);
+        rr_write(vrn, rr_save.word);
+        srlz_i();
+        srlz_d();
 
-        ventry->word[0]=entry.word[0];
-        ventry->word[1]=entry.word[1];
+        ventry->word[0] = entry.word[0];
+        ventry->word[1] = entry.word[1];
         ventry->present.tag.tag_word = tag;
-        
-
 }
 
 void vhpt_invalidate_all()
 {
-        memsetb((uintptr_t)vhpt_base,1<<VHPT_WIDTH,0);
+        memsetb((uintptr_t) vhpt_base, 1 << VHPT_WIDTH, 0);
 }
 

kernel/arch/ia64/src/ski/ski.c

@@ -39 +39 @@
 #include <sysinfo/sysinfo.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <ddi/device.h>
 #include <ddi/irq.h>