Changeset 8565a42 in mainline for kernel/arch/ia32/src/drivers/i8254.c

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/arch/ia32/src/drivers/i8254.c (modified) (4 diffs)

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

@@ -89 +89 @@
         i8254_irq.handler = i8254_irq_handler;
         irq_register(&i8254_irq);
-        
+
         i8254_normal_operation();
 }
@@ -111 +111 @@
         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 */
@@ -123 +123 @@
                 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.
@@ -136 +136 @@
         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);
         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);
-        
+
         uint64_t clk1 = get_cycle();
         delay(1 << SHIFT);
         uint64_t clk2 = get_cycle();
-        
+
         CPU->frequency_mhz = (clk2 - clk1) >> SHIFT;
-        
+
         return;
 }