Changeset 5cb223f in mainline for kernel/arch/ia32

Timestamp:

2009-02-19T22:00:44Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4544884

Parents:

7d60cf5

Message:

Adapt most of the kernel to ioport8_t, ioport16_t and ioport32_t types.

Location:

kernel/arch/ia32

Files:

• include/drivers/ega.h (modified) (1 diff)
• include/drivers/i8259.h (modified) (1 diff)
• src/drivers/i8254.c (modified) (1 diff)
• src/drivers/i8259.c (modified) (1 diff)
• src/smp/smp.c (modified) (1 diff)

kernel/arch/ia32/include/drivers/ega.h

@@ -37 +37 @@
 
 #define EGA_VIDEORAM    0xb8000
-#define EGA_BASE        0x3d4
+#define EGA_BASE        ((ioport8_t *)0x3d4)
 
 #endif

kernel/arch/ia32/include/drivers/i8259.h

@@ -39 +39 @@
 #include <arch/interrupt.h>
 
-#define PIC_PIC0PORT1   0x20
-#define PIC_PIC0PORT2   0x21
-#define PIC_PIC1PORT1   0xa0
-#define PIC_PIC1PORT2   0xa1
+#define PIC_PIC0PORT1   ((ioport8_t *) 0x20)
+#define PIC_PIC0PORT2   ((ioport8_t *) 0x21)
+#define PIC_PIC1PORT1   ((ioport8_t *) 0xa0)
+#define PIC_PIC1PORT2   ((ioport8_t *) 0xa1)
 
 #define PIC_NEEDICW4    (1<<0)

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

@@ -54 +54 @@
 #include <ddi/device.h>
 
-#define CLK_PORT1       0x40
-#define CLK_PORT4       0x43
+#define CLK_PORT1       ((ioport8_t *)0x40)
+#define CLK_PORT4       ((ioport8_t *)0x43)
 
 #define CLK_CONST       1193180

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

@@ -120 +120 @@
 void pic_eoi(void)
 {
-        pio_write_8(0x20, 0x20);
-        pio_write_8(0xa0, 0x20);
+        pio_write_8((ioport8_t *)0x20, 0x20);
+        pio_write_8((ioport8_t *)0xa0, 0x20);
 }
 

kernel/arch/ia32/src/smp/smp.c

@@ -123 +123 @@
          * BIOS will not do the POST after the INIT signal.
          */
-        pio_write_8(0x70, 0xf);
-        pio_write_8(0x71, 0xa);
+        pio_write_8((ioport8_t *)0x70, 0xf);
+        pio_write_8((ioport8_t *)0x71, 0xa);
 
         pic_disable_irqs(0xffff);