Changeset ee06f2a in mainline for kernel/arch/ia32/src/drivers/i8259.c

Timestamp:

2009-02-15T15:28:00Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2d96f4d

Parents:

e7f2ad68

Message:

Introduce a more platform-neutral name for programmed I/O.

The new API looks like pio_read_n() or pio_write_n(), where n is 8, 16 or 32.
The old API (i.e. inb(), inw(), inl(), outb() outw(), outl()) may have made
some people think that the interface is only to be used with the separate I/O
space. That's not the case. This API is to be implemented on all platforms
so that we can finally have really generic kernel device drivers.

File:

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

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

@@ -50 +50 @@
 {
         /* ICW1: this is ICW1, ICW4 to follow */
-        outb(PIC_PIC0PORT1, PIC_ICW1 | PIC_NEEDICW4);
+        pio_write_8(PIC_PIC0PORT1, PIC_ICW1 | PIC_NEEDICW4);
 
         /* ICW2: IRQ 0 maps to INT IRQBASE */
-        outb(PIC_PIC0PORT2, IVT_IRQBASE);
+        pio_write_8(PIC_PIC0PORT2, IVT_IRQBASE);
 
         /* ICW3: pic1 using IRQ IRQ_PIC1 */
-        outb(PIC_PIC0PORT2, 1 << IRQ_PIC1);
+        pio_write_8(PIC_PIC0PORT2, 1 << IRQ_PIC1);
 
         /* ICW4: i8086 mode */
-        outb(PIC_PIC0PORT2, 1);
+        pio_write_8(PIC_PIC0PORT2, 1);
 
         /* ICW1: ICW1, ICW4 to follow */
-        outb(PIC_PIC1PORT1, PIC_ICW1 | PIC_NEEDICW4);
+        pio_write_8(PIC_PIC1PORT1, PIC_ICW1 | PIC_NEEDICW4);
 
         /* ICW2: IRQ 8 maps to INT (IVT_IRQBASE + 8) */
-        outb(PIC_PIC1PORT2, IVT_IRQBASE + 8);
+        pio_write_8(PIC_PIC1PORT2, IVT_IRQBASE + 8);
 
         /* ICW3: pic1 is known as IRQ_PIC1 */
-        outb(PIC_PIC1PORT2, IRQ_PIC1);
+        pio_write_8(PIC_PIC1PORT2, IRQ_PIC1);
 
         /* ICW4: i8086 mode */
-        outb(PIC_PIC1PORT2, 1);
+        pio_write_8(PIC_PIC1PORT2, 1);
 
         /*
@@ -95 +95 @@
 
         if (irqmask & 0xff) {
-                x = inb(PIC_PIC0PORT2);
-                outb(PIC_PIC0PORT2, (uint8_t) (x & (~(irqmask & 0xff))));
+                x = pio_read_8(PIC_PIC0PORT2);
+                pio_write_8(PIC_PIC0PORT2, (uint8_t) (x & (~(irqmask & 0xff))));
         }
         if (irqmask >> 8) {
-                x = inb(PIC_PIC1PORT2);
-                outb(PIC_PIC1PORT2, (uint8_t) (x & (~(irqmask >> 8))));
+                x = pio_read_8(PIC_PIC1PORT2);
+                pio_write_8(PIC_PIC1PORT2, (uint8_t) (x & (~(irqmask >> 8))));
         }
 }
@@ -109 +109 @@
 
         if (irqmask & 0xff) {
-                x = inb(PIC_PIC0PORT2);
-                outb(PIC_PIC0PORT2, (uint8_t) (x | (irqmask & 0xff)));
+                x = pio_read_8(PIC_PIC0PORT2);
+                pio_write_8(PIC_PIC0PORT2, (uint8_t) (x | (irqmask & 0xff)));
         }
         if (irqmask >> 8) {
-                x = inb(PIC_PIC1PORT2);
-                outb(PIC_PIC1PORT2, (uint8_t) (x | (irqmask >> 8)));
+                x = pio_read_8(PIC_PIC1PORT2);
+                pio_write_8(PIC_PIC1PORT2, (uint8_t) (x | (irqmask >> 8)));
         }
 }
@@ -120 +120 @@
 void pic_eoi(void)
 {
-        outb(0x20, 0x20);
-        outb(0xa0, 0x20);
+        pio_write_8(0x20, 0x20);
+        pio_write_8(0xa0, 0x20);
 }