Changeset 666773c in mainline for kernel/arch/ia64/src/drivers

Timestamp:

2008-12-31T15:33:29Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9805cde

Parents:

d8c0dc5

Message:

Humanitarian facelift for ia64.

Location:

kernel/arch/ia64/src/drivers

Files:

• ega.c (modified) (4 diffs)
• it.c (modified) (3 diffs)

kernel/arch/ia64/src/drivers/ega.c

@@ -83 +83 @@
         stdout = &ega_console;
 
-
         ega_parea.pbase = VIDEORAM & 0xffffffff;
         ega_parea.vbase = (uintptr_t) videoram;
@@ -90 +89 @@
         ddi_parea_register(&ega_parea);
 
-        
         sysinfo_set_item_val("fb", NULL, true);
         sysinfo_set_item_val("fb.kind", NULL, 2);
@@ -96 +94 @@
         sysinfo_set_item_val("fb.height", NULL, ROWS);
         sysinfo_set_item_val("fb.blinking", NULL, true);
-        sysinfo_set_item_val("fb.address.physical", NULL, VIDEORAM & 0xffffffff);
+        sysinfo_set_item_val("fb.address.physical", NULL,
+            VIDEORAM & 0xffffffff);
         
 #ifndef CONFIG_FB
@@ -117 +116 @@
                 return;
 
-        memmove((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
+        memmove((void *) videoram, (void *) (videoram + ROW * 2),
+            (SCREEN - ROW) * 2);
         _memsetw(videoram + (SCREEN - ROW) * 2, ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;

kernel/arch/ia64/src/drivers/it.c

@@ -45 +45 @@
 #include <arch.h>
 
-#define IT_SERVICE_CLOCKS 64
+#define IT_SERVICE_CLOCKS       64
 
-#define FREQ_NUMERATOR_SHIFT 32
-#define FREQ_NUMERATOR_MASK 0xffffffff00000000LL
+#define FREQ_NUMERATOR_SHIFT    32
+#define FREQ_NUMERATOR_MASK     0xffffffff00000000ULL
 
-#define FREQ_DENOMINATOR_SHIFT 0
-#define FREQ_DENOMINATOR_MASK 0xffffffffLL
-
+#define FREQ_DENOMINATOR_SHIFT  0
+#define FREQ_DENOMINATOR_MASK   0xffffffffULL
 
 uint64_t it_delta;
-
 
 static irq_t it_irq;
@@ -67 +65 @@
         cr_itv_t itv;
         
-        if(config.cpu_active==1)
-        {
+        if (config.cpu_active == 1) {
                 irq_initialize(&it_irq);
                 it_irq.inr = INTERRUPT_TIMER;
@@ -77 +74 @@
                 
                 uint64_t base_freq;
-                base_freq  = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >> FREQ_NUMERATOR_SHIFT;
+                base_freq  = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >>
+                    FREQ_NUMERATOR_SHIFT;
                 base_freq *= bootinfo->sys_freq;
-                base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >> FREQ_DENOMINATOR_SHIFT;
+                base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >>
+                    FREQ_DENOMINATOR_SHIFT;
                 
-                it_delta = base_freq /HZ;
-                
+                it_delta = base_freq / HZ;
         }