Changeset da1bafb in mainline for kernel/arch/ia32/src/drivers/i8254.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/ia32/src/drivers/i8254.c (modified) (5 diffs)

kernel/arch/ia32/src/drivers/i8254.c

@@ -54 +54 @@
 #include <ddi/device.h>
 
-#define CLK_PORT1       ((ioport8_t *)0x40)
-#define CLK_PORT4       ((ioport8_t *)0x43)
+#define CLK_PORT1  ((ioport8_t *) 0x40)
+#define CLK_PORT4  ((ioport8_t *) 0x43)
 
-#define CLK_CONST       1193180
-#define MAGIC_NUMBER    1194
+#define CLK_CONST     1193180
+#define MAGIC_NUMBER  1194
+
+#define LOOPS  150000
+#define SHIFT  11
 
 static irq_t i8254_irq;
@@ -75 +78 @@
          * lock. We just release it, call clock() and then reacquire it again.
          */
-        spinlock_unlock(&irq->lock);
+        irq_spinlock_unlock(&irq->lock, false);
         clock();
-        spinlock_lock(&irq->lock);
+        irq_spinlock_lock(&irq->lock, false);
 }
 
@@ -102 +105 @@
 }
 
-#define LOOPS 150000
-#define SHIFT 11
 void i8254_calibrate_delay_loop(void)
 {
-        uint64_t clk1, clk2;
-        uint32_t t1, t2, o1, o2;
-        uint8_t not_ok;
-
-
         /*
          * One-shot timer. Count-down from 0xffff at 1193180Hz
@@ -118 +114 @@
         pio_write_8(CLK_PORT1, 0xff);
         pio_write_8(CLK_PORT1, 0xff);
-
+        
+        uint8_t not_ok;
+        uint32_t t1;
+        uint32_t t2;
+        
         do {
                 /* will read both status and count */
@@ -126 +126 @@
                 t1 |= pio_read_8(CLK_PORT1) << 8;
         } while (not_ok);
-
+        
         asm_delay_loop(LOOPS);
-
+        
         pio_write_8(CLK_PORT4, 0xd2);
         t2 = pio_read_8(CLK_PORT1);
         t2 |= pio_read_8(CLK_PORT1) << 8;
-
+        
         /*
          * We want to determine the overhead of the calibrating mechanism.
          */
         pio_write_8(CLK_PORT4, 0xd2);
-        o1 = pio_read_8(CLK_PORT1);
+        uint32_t o1 = pio_read_8(CLK_PORT1);
         o1 |= pio_read_8(CLK_PORT1) << 8;
-
+        
         asm_fake_loop(LOOPS);
-
+        
         pio_write_8(CLK_PORT4, 0xd2);
-        o2 = pio_read_8(CLK_PORT1);
+        uint32_t o2 = pio_read_8(CLK_PORT1);
         o2 |= pio_read_8(CLK_PORT1) << 8;
-
+        
         CPU->delay_loop_const =
             ((MAGIC_NUMBER * LOOPS) / 1000) / ((t1 - t2) - (o1 - o2)) +
             (((MAGIC_NUMBER * LOOPS) / 1000) % ((t1 - t2) - (o1 - o2)) ? 1 : 0);
-
-        clk1 = get_cycle();
+        
+        uint64_t clk1 = get_cycle();
         delay(1 << SHIFT);
-        clk2 = get_cycle();
+        uint64_t clk2 = get_cycle();
         
         CPU->frequency_mhz = (clk2 - clk1) >> SHIFT;
-
+        
         return;
 }