Changeset 98000fb in mainline for kernel/generic/src/main

Timestamp:

2009-06-03T19:34:45Z (17 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)

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (3 diffs)

kernel/generic/src/main/kinit.c

@@ -128 +128 @@
         
         if (config.cpu_count > 1) {
-                count_t i;
+                size_t i;
                 
                 /*
@@ -141 +141 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu" PRIc "\n", i);
+                                printf("Unable to create kcpulb thread for cpu" PRIs "\n", i);
                 }
         }
@@ -169 +169 @@
          * Create user tasks, load RAM disk images.
          */
-        count_t i;
+        size_t i;
         program_t programs[CONFIG_INIT_TASKS];
         
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%" PRIc "].addr is not frame aligned\n", i);
+                        printf("init[%" PRIs "].addr is not frame aligned\n", i);
                         continue;
                 }
@@ -214 +214 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %" PRIc " not used (error %d)\n", i, rd);
+                                printf("Init binary %" PRIs " not used (error %d)\n", i, rd);
                 }
         }

kernel/generic/src/main/main.c

@@ -154 +154 @@
         
         /* Avoid placing stack on top of init */
-        count_t i;
+        size_t i;
         for (i = 0; i < init.cnt; i++) {
                 if (PA_overlaps(config.stack_base, config.stack_size,
@@ -234 +234 @@
         LOG_EXEC(slab_enable_cpucache());
         
-        printf("Detected %" PRIc " CPU(s), %" PRIu64" MiB free memory\n",
+        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
             config.cpu_count, SIZE2MB(zone_total_size()));
         
@@ -248 +248 @@
         
         if (init.cnt > 0) {
-                count_t i;
+                size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
+                        LOG("init[%" PRIs "].addr=%#" PRIp ", init[%" PRIs
                             "].size=%#" PRIs, i, init.tasks[i].addr, i,
                             init.tasks[i].size);