Changeset 7f1c620 in mainline for generic/include/mm/frame.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/frame.h (modified) (4 diffs)

generic/include/mm/frame.h

@@ -66 +66 @@
 #define FRAME_ERROR             2       /* frame_alloc return status */
 
-static inline __address PFN2ADDR(pfn_t frame)
+static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
-        return (__address)(frame << FRAME_WIDTH);
+        return (uintptr_t)(frame << FRAME_WIDTH);
 }
 
-static inline pfn_t ADDR2PFN(__address addr)
+static inline pfn_t ADDR2PFN(uintptr_t addr)
 {
         return (pfn_t)(addr >> FRAME_WIDTH);
@@ -83 +83 @@
 }
 
-#define IS_BUDDY_ORDER_OK(index, order)         ((~(((__native) -1) << (order)) & (index)) == 0)
+#define IS_BUDDY_ORDER_OK(index, order)         ((~(((unative_t) -1) << (order)) & (index)) == 0)
 #define IS_BUDDY_LEFT_BLOCK(zone, frame)        (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
 #define IS_BUDDY_RIGHT_BLOCK(zone, frame)       (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
@@ -92 +92 @@
 
 extern void frame_init(void);
-extern void * frame_alloc_generic(__u8 order, int flags, int *pzone);
-extern void frame_free(__address frame);
+extern void * frame_alloc_generic(uint8_t order, int flags, int *pzone);
+extern void frame_free(uintptr_t frame);
 extern void frame_reference_add(pfn_t pfn);
 
@@ -100 +100 @@
 void frame_set_parent(pfn_t frame, void *data, int hint);
 void frame_mark_unavailable(pfn_t start, count_t count);
-__address zone_conf_size(count_t count);
+uintptr_t zone_conf_size(count_t count);
 void zone_merge(int z1, int z2);
 void zone_merge_all(void);