aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/svgalib.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 23:49:18 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 15:46:40 +0900
commitf6b0cc477de99fe715f1071b13ab822daed9a34f (patch)
tree44c597c18899d1434c549cd3d3fb7a991537a406 /drivers/video/svgalib.c
parent1284e49cf186eaa19056e85a76a443d4eca8995d (diff)
downloadkernel_samsung_smdk4412-f6b0cc477de99fe715f1071b13ab822daed9a34f.zip
kernel_samsung_smdk4412-f6b0cc477de99fe715f1071b13ab822daed9a34f.tar.gz
kernel_samsung_smdk4412-f6b0cc477de99fe715f1071b13ab822daed9a34f.tar.bz2
svga: Make svga_wattr take an iomem regbase pointer.
And use vga_{r,w}(). Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/svgalib.c')
-rw-r--r--drivers/video/svgalib.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index fdb4567..59c99fd 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -102,14 +102,14 @@ void svga_set_default_atc_regs(void)
/* All standard ATC registers (AR00 - AR14) */
for (count = 0; count <= 0xF; count ++)
- svga_wattr(count, count);
+ svga_wattr(NULL, count, count);
- svga_wattr(VGA_ATC_MODE, 0x01);
-/* svga_wattr(VGA_ATC_MODE, 0x41); */
- svga_wattr(VGA_ATC_OVERSCAN, 0x00);
- svga_wattr(VGA_ATC_PLANE_ENABLE, 0x0F);
- svga_wattr(VGA_ATC_PEL, 0x00);
- svga_wattr(VGA_ATC_COLOR_PAGE, 0x00);
+ svga_wattr(NULL, VGA_ATC_MODE, 0x01);
+/* svga_wattr(NULL, VGA_ATC_MODE, 0x41); */
+ svga_wattr(NULL, VGA_ATC_OVERSCAN, 0x00);
+ svga_wattr(NULL, VGA_ATC_PLANE_ENABLE, 0x0F);
+ svga_wattr(NULL, VGA_ATC_PEL, 0x00);
+ svga_wattr(NULL, VGA_ATC_COLOR_PAGE, 0x00);
vga_r(NULL, 0x3DA);
vga_w(NULL, VGA_ATT_W, 0x20);
@@ -159,8 +159,8 @@ void svga_set_textmode_vga_regs(void)
vga_r(NULL, 0x3DA);
vga_w(NULL, VGA_ATT_W, 0x00);
- svga_wattr(0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */
- svga_wattr(0x13, 0x08); /* Horizontal Pixel Panning Register */
+ svga_wattr(NULL, 0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */
+ svga_wattr(NULL, 0x13, 0x08); /* Horizontal Pixel Panning Register */
vga_r(NULL, 0x3DA);
vga_w(NULL, VGA_ATT_W, 0x20);