Changeset 5cb223f in mainline

Timestamp:

2009-02-19T22:00:44Z (16 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

Files:

• arch/ia32/include/drivers/ega.h (modified) (1 diff)
• arch/ia32/include/drivers/i8259.h (modified) (1 diff)
• arch/ia32/src/drivers/i8254.c (modified) (1 diff)
• arch/ia32/src/drivers/i8259.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• arch/ia64/include/drivers/ega.h (modified) (1 diff)
• genarch/include/drivers/ega/ega.h (modified) (1 diff)
• genarch/src/drivers/ega/ega.c (modified) (2 diffs)
• generic/src/ipc/irq.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);

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

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

kernel/genarch/include/drivers/ega/ega.h

@@ -47 +47 @@
 
 extern void ega_redraw(void);
-extern void ega_init(ioport_t, uintptr_t);
+extern void ega_init(ioport8_t *, uintptr_t);
 
 #endif

kernel/genarch/src/drivers/ega/ega.c

@@ -59 +59 @@
 static uint8_t *videoram;
 static uint8_t *backbuf;
-static ioport_t ega_base;
+static ioport8_t *ega_base;
 
 chardev_t ega_console;
@@ -132 +132 @@
 };
 
-void ega_init(ioport_t base, uintptr_t videoram_phys)
+void ega_init(ioport8_t *base, uintptr_t videoram_phys)
 {
         /* Initialize the software structure. */        

kernel/generic/src/ipc/irq.c

@@ -102 +102 @@
                         break;
                 case CMD_PORT_READ_1:
-                        dstval = pio_read_8((long) code->cmds[i].addr);
+                        dstval = pio_read_8((ioport8_t *) code->cmds[i].addr);
                         break;
                 case CMD_PORT_WRITE_1:
-                        pio_write_8((long) code->cmds[i].addr, code->cmds[i].value);
+                        pio_write_8((ioport8_t *) code->cmds[i].addr, code->cmds[i].value);
                         break;
                 default: