WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/ Rev 2700 and /trunk/kernel/ Rev 2701

Ignore whitespace Rev 2700 → Rev 2701

 /trunk/kernel/generic/src/main/version.c
 ,7 → 36,7
 #include <print.h>
 char *project = "SPARTAN kernel";
-char *copyright = "Copyright (c) 2001-2007 HelenOS project";
+char *copyright = "Copyright (c) 2001-2008 HelenOS project";
 char *release = RELEASE;
 char *name = NAME;
 char *arch = ARCH;

 /trunk/kernel/arch/amd64/src/pm.c
 ,5 → 1,5
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2005-2006 Ondrej Palkovsky
  * All rights reserved.
  *
 ,7 → 54,7
     { .limit_0_15  = 0xffff,
       .base_0_15   = 0,
       .base_16_23  = 0,
-      .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE ,
+      .access      = AR_PRESENT | AR_CODE | DPL_KERNEL | AR_READABLE,
       .limit_16_19 = 0xf,
       .available   = 0,
       .longmode    = 1,
 ,14 → 111,16
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     /* VESA Init descriptor */
 #ifdef CONFIG_FB
-    { 0xffff, 0, VESA_INIT_SEGMENT>>12, AR_PRESENT | AR_CODE | DPL_KERNEL, 0xf, 0, 0, 0, 0, 0 }
+    { 0xffff, 0, VESA_INIT_SEGMENT >> 12, AR_PRESENT | AR_CODE | DPL_KERNEL,
+xf, 0, 0, 0, 0, 0
+    }
 #endif
 };
 idescriptor_t idt[IDT_ITEMS];
-ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base= (uint64_t) gdt };
-ptr_16_64_t idtr = {.limit = sizeof(idt), .base= (uint64_t) idt };
+ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base = (uint64_t) gdt };
+ptr_16_64_t idtr = {.limit = sizeof(idt), .base = (uint64_t) idt };
 static tss_t tss;
 tss_t *tss_p = NULL;
 ,7 → 175,8
         d->present = 1;
         d->type = AR_INTERRUPT; /* masking interrupt */
-        idt_setoffset(d, ((uintptr_t) interrupt_handlers) + i*interrupt_handler_size);
+        idt_setoffset(d, ((uintptr_t) interrupt_handlers) +
+            i * interrupt_handler_size);
     }
 }

 /trunk/kernel/arch/ia32/src/smp/mps.c
 ,5 → 1,5
 /*
- * Copyright (c) 2001-2005 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,7 → 149,7
     int i;
     /* count the checksum for the base table */
-    for (i=0,sum=0; i < ct->base_table_length; i++)
+    for (i = 0,sum = 0; i < ct->base_table_length; i++)
         sum = (uint8_t) (sum + base[i]);
     if (sum)
 ,7 → 156,7
         return 0;
     /* count the checksum for the extended table */
