Changeset 76cec1e in mainline for arch/ia32/src/drivers

Timestamp:

2005-07-15T21:57:30Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b4a4c5e3

Parents:

e41c47e

Message:

Huge indentation fix.

Location:

arch/ia32/src/drivers

Files:

• ega.c (modified) (2 diffs)
• i8254.c (modified) (2 diffs)
• i8259.c (modified) (7 diffs)

arch/ia32/src/drivers/ega.c

@@ -70 +70 @@
 {
         if (ega_cursor < SCREEN)
-            return;
+                return;
 
         memcopy(PA2KA(VIDEORAM) + ROW*2, PA2KA(VIDEORAM), (SCREEN - ROW)*2);
@@ -86 +86 @@
         switch (ch) {
             case '\n':
-                    ega_cursor = (ega_cursor + ROW) - ega_cursor % ROW;
-                    break;
+                ega_cursor = (ega_cursor + ROW) - ega_cursor % ROW;
+                break;
             case '\t':
-                    ega_cursor = (ega_cursor + 8) - ega_cursor % 8;
-                    break; 
+                ega_cursor = (ega_cursor + 8) - ega_cursor % 8;
+                break; 
             default:
-                    ega_display_char(ch);
-                    ega_cursor++;
-                    break;
+                ega_display_char(ch);
+                ega_cursor++;
+                break;
         }
         ega_check_cursor();
         ega_move_cursor();
-        
+
         spinlock_unlock(&egalock);
         cpu_priority_restore(pri);

arch/ia32/src/drivers/i8254.c

@@ -84 +84 @@
 
         do {
-                /* will read both status and count */
+                /* will read both status and count */
                 outb(CLK_PORT4, 0xc2);
                 not_ok = (inb(CLK_PORT1)>>6)&1;
@@ -110 +110 @@
         o2 |= inb(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);
-        
+        CPU->delay_loop_const = ((MAGIC_NUMBER*LOOPS)/1000) / ((t1-t2)-(o1-o2)) + (((MAGIC_NUMBER*LOOPS)/1000) % ((t1-t2)-(o1-o2)) ? 1 : 0);
 
         clk1 = rdtsc();

arch/ia32/src/drivers/i8259.c

@@ -45 +45 @@
         /* ICW2: IRQ 0 maps to INT IRQBASE */
         outb(PIC_PIC0PORT2, IVT_IRQBASE);
-    
+
         /* ICW3: pic1 using IRQ IRQ_PIC1 */
         outb(PIC_PIC0PORT2, 1 << IRQ_PIC1);
-    
-        /* ICW4: i8086 mode */    
+
+        /* ICW4: i8086 mode */
         outb(PIC_PIC0PORT2, 1);
 
@@ -55 +55 @@
         outb(PIC_PIC1PORT1, PIC_ICW1 | PIC_NEEDICW4);
 
-        /* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */    
+        /* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */
         outb(PIC_PIC1PORT2, IVT_IRQBASE + 8);
 
@@ -61 +61 @@
         outb(PIC_PIC1PORT2, PIC_PIC1ID);
 
-        /* ICW4: i8086 mode */    
+        /* ICW4: i8086 mode */
         outb(PIC_PIC1PORT2, 1);
 
@@ -76 +76 @@
         disable_irqs_function = pic_disable_irqs;
         eoi_function = pic_eoi;
-    
+
         pic_disable_irqs(0xffff);               /* disable all irq's */
         pic_enable_irqs(1<<IRQ_PIC1);           /* but enable pic1 */
@@ -84 +84 @@
 {
         __u8 x;
-    
+
         if (irqmask & 0xff) {
-                x = inb(PIC_PIC0PORT2);
+                x = inb(PIC_PIC0PORT2);
                 outb(PIC_PIC0PORT2, x & (~(irqmask & 0xff)));
         }
         if (irqmask >> 8) {
-                x = inb(PIC_PIC1PORT2);
+                x = inb(PIC_PIC1PORT2);
                 outb(PIC_PIC1PORT2, x & (~(irqmask >> 8)));
         }
@@ -98 +98 @@
 {
         __u8 x;
-    
+
         if (irqmask & 0xff) {
-                x = inb(PIC_PIC0PORT2);
+                x = inb(PIC_PIC0PORT2);
                 outb(PIC_PIC0PORT2, x | (irqmask & 0xff));
         }
         if (irqmask >> 8) {
-                x = inb(PIC_PIC1PORT2);
+                x = inb(PIC_PIC1PORT2);
                 outb(PIC_PIC1PORT2, x | (irqmask >> 8));
         }
@@ -112 +112 @@
 {
         outb(0x20,0x20);
-        outb(0xa0,0x20);
+        outb(0xa0,0x20);
 }