Changeset 2b50d7c in mainline for include

Timestamp:

2005-05-28T20:13:25Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

747a2476

Parents:

87cb9e2

Message:

IA-64 work.
Redefine FRAME_SIZE to "(16*1024)" instead of "2*4096". Note that the latter definition was wrong because of the lack of "()".
Take panic_printf(), cpu_halt() and memsetb() out of fake.s and implement them properly in asm.S.
Move ski_init_console() from arch_post_mm_init() to arch_pre_mm_init().
In start.S, write r0 to ar.bspstore.

Janitorial fixes.
Add count_t type.
Replace several occurrences of int and u32 by count_t or size_t.
Shorten several panic strings.

Location:

include

Files:

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

include/config.h

@@ -39 +39 @@
 struct config {
         __address base;
-        __u32 memory_size;
-        __u32 kernel_size;
+        size_t memory_size;
+        size_t kernel_size;
 
-        int cpu_count;
-        volatile int cpu_active;
+        count_t cpu_count;
+        volatile count_t cpu_active;
 };
 

include/mm/frame.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define FRAME_KA        1       /* skip frames conflicting with user address space */
 #define FRAME_PANIC     2       /* panic on failure */
 
-extern __u32 frames;
-extern __u32 frames_free;
+extern count_t frames;
+extern count_t frames_free;
 
-extern __u32 kernel_frames;
-extern __u32 kernel_frames_free;
+extern count_t kernel_frames;
+extern count_t kernel_frames_free;
 
 extern __u8 *frame_bitmap;
-extern __u32 frame_bitmap_octets;
+extern count_t frame_bitmap_octets;
 
 extern __u8 *frame_kernel_bitmap;

include/mm/heap.h

@@ -41 +41 @@
 };
 
-extern void heap_init(__address heap, __u32 size);
+extern void heap_init(__address heap, size_t size);
 
 extern void *malloc(size_t size);

include/typedefs.h

@@ -36 +36 @@
 
 typedef unsigned int size_t;
+typedef unsigned int count_t;
 
 typedef struct config config_t;