-    for (i=0,sum=0; i < ct->ext_table_length; i++)
+    for (i = 0, sum = 0; i < ct->ext_table_length; i++)
         sum = (uint8_t) (sum + ext[i]);
     return sum == ct->ext_table_checksum;
 ,7 → 178,8
     addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024);
     for (i = 0; i < 2; i++) {
         for (j = 0; j < length[i]; j += 16) {
-            if (*((uint32_t *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
+            if (*((uint32_t *) &addr[i][j]) ==
+                FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
                 fs = (struct mps_fs *) &addr[i][j];
                 goto fs_found;
             }
 ,55 → 228,62
     cnt = 0;
     cur = &ct->base_table[0];
-    for (i=0; i < ct->entry_count; i++) {
+    for (i = 0; i < ct->entry_count; i++) {
         switch (*cur) {
-            /* Processor entry */
-            case 0:
-                processor_entries = processor_entries ? processor_entries : (struct __processor_entry *) cur;
-                processor_entry_cnt++;
-                cnt += ct_processor_entry((struct __processor_entry *) cur);
-                cur += 20;
-                break;
+        /* Processor entry */
+        case 0:
+            processor_entries = processor_entries ?
+                processor_entries :
+                (struct __processor_entry *) cur;
+            processor_entry_cnt++;
+            cnt += ct_processor_entry((struct __processor_entry *)
+                cur);
+            cur += 20;
+            break;
-            /* Bus entry */
-            case 1:
-                bus_entries = bus_entries ? bus_entries : (struct __bus_entry *) cur;
-                bus_entry_cnt++;
-                ct_bus_entry((struct __bus_entry *) cur);
-                cur += 8;
-                break;
+        /* Bus entry */
+        case 1:
+            bus_entries = bus_entries ?
+                bus_entries : (struct __bus_entry *) cur;
+            bus_entry_cnt++;
+            ct_bus_entry((struct __bus_entry *) cur);
+            cur += 8;
+            break;
-            /* I/O Apic */
-            case 2:
-                io_apic_entries = io_apic_entries ? io_apic_entries : (struct __io_apic_entry *) cur;
+        /* I/O Apic */
+        case 2:
+            io_apic_entries = io_apic_entries ?
+                io_apic_entries : (struct __io_apic_entry *) cur;
                 io_apic_entry_cnt++;
-                ct_io_apic_entry((struct __io_apic_entry *) cur);
-                cur += 8;
-                break;
+            ct_io_apic_entry((struct __io_apic_entry *) cur);
+            cur += 8;
+            break;
-            /* I/O Interrupt Assignment */
-            case 3:
-                io_intr_entries = io_intr_entries ? io_intr_entries : (struct __io_intr_entry *) cur;
-                io_intr_entry_cnt++;
-                ct_io_intr_entry((struct __io_intr_entry *) cur);
-                cur += 8;
-                break;
+        /* I/O Interrupt Assignment */
+        case 3:
+            io_intr_entries = io_intr_entries ?
+                io_intr_entries : (struct __io_intr_entry *) cur;
+            io_intr_entry_cnt++;
+            ct_io_intr_entry((struct __io_intr_entry *) cur);
+            cur += 8;
+            break;
-            /* Local Interrupt Assignment */
-            case 4:
-                l_intr_entries = l_intr_entries ? l_intr_entries : (struct __l_intr_entry *) cur;
-                l_intr_entry_cnt++;
-                ct_l_intr_entry((struct __l_intr_entry *) cur);
-                cur += 8;
-                break;
+        /* Local Interrupt Assignment */
+        case 4:
+            l_intr_entries = l_intr_entries ?
+                l_intr_entries : (struct __l_intr_entry *) cur;
+            l_intr_entry_cnt++;
+            ct_l_intr_entry((struct __l_intr_entry *) cur);
+            cur += 8;
+            break;
-            default:
-                /*
-                 * Something is wrong. Fallback to UP mode.
-                 */
-                printf("%s: ct badness\n", __func__);
-                return 1;
+        default:
+            /*
+             * Something is wrong. Fallback to UP mode.
+             */
+            printf("%s: ct badness\n", __func__);
+            return 1;
         }
     }
 ,10 → 309,10
     /*
      * Ignore processors which are not marked enabled.
      */
-    if ((pr->cpu_flags & (1<<0)) == 0)
+    if ((pr->cpu_flags & (1 << 0)) == 0)
         return 0;
-    apic_id_mask |= (1<<pr->l_apic_id);
+    apic_id_mask |= (1 << pr->l_apic_id);
     return 1;
 }
 ,29 → 349,54
 {
 #ifdef MPSCT_VERBOSE
     switch (iointr->intr_type) {
-        case 0: printf("INT"); break;
-        case 1: printf("NMI"); break;
-        case 2: printf("SMI"); break;
-        case 3: printf("ExtINT"); break;
+    case 0:
+        printf("INT");
+        break;
+    case 1:
+        printf("NMI");
+        break;
+    case 2:
+        printf("SMI");
+        break;
+    case 3:
+        printf("ExtINT");
+        break;
     }
     putchar(',');
-    switch (iointr->poel&3) {
-        case 0: printf("bus-like"); break;
-        case 1: printf("active high"); break;
-        case 2: printf("reserved"); break;
-        case 3: printf("active low"); break;
+    switch (iointr->poel & 3) {
+    case 0:
+        printf("bus-like");
+        break;
+    case 1:
+        printf("active high");
+        break;
+    case 2:
+        printf("reserved");
+        break;
+    case 3:
+        printf("active low");
+        break;
     }
     putchar(',');
-    switch ((iointr->poel>>2)&3) {
-        case 0: printf("bus-like"); break;
-        case 1: printf("edge-triggered"); break;
-        case 2: printf("reserved"); break;
-        case 3: printf("level-triggered"); break;
+    switch ((iointr->poel >> 2) & 3) {
+    case 0:
+        printf("bus-like");
+        break;
+    case 1:
+        printf("edge-triggered");
+        break;
+    case 2:
+        printf("reserved");
+        break;
+    case 3:
+        printf("level-triggered");
+        break;
     }
     putchar(',');
     printf("bus%d,irq%d", iointr->src_bus_id, iointr->src_bus_irq);
     putchar(',');
-    printf("io_apic%d,pin%d", iointr->dst_io_apic_id, iointr->dst_io_apic_pin);
+    printf("io_apic%d,pin%d", iointr->dst_io_apic_id,
+        iointr->dst_io_apic_pin);
     putchar('\n');
 #endif
 }
 ,24 → 405,48
 {
 #ifdef MPSCT_VERBOSE
     switch (lintr->intr_type) {
-        case 0: printf("INT"); break;
-        case 1: printf("NMI"); break;
-        case 2: printf("SMI"); break;
-        case 3: printf("ExtINT"); break;
+    case 0:
+        printf("INT");
+        break;
+    case 1:
+        printf("NMI");
+        break;
+    case 2:
+        printf("SMI");
+        break;
+    case 3:
+        printf("ExtINT");
+        break;
     }
     putchar(',');
-    switch (lintr->poel&3) {
-        case 0: printf("bus-like"); break;
-        case 1: printf("active high"); break;
-        case 2: printf("reserved"); break;
-        case 3: printf("active low"); break;
+    switch (lintr->poel & 3) {
+    case 0:
+        printf("bus-like");
+        break;
+    case 1:
+        printf("active high");
+        break;
+    case 2:
+        printf("reserved");
+        break;
+    case 3:
+        printf("active low");
+        break;
     }
     putchar(',');
-    switch ((lintr->poel>>2)&3) {
-        case 0: printf("bus-like"); break;
-        case 1: printf("edge-triggered"); break;
-        case 2: printf("reserved"); break;
-        case 3: printf("level-triggered"); break;
+    switch ((lintr->poel >> 2) & 3) {
+    case 0:
+        printf("bus-like");
+        break;
+    case 1:
+        printf("edge-triggered");
+        break;
+    case 2:
+        printf("reserved");
+        break;
+    case 3:
+        printf("level-triggered");
+        break;
     }
     putchar(',');
     printf("bus%d,irq%d", lintr->src_bus_id, lintr->src_bus_irq);
 ,11 → 461,13
     uint8_t *ext = (uint8_t *) ct + ct->base_table_length;
     uint8_t *cur;
-    for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) {
+    for (cur = ext; cur < ext + ct->ext_table_length;
+        cur += cur[CT_EXT_ENTRY_LEN]) {
         switch (cur[CT_EXT_ENTRY_TYPE]) {
-            default:
-                printf("%p: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
-                break;
+        default:
+            printf("%p: skipping MP Configuration Table extended "
+                "entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
+            break;
         }
     }
 }
 ,7 → 477,8
     unsigned int i;
     for (i = 0; i < io_intr_entry_cnt; i++) {
-        if (io_intr_entries[i].src_bus_irq == irq && io_intr_entries[i].intr_type == 0)
+        if (io_intr_entries[i].src_bus_irq == irq &&
+            io_intr_entries[i].intr_type == 0)
             return io_intr_entries[i].dst_io_apic_pin;
     }

 /trunk/kernel/arch/ia32/src/smp/smp.c
 ,5 → 1,5
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,19 → 72,21
         ops = &mps_config_operations;
     }
-    l_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+    l_apic_address = (uintptr_t) frame_alloc(ONE_FRAME,
+        FRAME_ATOMIC | FRAME_KA);
     if (!l_apic_address)
         panic("cannot allocate address for l_apic\n");
-    io_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+    io_apic_address = (uintptr_t) frame_alloc(ONE_FRAME,
+        FRAME_ATOMIC | FRAME_KA);
     if (!io_apic_address)
         panic("cannot allocate address for io_apic\n");
     if (config.cpu_count > 1) {
-        page_mapping_insert(AS_KERNEL, l_apic_address, (uintptr_t) l_apic,
-                  PAGE_NOT_CACHEABLE | PAGE_WRITE);
-        page_mapping_insert(AS_KERNEL, io_apic_address, (uintptr_t) io_apic,
-                  PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        page_mapping_insert(AS_KERNEL, l_apic_address,
+            (uintptr_t) l_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        page_mapping_insert(AS_KERNEL, io_apic_address,
+            (uintptr_t) io_apic, PAGE_NOT_CACHEABLE | PAGE_WRITE);
         l_apic = (uint32_t *) l_apic_address;
         io_apic = (uint32_t *) io_apic_address;
 ,8 → 114,9
     /*
      * Set the warm-reset vector to the real-mode address of 4K-aligned ap_boot()
      */
-    *((uint16_t *) (PA2KA(0x467 + 0))) = (uint16_t) (((uintptr_t) ap_boot) >> 4);   /* segment */
-    *((uint16_t *) (PA2KA(0x467 + 2))) = 0;             /* offset */
+    *((uint16_t *) (PA2KA(0x467 + 0))) =
+        (uint16_t) (((uintptr_t) ap_boot) >> 4);    /* segment */
+    *((uint16_t *) (PA2KA(0x467 + 2))) = 0;     /* offset */
     /*
      * Save 0xa to address 0xf of the CMOS RAM.
 ,7 → 146,8
             continue;
         if (ops->cpu_apic_id(i) == apic) {
-            printf("%s: bad processor entry #%u, will not send IPI to myself\n", __FUNCTION__, i);
+            printf("%s: bad processor entry #%u, will not send IPI "
+                "to myself\n", __FUNCTION__, i);
             continue;
         }
 ,11 → 154,14
         /*
          * Prepare new GDT for CPU in question.
          */
-        if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS * sizeof(struct descriptor), FRAME_ATOMIC)))
+        gdt_new = (struct descriptor *) malloc(GDT_ITEMS *
+            sizeof(struct descriptor), FRAME_ATOMIC);
+        if (!gdt_new)
             panic("couldn't allocate memory for GDT\n");
         memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-        memsetb((uintptr_t)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
+        memsetb((uintptr_t)(&gdt_new[TSS_DES]),
+            sizeof(struct descriptor), 0);
         protected_ap_gdtr.limit = GDT_ITEMS * sizeof(struct descriptor);
         protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new);
         gdtr.base = (uintptr_t) gdt_new;
 ,12 → 172,17
              * the time. After it comes completely up, it is
              * supposed to wake us up.
              */
-            if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
-                unsigned int cpu = (config.cpu_active > i) ? config.cpu_active : i;
-                printf("%s: waiting for cpu%u (APIC ID = %d) timed out\n", __FUNCTION__, cpu, ops->cpu_apic_id(i));
+            if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
+                SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
+                unsigned int cpu = (config.cpu_active > i) ?
+                    config.cpu_active : i;
+                printf("%s: waiting for cpu%u (APIC ID = %d) "
+                    "timed out\n", __FUNCTION__, cpu,
+                    ops->cpu_apic_id(i));
             }
         } else
-            printf("INIT IPI for l_apic%d failed\n", ops->cpu_apic_id(i));
+            printf("INIT IPI for l_apic%d failed\n",
+                ops->cpu_apic_id(i));
     }
 }

 /trunk/kernel/arch/ia32/src/mm/frame.c
 ,5 → 1,5
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,15 → 61,20
     for (i = 0; i < e820counter; i++) {
         if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-            start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
-            size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
+            start = ADDR2PFN(ALIGN_UP(e820table[i].base_address,
+                FRAME_SIZE));
+            size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size,
+                FRAME_SIZE));
             if ((minconf < start) || (minconf >= start + size))
                 conf = start;
             else
                 conf = minconf;
             zone_create(start, size, conf, 0);
-            if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
-                last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
+            if (last_frame < ALIGN_UP(e820table[i].base_address +
+                e820table[i].size, FRAME_SIZE))
+                last_frame =
+                    ALIGN_UP(e820table[i].base_address +
+                    e820table[i].size, FRAME_SIZE);
         }
     }
 }
 ,8 → 87,8
     .argc = 0
 };
-static char *e820names[] = { "invalid", "available", "reserved",
-                 "acpi", "nvs", "unusable" };
+static char *e820names[] = { "invalid", "available", "reserved", "acpi", "nvs",
+    "unusable" };
 static int cmd_e820mem(cmd_arg_t *argv)
 ,11 → 101,9
             name = e820names[e820table[i].type];
         else
             name = "invalid";
-        printf("%.*p %#.16llXB %s\n",
-            sizeof(unative_t) * 2,
-               (unative_t) e820table[i].base_address,
-               (uint64_t) e820table[i].size,
-               name);
+        printf("%.*p %#.16llXB %s\n", sizeof(unative_t) * 2,
+            (unative_t) e820table[i].base_address,
+            (uint64_t) e820table[i].size, name);
     }
     return 0;
 }
 ,7 → 120,8
         minconf = 1;
 #ifdef CONFIG_SMP
         minconf = max(minconf,
-            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size));
+            ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
+                hardcoded_unmapped_kdata_size));
 #endif
 #ifdef CONFIG_SIMICS_FIX
         minconf = max(minconf, ADDR2PFN(0x10000));
 ,7 → 134,8
 #ifdef CONFIG_SMP
         /* Reserve AP real mode bootstrap memory */
         frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH,
-            (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
+            (hardcoded_unmapped_ktext_size +
+            hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
 #ifdef CONFIG_SIMICS_FIX
         /* Don't know why, but these addresses help */

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2700 → Rev 2701