Changeset 15039b67 in mainline for fb/ega.c

Timestamp:

2006-06-11T17:05:41Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f8d5b85

Parents:

290c0db

Message:

Modified uspace to match changes in kernel ipc/irq.
Fixed types in ega fb.
Added dummy interfacing with PS/2 mouse.

File:

• fb/ega.c (modified) (5 diffs)

fb/ega.c

@@ -50 +50 @@
 #include <ipc/ns.h>
 #include <ipc/services.h>
+#include <libarch/ddi.h>
 
 #include "ega.h"
@@ -71 +72 @@
 #define EGA_STYLE(fg,bg) ((fg) > (bg) ? NORMAL_COLOR : INVERTED_COLOR)
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-
 /* Allow only 1 connection */
 static int client_connected = 0;
@@ -84 +80 @@
 
 static unsigned int style = NORMAL_COLOR;
-
-static inline void outb(u16 port, u8 b)
-{
-        asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port));
-}
-
-static inline void outw(u16 port, u16 w)
-{
-        asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port));
-}
-
-static inline void outl(u16 port, u32 l)
-{
-        asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port));
-}
-
-static inline u8 inb(u16 port)
-{
-        u8 val;
-
-        asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port));
-        return val;
-}
-
-static inline u16 inw(u16 port)
-{
-        u16 val;
-
-        asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port));
-        return val;
-}
-
-static inline u32 inl(u16 port)
-{
-        u32 val;
-
-        asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port));
-        return val;
-}
-
-
-
 
 static void clrscr(void)
@@ -151 +105 @@
 static void cursor_disable(void)
 {
-        u8 stat;
+        uint8_t stat;
+
         outb(EGA_IO_ADDRESS , 0xa);
         stat=inb(EGA_IO_ADDRESS + 1);
@@ -160 +115 @@
 static void cursor_enable(void)
 {
-        u8 stat;
+        uint8_t stat;
+
         outb(EGA_IO_ADDRESS , 0xa);
         stat=inb(EGA_IO_ADDRESS + 1);