Changeset da1bafb in mainline for kernel/arch/mips32/src/interrupt.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/mips32/src/interrupt.c (modified) (4 diffs)

kernel/arch/mips32/src/interrupt.c

@@ -48 +48 @@
 function virtual_timer_fnc = NULL;
 static irq_t timer_irq;
+
+// TODO: This is SMP unsafe!!!
+
+uint32_t count_hi = 0;
+static unsigned long nextcount;
+static unsigned long lastcount;
 
 /** Disable interrupts.
@@ -99 +105 @@
 }
 
-/* TODO: This is SMP unsafe!!! */
-uint32_t count_hi = 0;
-static unsigned long nextcount;
-static unsigned long lastcount;
-
-/** Start hardware clock */
+/** Start hardware clock
+ *
+ */
 static void timer_start(void)
 {
@@ -119 +122 @@
 static void timer_irq_handler(irq_t *irq)
 {
-        unsigned long drift;
-        
         if (cp0_count_read() < lastcount)
                 /* Count overflow detected */
                 count_hi++;
+        
         lastcount = cp0_count_read();
         
-        drift = cp0_count_read() - nextcount;
+        unsigned long drift = cp0_count_read() - nextcount;
         while (drift > cp0_compare_value) {
                 drift -= cp0_compare_value;
                 CPU->missed_clock_ticks++;
         }
+        
         nextcount = cp0_count_read() + cp0_compare_value - drift;
         cp0_compare_write(nextcount);
@@ -138 +141 @@
          * 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);
         
         if (virtual_timer_fnc != NULL)