diff options
author | David Miller <davem@davemloft.net> | 2011-01-11 18:51:56 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-22 02:47:15 -0400 |
commit | 9c96394bb90f855d265116f37897294fa1bdb072 (patch) | |
tree | 32be68190d978f04b075a8036836edd9294b82b1 /drivers/video/svgalib.c | |
parent | 1d28fcadb0e277844ebffb528cdfd25d44591035 (diff) |
svga: Make svga_set_textmode_vga_regs() take an iomem regbase pointer.
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.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index b0464977ed9b..ecda90ec4056 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c | |||
@@ -137,33 +137,33 @@ void svga_set_default_crt_regs(void __iomem *regbase) | |||
137 | vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3); | 137 | vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3); |
138 | } | 138 | } |
139 | 139 | ||
140 | void svga_set_textmode_vga_regs(void) | 140 | void svga_set_textmode_vga_regs(void __iomem *regbase) |
141 | { | 141 | { |
142 | /* svga_wseq_mask(NULL, 0x1, 0x00, 0x01); */ /* Switch 8/9 pixel per char */ | 142 | /* svga_wseq_mask(regbase, 0x1, 0x00, 0x01); */ /* Switch 8/9 pixel per char */ |
143 | vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM); | 143 | vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM); |
144 | vga_wseq(NULL, VGA_SEQ_PLANE_WRITE, 0x03); | 144 | vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0x03); |
145 | 145 | ||
146 | vga_wcrt(NULL, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */ | 146 | vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */ |
147 | vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0x1f); | 147 | vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0x1f); |
148 | svga_wcrt_mask(NULL, VGA_CRTC_MODE, 0x23, 0x7f); | 148 | svga_wcrt_mask(regbase, VGA_CRTC_MODE, 0x23, 0x7f); |
149 | 149 | ||
150 | vga_wcrt(NULL, VGA_CRTC_CURSOR_START, 0x0d); | 150 | vga_wcrt(regbase, VGA_CRTC_CURSOR_START, 0x0d); |
151 | vga_wcrt(NULL, VGA_CRTC_CURSOR_END, 0x0e); | 151 | vga_wcrt(regbase, VGA_CRTC_CURSOR_END, 0x0e); |
152 | vga_wcrt(NULL, VGA_CRTC_CURSOR_HI, 0x00); | 152 | vga_wcrt(regbase, VGA_CRTC_CURSOR_HI, 0x00); |
153 | vga_wcrt(NULL, VGA_CRTC_CURSOR_LO, 0x00); | 153 | vga_wcrt(regbase, VGA_CRTC_CURSOR_LO, 0x00); |
154 | 154 | ||
155 | vga_wgfx(NULL, VGA_GFX_MODE, 0x10); /* Odd/even memory mode */ | 155 | vga_wgfx(regbase, VGA_GFX_MODE, 0x10); /* Odd/even memory mode */ |
156 | vga_wgfx(NULL, VGA_GFX_MISC, 0x0E); /* Misc graphics register - text mode enable */ | 156 | vga_wgfx(regbase, VGA_GFX_MISC, 0x0E); /* Misc graphics register - text mode enable */ |
157 | vga_wgfx(NULL, VGA_GFX_COMPARE_MASK, 0x00); | 157 | vga_wgfx(regbase, VGA_GFX_COMPARE_MASK, 0x00); |
158 | 158 | ||
159 | vga_r(NULL, 0x3DA); | 159 | vga_r(regbase, 0x3DA); |
160 | vga_w(NULL, VGA_ATT_W, 0x00); | 160 | vga_w(regbase, VGA_ATT_W, 0x00); |
161 | 161 | ||
162 | svga_wattr(NULL, 0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */ | 162 | svga_wattr(regbase, 0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */ |
163 | svga_wattr(NULL, 0x13, 0x08); /* Horizontal Pixel Panning Register */ | 163 | svga_wattr(regbase, 0x13, 0x08); /* Horizontal Pixel Panning Register */ |
164 | 164 | ||
165 | vga_r(NULL, 0x3DA); | 165 | vga_r(regbase, 0x3DA); |
166 | vga_w(NULL, VGA_ATT_W, 0x20); | 166 | vga_w(regbase, VGA_ATT_W, 0x20); |
167 | } | 167 | } |
168 | 168 | ||
169 | #if 0 | 169 | #if 0 |