Changeset 9cd98796 in mainline

Timestamp:

2009-03-03T22:57:26Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff685c9

Parents:

1ae8f2b

Message:

Use PIO in uspace EGA driver.

File:

• uspace/srv/fb/ega.c (modified) (6 diffs)

uspace/srv/fb/ega.c

@@ -52 +52 @@
 #include <console/style.h>
 #include <console/color.h>
+#include <sys/types.h>
 
 #include "ega.h"
@@ -64 +65 @@
 saved_screen saved_screens[MAX_SAVED_SCREENS];
 
-#define EGA_IO_ADDRESS 0x3d4
+#define EGA_IO_BASE ((ioport8_t *) 0x3d4)
 #define EGA_IO_SIZE 2
 
@@ -100 +101 @@
         ega_cursor = col + scr_width * row;
         
-        outb(EGA_IO_ADDRESS, 0xe);
-        outb(EGA_IO_ADDRESS + 1, (ega_cursor >> 8) & 0xff);
-        outb(EGA_IO_ADDRESS, 0xf);
-        outb(EGA_IO_ADDRESS + 1, ega_cursor & 0xff);
+        pio_write_8(EGA_IO_BASE, 0xe);
+        pio_write_8(EGA_IO_BASE + 1, (ega_cursor >> 8) & 0xff);
+        pio_write_8(EGA_IO_BASE, 0xf);
+        pio_write_8(EGA_IO_BASE + 1, ega_cursor & 0xff);
 }
 
@@ -110 +111 @@
         uint8_t stat;
 
-        outb(EGA_IO_ADDRESS, 0xa);
-        stat=inb(EGA_IO_ADDRESS + 1);
-        outb(EGA_IO_ADDRESS, 0xa);
-        outb(EGA_IO_ADDRESS + 1, stat | (1 << 5));
+        pio_write_8(EGA_IO_BASE, 0xa);
+        stat = pio_read_8(EGA_IO_BASE + 1);
+        pio_write_8(EGA_IO_BASE, 0xa);
+        pio_write_8(EGA_IO_BASE + 1, stat | (1 << 5));
 }
 
@@ -120 +121 @@
         uint8_t stat;
 
-        outb(EGA_IO_ADDRESS, 0xa);
-        stat=inb(EGA_IO_ADDRESS + 1);
-        outb(EGA_IO_ADDRESS, 0xa);
-        outb(EGA_IO_ADDRESS + 1, stat & (~(1 << 5)));
+        pio_write_8(EGA_IO_BASE, 0xa);
+        stat = pio_read_8(EGA_IO_BASE + 1);
+        pio_write_8(EGA_IO_BASE, 0xa);
+        pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5)));
 }
 
@@ -381 +382 @@
         style = NORMAL_COLOR;
 
-        iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);
+        iospace_enable(task_get_id(), (void *) EGA_IO_BASE, 2);
 
         sz = scr_width * scr_height * 2;