Changeset 7f1c620 in mainline for generic/src/main/main.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/main/main.c (modified) (5 diffs)

generic/src/main/main.c

@@ -102 +102 @@
  * appropriate sizes and addresses.
  */
-__address hardcoded_load_address = 0;   /**< Virtual address of where the kernel is loaded. */
+uintptr_t hardcoded_load_address = 0;   /**< Virtual address of where the kernel is loaded. */
 size_t hardcoded_ktext_size = 0;        /**< Size of the kernel code in bytes. */
 size_t hardcoded_kdata_size = 0;        /**< Size of the kernel data in bytes. */
@@ -133 +133 @@
 void main_bsp(void)
 {
-        __address stackaddr;
+        uintptr_t stackaddr;
 
         config.cpu_count = 1;
@@ -203 +203 @@
 
         version_print();
-        printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(__address) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
+        printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
 
         arch_pre_smp_init();
@@ -224 +224 @@
         
         for (i = 0; i < init.cnt; i++)
-                printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(__address) * 2, init.tasks[i].addr, i, init.tasks[i].size);
+                printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(uintptr_t) * 2, init.tasks[i].addr, i, init.tasks[i].size);
         
         ipc_init();
@@ -298 +298 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (__address) CPU->stack, CPU_STACK_SIZE);
+        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (uintptr_t) CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */