patch-2.2.11 linux/include/asm-mips/vga.h

Next file: linux/include/asm-mips/watch.h
Previous file: linux/include/asm-mips/unistd.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.10/linux/include/asm-mips/vga.h linux/include/asm-mips/vga.h
@@ -7,29 +7,14 @@
 #ifndef _LINUX_ASM_VGA_H_
 #define _LINUX_ASM_VGA_H_
 
-#include <asm/io.h>
+/*
+ *	On the PC, we can just recalculate addresses and then
+ *	access the videoram directly without any black magic.
+ */
 
-#define VT_BUF_HAVE_RW
+#define VGA_MAP_MEM(x) ((unsigned long)0xb0000000 + (unsigned long)(x))
 
-extern inline void scr_writew(u16 val, u16 *addr)
-{
-	if ((long) addr < 0)
-		*addr = val;
-	else
-		writew(val, (unsigned long) addr);
-}
-
-extern inline u16 scr_readw(const u16 *addr)
-{
-	if ((long) addr < 0)
-		return *addr;
-	else
-		return readw((unsigned long) addr);
-}
-
-#define vga_readb readb
-#define vga_writeb writeb
-
-#define VGA_MAP_MEM(x) (x)
+#define vga_readb(x) (*(x))
+#define vga_writeb(x,y) (*(y) = (x))
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)