Changeset 7f1c620 in mainline for generic/include/mm/as.h

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• generic/include/mm/as.h (modified) (5 diffs)

generic/include/mm/as.h

@@ -124 +124 @@
 /** Address space area backend structure. */
 typedef struct {
-        int (* page_fault)(as_area_t *area, __address addr, pf_access_t access);
-        void (* frame_free)(as_area_t *area, __address page, __address frame);
+        int (* page_fault)(as_area_t *area, uintptr_t addr, pf_access_t access);
+        void (* frame_free)(as_area_t *area, uintptr_t page, uintptr_t frame);
         void (* share)(as_area_t *area);
 } mem_backend_t;
@@ -136 +136 @@
         };
         struct {        /**< phys_backend members */
-                __address base;
+                uintptr_t base;
                 count_t frames;
         };
@@ -152 +152 @@
         int attributes;         /**< Attributes related to the address space area itself. */
         count_t pages;          /**< Size of this area in multiples of PAGE_SIZE. */
-        __address base;         /**< Base address of this area. */
+        uintptr_t base;         /**< Base address of this area. */
         btree_t used_space;     /**< Map of used space. */
         share_info_t *sh_info;  /**< If the address space area has been shared, this pointer will
@@ -173 +173 @@
 extern void as_destroy(as_t *as);
 extern void as_switch(as_t *old, as_t *new);
-extern int as_page_fault(__address page, pf_access_t access, istate_t *istate);
-
-extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base, int attrs,
+extern int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate);
+
+extern as_area_t *as_area_create(as_t *as, int flags, size_t size, uintptr_t base, int attrs,
         mem_backend_t *backend, mem_backend_data_t *backend_data);
-extern int as_area_destroy(as_t *as, __address address);        
-extern int as_area_resize(as_t *as, __address address, size_t size, int flags);
-int as_area_share(as_t *src_as, __address src_base, size_t acc_size,
-                  as_t *dst_as, __address dst_base, int dst_flags_mask);
+extern int as_area_destroy(as_t *as, uintptr_t address);        
+extern int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags);
+int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
+                  as_t *dst_as, uintptr_t dst_base, int dst_flags_mask);
 
 extern int as_area_get_flags(as_area_t *area);
 extern bool as_area_check_access(as_area_t *area, pf_access_t access);
-extern size_t as_get_size(__address base);
-extern int used_space_insert(as_area_t *a, __address page, count_t count);
-extern int used_space_remove(as_area_t *a, __address page, count_t count);
+extern size_t as_get_size(uintptr_t base);
+extern int used_space_insert(as_area_t *a, uintptr_t page, count_t count);
+extern int used_space_remove(as_area_t *a, uintptr_t page, count_t count);
 
 /* Interface to be implemented by architectures. */
@@ -199 +199 @@
 
 /* Address space area related syscalls. */
-extern __native sys_as_area_create(__address address, size_t size, int flags);
-extern __native sys_as_area_resize(__address address, size_t size, int flags);
-extern __native sys_as_area_destroy(__address address);
+extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags);
+extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags);
+extern unative_t sys_as_area_destroy(uintptr_t address);
 
 #endif /* KERNEL */