Changeset dc5a0fe1 in mainline

Timestamp:

2006-06-03T16:16:44Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

429acb9

Parents:

90f5d64

Message:

Ega cursor movement support

Files:

• fb/ega.c (modified) (6 diffs)
• tetris/screen.c (modified) (1 diff)

fb/ega.c

@@ -44 +44 @@
 #include "main.h"
 
+
+#define EGA_IO_ADDRESS 0x3d4
+#define EGA_IO_SIZE 2
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+
 /* Allow only 1 connection */
 static int client_connected = 0;
@@ -52 +61 @@
 
 static unsigned int style = 0x0f;
+
+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)
@@ -63 +114 @@
 }
 
+void cursor_goto(unsigned int row, unsigned int col)
+{
+        int ega_cursor;
+
+        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);
+}
+
+void cursor_disable(void)
+{
+        u8 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) );
+}
+
+void cursor_enable(void)
+{
+        u8 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)) );
+}
+
 static void printchar(char c, unsigned int row, unsigned int col)
 {
         scr_addr[(row*scr_width + col)*2] = c;
         scr_addr[(row*scr_width + col)*2+1] = style;
+        
+        cursor_goto(row,col+1);
 }
 
@@ -142 +225 @@
                         retval = 0;
                         break;
+                case FB_CURSOR_GOTO:
+                        row = IPC_GET_ARG1(call);
+                        col = IPC_GET_ARG2(call);
+                        if (row >= scr_height || col >= scr_width) {
+                                retval = EINVAL;
+                                break;
+                        }
+                        cursor_goto(row,col);
+                        retval = 0;
+                        break;
+                case FB_CURSOR_VISIBILITY:
+                        if(IPC_GET_ARG1(call))
+                                cursor_enable();
+                        else
+                                cursor_disable();
+                        retval = 0;
+                        break;
                 case FB_SET_STYLE:
                         fgcolor = IPC_GET_ARG1(call);
@@ -165 +265 @@
         scr_width=sysinfo_value("fb.width");
         scr_height=sysinfo_value("fb.height");
+        iospace_enable(task_get_id(),(void *)EGA_IO_ADDRESS,2);
 
         sz = scr_width*scr_height*2;
@@ -178 +279 @@
         return 0;
 }
+

tetris/screen.c

@@ -56 +56 @@
 static int curscore;
 static int isset;               /* true => terminal is in game mode */
-static struct termios oldtt;
 static void (*tstp)(int);