Changeset 7f1c620 in mainline for generic/src/mm/frame.c

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/src/mm/frame.c (modified) (19 diffs)

generic/src/mm/frame.c

@@ -70 +70 @@
 typedef struct {
         count_t refcount;       /**< tracking of shared frames  */
-        __u8 buddy_order;       /**< buddy system block order */
+        uint8_t buddy_order;    /**< buddy system block order */
         link_t buddy_link;      /**< link to the next free block inside one order */
         void *parent;           /**< If allocated by slab, this points there */
@@ -218 +218 @@
 
 /** @return True if zone can allocate specified order */
-static int zone_can_alloc(zone_t *z, __u8 order)
+static int zone_can_alloc(zone_t *z, uint8_t order)
 {
         return buddy_system_can_alloc(z->buddy_system, order);
@@ -231 +231 @@
  * @param pzone Pointer to preferred zone or NULL, on return contains zone number
  */
-static zone_t * find_free_zone_lock(__u8 order, int *pzone)
+static zone_t * find_free_zone_lock(uint8_t order, int *pzone)
 {
         int i;
@@ -272 +272 @@
  */
 static link_t *zone_buddy_find_block(buddy_system_t *b, link_t *child,
-                                     __u8 order)
+                                     uint8_t order)
 {
         frame_t * frame;
@@ -381 +381 @@
  * @param order Order to set
  */
-static void zone_buddy_set_order(buddy_system_t *b, link_t * block, __u8 order) {
+static void zone_buddy_set_order(buddy_system_t *b, link_t * block, uint8_t order) {
         frame_t * frame;
         frame = list_get_instance(block, frame_t, buddy_link);
@@ -394 +394 @@
  * @return Order of block
  */
-static __u8 zone_buddy_get_order(buddy_system_t *b, link_t * block) {
+static uint8_t zone_buddy_get_order(buddy_system_t *b, link_t * block) {
         frame_t * frame;
         frame = list_get_instance(block, frame_t, buddy_link);
@@ -451 +451 @@
  *
  */
-static pfn_t zone_frame_alloc(zone_t *zone, __u8 order)
+static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
         pfn_t v;
@@ -484 +484 @@
 {
         frame_t *frame;
-        __u8 order;
+        uint8_t order;
 
         frame = &zone->frames[frame_idx];
@@ -538 +538 @@
 static void _zone_merge(zone_t *z, zone_t *z1, zone_t *z2)
 {
-        __u8 max_order;
+        uint8_t max_order;
         int i, z2idx;
         pfn_t frame_idx;
@@ -625 +625 @@
         int i;
 
-        pfn = ADDR2PFN((__address)KA2PA(oldzone));
+        pfn = ADDR2PFN((uintptr_t)KA2PA(oldzone));
         cframes = SIZE2FRAMES(zone_conf_size(oldzone->count));
         
@@ -654 +654 @@
 {
         count_t i;
-        __u8 order;
+        uint8_t order;
         frame_t *frame;
         
@@ -690 +690 @@
         zone_t *zone1, *zone2, *newzone;
         int cframes;
-        __u8 order;
+        uint8_t order;
         int i;
         pfn_t pfn;
@@ -780 +780 @@
 {
         int i;
-        __u8 max_order;
+        uint8_t max_order;
 
         spinlock_initialize(&z->lock, "zone_lock");
@@ -818 +818 @@
  * @return Size of zone configuration info (in bytes)
  */
-__address zone_conf_size(count_t count)
+uintptr_t zone_conf_size(count_t count)
 {
         int size = sizeof(zone_t) + count*sizeof(frame_t);
@@ -846 +846 @@
 {
         zone_t *z;
-        __address addr;
+        uintptr_t addr;
         count_t confcount;
         int i;
@@ -932 +932 @@
  *
  */
-void * frame_alloc_generic(__u8 order, int flags, int *pzone) 
+void * frame_alloc_generic(uint8_t order, int flags, int *pzone) 
 {
         ipl_t ipl;
@@ -991 +991 @@
  * @param Frame Physical Address of of the frame to be freed.
  */
-void frame_free(__address frame)
+void frame_free(uintptr_t frame)
 {
         ipl_t ipl;
@@ -1100 +1100 @@
                 zone = zones.info[i];
                 spinlock_lock(&zone->lock);
-                printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(__address) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
+                printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(uintptr_t) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
                 spinlock_unlock(&zone->lock);
         }
@@ -1132 +1132 @@
         spinlock_lock(&zone->lock);
         printf("Memory zone information\n");
-        printf("Zone base address: %#.*p\n", sizeof(__address) * 2, PFN2ADDR(zone->base));
+        printf("Zone base address: %#.*p\n", sizeof(uintptr_t) * 2, PFN2ADDR(zone->base));
         printf("Zone size: %zd frames (%zdK)\n", zone->count, ((zone->count) * FRAME_SIZE) >> 10);
         printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);