patch-2.3.16 linux/include/asm-alpha/vga.h

• Lines: 33
• Date: Tue Aug 31 10:50:48 1999
• Orig file: v2.3.15/linux/include/asm-alpha/vga.h
• Orig date: Mon Aug 16 10:33:58 1999

diff -u --recursive --new-file v2.3.15/linux/include/asm-alpha/vga.h linux/include/asm-alpha/vga.h
@@ -16,7 +16,7 @@
 extern inline void scr_writew(u16 val, u16 *addr)
 {
 	if (__is_ioaddr((unsigned long) addr))
-		writew(val, (unsigned long) addr);
+		__raw_writew(val, (unsigned long) addr);
 	else
 		*addr = val;
 }
@@ -24,7 +24,7 @@
 extern inline u16 scr_readw(const u16 *addr)
 {
 	if (__is_ioaddr((unsigned long) addr))
-		return readw((unsigned long) addr);
+		return __raw_readw((unsigned long) addr);
 	else
 		return *addr;
 }
@@ -47,9 +47,11 @@
 	memcpy_toio(d, s, count);
 }
 
-
-#define vga_readb readb
-#define vga_writeb writeb
+/* ??? These are currently only used for downloading character sets.  As
+   such, they don't need memory barriers.  Is this all they are intended
+   to be used for?  */
+#define vga_readb	readb
+#define vga_writeb	writeb
 
 #define VGA_MAP_MEM(x)	((unsigned long) ioremap((x), 0))