Changeset 42744880 in mainline for generic/include

Timestamp:

2006-02-08T22:29:20Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

85dc2e7

Parents:

89298e3

Message:

Convert size_t, count_t and index_t to 64-bits on 64-bit architectures.
Change some pfn_t usages to count_t, size_t and index_t.

Location:

generic/include

Files:

• config.h (modified) (2 diffs)
• mm/frame.h (modified) (2 diffs)
• typedefs.h (modified) (1 diff)

generic/include/config.h

@@ -37 +37 @@
 
 #define CONFIG_MEMORY_SIZE      (8*1024*1024)
-#define CONFIG_HEAP_SIZE        (300*1024)
 #define CONFIG_STACK_SIZE       STACK_SIZE
 
@@ -50 +49 @@
         size_t init_size;
         
-        __address heap_addr;
-        size_t heap_size;
-        size_t heap_delta;            /**< Extra space between heap and stack (enforced by alignment requirements) */
-        
-        size_t kernel_size;           /**< Size of memory in bytes taken by kernel, heap and stack */
+        size_t kernel_size;           /**< Size of memory in bytes taken by kernel and stack */
 };
 

generic/include/mm/frame.h

@@ -75 +75 @@
 }
 
-static inline pfn_t SIZE2PFN(__address size)
+static inline count_t SIZE2FRAMES(size_t size)
 {
         if (!size)
                 return 0;
-        return (pfn_t)((size-1) >> FRAME_WIDTH)+1;
+        return (count_t)((size-1) >> FRAME_WIDTH)+1;
 }
 
@@ -96 +96 @@
 extern void frame_free(__address addr);
 
-extern void zone_create(pfn_t start, pfn_t count, pfn_t confframe, int flags);
+extern void zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);
 
 void * frame_get_parent(pfn_t frame, int hint);
 void frame_set_parent(pfn_t frame, void *data, int hint);
-void frame_mark_unavailable(pfn_t start, pfn_t count);
-__address zone_conf_size(pfn_t start, pfn_t count);
+void frame_mark_unavailable(pfn_t start, count_t count);
+__address zone_conf_size(pfn_t start, count_t count);
 
 /*

generic/include/typedefs.h

@@ -35 +35 @@
 typedef short bool;
 
-typedef unsigned int size_t;
-typedef unsigned int count_t;
-typedef unsigned int index_t;
+typedef unsigned long size_t;
+typedef unsigned long count_t;
+typedef unsigned long index_t;
 
 typedef struct config config_t;