[haiku-commits] r39189 - in haiku/trunk: headers/private/kernel/arch/m68k src/system/kernel/arch/m68k

• From: revol@xxxxxxx
• To: haiku-commits@xxxxxxxxxxxxx
• Date: Sat, 30 Oct 2010 03:33:50 +0200 (CEST)

Author: mmu_man
Date: 2010-10-30 03:33:50 +0200 (Sat, 30 Oct 2010)
New Revision: 39189
Changeset: http://dev.haiku-os.org/changeset/39189

Modified:
   haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h
   haiku/trunk/headers/private/kernel/arch/m68k/arch_vm_translation_map.h
   haiku/trunk/src/system/kernel/arch/m68k/arch_real_time_clock.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_thread.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_vm.cpp
   haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
Log:
Partial build fix. Still a lot to do to catch up with Ingo...


Modified: haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h      2010-10-29 
16:21:49 UTC (rev 39188)
+++ haiku/trunk/headers/private/kernel/arch/m68k/arch_vm.h      2010-10-30 
01:33:50 UTC (rev 39189)
@@ -5,7 +5,7 @@
 #ifndef ARCH_M68K_VM_H
 #define ARCH_M68K_VM_H
 
-#include <vm/vm_translation_map.h>
+#include <vm/VMTranslationMap.h>
 
 /* This many pages will be read/written on I/O if possible */
 
@@ -16,9 +16,9 @@
 
 
 struct m68k_vm_ops {
-       void *(*m68k_translation_map_get_pgdir)(vm_translation_map *map);
-       status_t (*arch_vm_translation_map_init_map)(vm_translation_map *map, 
bool kernel);
-       status_t 
(*arch_vm_translation_map_init_kernel_map_post_sem)(vm_translation_map *map);
+       void *(*m68k_translation_map_get_pgdir)(VMTranslationMap *map);
+       status_t (*arch_vm_translation_map_init_map)(VMTranslationMap *map, 
bool kernel);
+       status_t 
(*arch_vm_translation_map_init_kernel_map_post_sem)(VMTranslationMap *map);
        status_t (*arch_vm_translation_map_init)(kernel_args *args);
        status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args);
        status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args);
@@ -42,7 +42,7 @@
 
 extern struct m68k_vm_ops *get_vm_ops();
 
-extern void *m68k_translation_map_get_pgdir(vm_translation_map *map);
+extern void *m68k_translation_map_get_pgdir(VMTranslationMap *map);
 extern void m68k_set_pgdir(void *rt);
 
 #ifdef __cplusplus

Modified: haiku/trunk/headers/private/kernel/arch/m68k/arch_vm_translation_map.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/m68k/arch_vm_translation_map.h      
2010-10-29 16:21:49 UTC (rev 39188)
+++ haiku/trunk/headers/private/kernel/arch/m68k/arch_vm_translation_map.h      
2010-10-30 01:33:50 UTC (rev 39189)
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-void m68k_translation_map_change_asid(vm_translation_map *map);
+void m68k_translation_map_change_asid(VMTranslationMap *map);
 
 status_t m68k_map_address_range(addr_t virtualAddress,
        phys_addr_t physicalAddress, size_t size);

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_real_time_clock.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_real_time_clock.cpp    
2010-10-29 16:21:49 UTC (rev 39188)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_real_time_clock.cpp    
2010-10-30 01:33:50 UTC (rev 39189)
@@ -10,6 +10,7 @@
 #include <arch/real_time_clock.h>
 
 #include <arch_platform.h>
+#include <boot/kernel_args.h>
 #include <real_time_clock.h>
 #include <real_time_data.h>
 #include <smp.h>

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_thread.cpp     2010-10-29 
16:21:49 UTC (rev 39188)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_thread.cpp     2010-10-30 
01:33:50 UTC (rev 39189)
@@ -82,7 +82,7 @@
 
        for (i = thread->arch_info.iframes.index - 1; i >= 0; i--) {
                struct iframe *frame = thread->arch_info.iframes.frames[i];
-               if (frame->cpu.sr & (1 << M68K_SR_S) == 0)
+               if ((frame->cpu.sr & (1 << M68K_SR_S)) == 0)
                        return frame;
        }
 
@@ -101,18 +101,18 @@
                }
                // switching to a new address space
                return m68k_translation_map_get_pgdir(
-                       &to->team->address_space->TranslationMap());
+                       to->team->address_space->TranslationMap());
        } else if (from->team->address_space == NULL && to->team->address_space 
== NULL) {
                // they must both be kernel space threads
                return NULL;
        } else if (to->team->address_space == NULL) {
                // the one we're switching to is kernel space
                return m68k_translation_map_get_pgdir(
-                       &VMAddressSpace::Kernel()->TranslationMap());
+                       VMAddressSpace::Kernel()->TranslationMap());
        }
 
        return m68k_translation_map_get_pgdir(
-               &to->team->address_space->TranslationMap());
+               to->team->address_space->TranslationMap());
 }
 
 // #pragma mark -

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_vm.cpp 2010-10-29 16:21:49 UTC 
(rev 39188)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_vm.cpp 2010-10-30 01:33:50 UTC 
(rev 39189)
@@ -106,7 +106,7 @@
 void
 arch_vm_aspace_swap(struct VMAddressSpace *from, struct VMAddressSpace *to)
 {
-       m68k_set_pgdir(m68k_translation_map_get_pgdir(&to->TranslationMap()));
+       m68k_set_pgdir(m68k_translation_map_get_pgdir(to->TranslationMap()));
 }
 
 

Modified: haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp 
2010-10-29 16:21:49 UTC (rev 39188)
+++ haiku/trunk/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp 
2010-10-30 01:33:50 UTC (rev 39189)
@@ -61,7 +61,7 @@
 }
 
 void *
-m68k_translation_map_get_pgdir(vm_translation_map *map)
+m68k_translation_map_get_pgdir(VMTranslationMap *map)
 {
        return get_vm_ops()->m68k_translation_map_get_pgdir(map);
 }
@@ -71,14 +71,14 @@
 
 
 status_t
-arch_vm_translation_map_init_map(vm_translation_map *map, bool kernel)
+arch_vm_translation_map_init_map(VMTranslationMap *map, bool kernel)
 {
        return get_vm_ops()->arch_vm_translation_map_init_map(map, kernel);
 }
 
 
 status_t
-arch_vm_translation_map_init_kernel_map_post_sem(vm_translation_map *map)
+arch_vm_translation_map_init_kernel_map_post_sem(VMTranslationMap *map)
 {
        return 
get_vm_ops()->arch_vm_translation_map_init_kernel_map_post_sem(map);
 }

Other related posts:

• » [haiku-commits] r39189 - in haiku/trunk: headers/private/kernel/arch/m68k src/system/kernel/arch/m68k - revol

1. Home
2. haiku-commits
3. Archive
4. 10-2010

---

• » Previous by Date
• » Next by Date
• » Related Posts
• » View list details
• » Manage your subscription

---