Changeset da1bafb in mainline for kernel/arch/ia64/src/drivers/it.c

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

• kernel/arch/ia64/src/drivers/it.c (modified) (7 diffs)

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

@@ -34 +34 @@
 
 /** Interval Timer driver. */
- 
+
 #include <arch/drivers/it.h>
 #include <arch/interrupt.h>
@@ -45 +45 @@
 #include <arch.h>
 
-#define IT_SERVICE_CLOCKS       64
+#define IT_SERVICE_CLOCKS  64
 
-#define FREQ_NUMERATOR_SHIFT    32
-#define FREQ_NUMERATOR_MASK     0xffffffff00000000ULL
+#define FREQ_NUMERATOR_SHIFT  32
+#define FREQ_NUMERATOR_MASK   0xffffffff00000000ULL
 
-#define FREQ_DENOMINATOR_SHIFT  0
-#define FREQ_DENOMINATOR_MASK   0xffffffffULL
+#define FREQ_DENOMINATOR_SHIFT  0
+#define FREQ_DENOMINATOR_MASK   0xffffffffULL
 
 uint64_t it_delta;
@@ -63 +63 @@
 void it_init(void)
 {
-        cr_itv_t itv;
-        
         if (config.cpu_active == 1) {
                 irq_initialize(&it_irq);
@@ -83 +81 @@
         }
         
-        /* initialize Interval Timer external interrupt vector */
+        /* Initialize Interval Timer external interrupt vector */
+        cr_itv_t itv;
+        
         itv.value = itv_read();
         itv.vector = INTERRUPT_TIMER;
         itv.m = 0;
         itv_write(itv.value);
-
-        /* set Interval Timer Counter to zero */
+        
+        /* Set Interval Timer Counter to zero */
         itc_write(0);
         
-        /* generate first Interval Timer interrupt in IT_DELTA ticks */
+        /* Generate first Interval Timer interrupt in IT_DELTA ticks */
         itm_write(IT_DELTA);
-
-        /* propagate changes */
+        
+        /* Propagate changes */
         srlz_d();
 }
@@ -104 +104 @@
  *
  * @return Always IRQ_ACCEPT.
+ *
  */
 irq_ownership_t it_claim(irq_t *irq)
@@ -113 +114 @@
 void it_interrupt(irq_t *irq)
 {
-        int64_t c;
-        int64_t m;
-        
         eoi_write(EOI);
         
-        m = itm_read();
+        int64_t itm = itm_read();
         
-        while (1) {
-                c = itc_read();
-                c += IT_SERVICE_CLOCKS;
-
-                m += IT_DELTA;
-                if (m - c < 0)
+        while (true) {
+                int64_t itc = itc_read();
+                itc += IT_SERVICE_CLOCKS;
+                
+                itm += IT_DELTA;
+                if (itm - itc < 0)
                         CPU->missed_clock_ticks++;
                 else
@@ -131 +129 @@
         }
         
-        itm_write(m);
-        srlz_d();                               /* propagate changes */
-
+        itm_write(itm);
+        srlz_d();  /* Propagate changes */
+        
         /*
          * We are holding a lock which prevents preemption.
          * Release the lock, call clock() and reacquire the lock again.
          */
-        spinlock_unlock(&irq->lock);    
+        irq_spinlock_unlock(&irq->lock, false);
         clock();
-        spinlock_lock(&irq->lock);
+        irq_spinlock_lock(&irq->lock, false);
 }