Changeset 98000fb in mainline for kernel/generic/include/mm/frame.h

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

File:

• kernel/generic/include/mm/frame.h (modified) (6 diffs)

kernel/generic/include/mm/frame.h

@@ -81 +81 @@
 
 typedef struct {
-        count_t refcount;     /**< Tracking of shared frames */
+        size_t refcount;     /**< Tracking of shared frames */
         uint8_t buddy_order;  /**< Buddy system block order */
         link_t buddy_link;    /**< Link to the next free block inside
@@ -91 +91 @@
         pfn_t base;                    /**< Frame_no of the first frame
                                         in the frames array */
-        count_t count;                 /**< Size of zone */
-        count_t free_count;            /**< Number of free frame_t
+        size_t count;                 /**< Size of zone */
+        size_t free_count;            /**< Number of free frame_t
                                         structures */
-        count_t busy_count;            /**< Number of busy frame_t
+        size_t busy_count;            /**< Number of busy frame_t
                                         structures */
         zone_flags_t flags;            /**< Type of the zone */
@@ -109 +109 @@
 typedef struct {
         SPINLOCK_DECLARE(lock);
-        count_t count;
+        size_t count;
         zone_t info[ZONES_MAX];
 } zones_t;
@@ -125 +125 @@
 }
 
-static inline count_t SIZE2FRAMES(size_t size)
+static inline size_t SIZE2FRAMES(size_t size)
 {
         if (!size)
                 return 0;
-        return (count_t) ((size - 1) >> FRAME_WIDTH) + 1;
+        return (size_t) ((size - 1) >> FRAME_WIDTH) + 1;
 }
 
-static inline size_t FRAMES2SIZE(count_t frames)
+static inline size_t FRAMES2SIZE(size_t frames)
 {
         return (size_t) (frames << FRAME_WIDTH);
@@ -157 +157 @@
 
 extern void frame_init(void);
-extern void *frame_alloc_generic(uint8_t, frame_flags_t, count_t *);
+extern void *frame_alloc_generic(uint8_t, frame_flags_t, size_t *);
 extern void frame_free(uintptr_t);
 extern void frame_reference_add(pfn_t);
 
-extern count_t find_zone(pfn_t frame, count_t count, count_t hint);
-extern count_t zone_create(pfn_t, count_t, pfn_t, zone_flags_t);
-extern void *frame_get_parent(pfn_t, count_t);
-extern void frame_set_parent(pfn_t, void *, count_t);
-extern void frame_mark_unavailable(pfn_t, count_t);
-extern uintptr_t zone_conf_size(count_t);
-extern bool zone_merge(count_t, count_t);
+extern size_t find_zone(pfn_t frame, size_t count, size_t hint);
+extern size_t zone_create(pfn_t, size_t, pfn_t, zone_flags_t);
+extern void *frame_get_parent(pfn_t, size_t);
+extern void frame_set_parent(pfn_t, void *, size_t);
+extern void frame_mark_unavailable(pfn_t, size_t);
+extern uintptr_t zone_conf_size(size_t);
+extern bool zone_merge(size_t, size_t);
 extern void zone_merge_all(void);
 extern uint64_t zone_total_size(void);
@@ -175 +175 @@
  */
 extern void zone_print_list(void);
-extern void zone_print_one(count_t);
+extern void zone_print_one(size_t);
 
 #endif