diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2012-01-14 22:18:18 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2012-01-16 11:59:32 -0500 |
| commit | 2c23a7ab6a1b1616835715949144c9adab331186 (patch) | |
| tree | e2bf4ae30c4bd134f9165d66bb28b3c825fc566e /vgasrc/geodevga.c | |
| parent | add3becb5d4fa16092c26accd5265cfee7036ac7 (diff) | |
| download | seabios-2c23a7ab6a1b1616835715949144c9adab331186.tar.gz | |
vgabios: Use standard VGA IO wrappers in geodevga.c.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'vgasrc/geodevga.c')
| -rw-r--r-- | vgasrc/geodevga.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index c1e4244b..3da1b7c0 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -12,7 +12,7 @@ #include "biosvar.h" // GET_BDA #include "vgabios.h" // VGAREG_* #include "util.h" // memset -#include "stdvga.h" // VGAREG_VGA_CRTC_ADDRESS +#include "stdvga.h" // stdvga_crtc_write /**************************************************************** @@ -110,33 +110,28 @@ static int legacyio_check(void) ****************************************************************/ static void crtce_lock(void) { - outb(EXTENDED_REGISTER_LOCK , VGAREG_VGA_CRTC_ADDRESS); - outb(CRTCE_LOCK, VGAREG_VGA_CRTC_DATA); + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_REGISTER_LOCK + , CRTCE_LOCK); } static void crtce_unlock(void) { - outb(EXTENDED_REGISTER_LOCK , VGAREG_VGA_CRTC_ADDRESS); - outb(CRTCE_UNLOCK, VGAREG_VGA_CRTC_DATA); + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_REGISTER_LOCK + , CRTCE_UNLOCK); } static u8 crtce_read(u8 reg) { - u8 val; - crtce_unlock(); - outb(reg , VGAREG_VGA_CRTC_ADDRESS); - val = inb(VGAREG_VGA_CRTC_DATA); + u8 val = stdvga_crtc_read(VGAREG_VGA_CRTC_ADDRESS, reg); crtce_lock(); - return val; } static void crtce_write(u8 reg, u8 val) { crtce_unlock(); - outb(reg , VGAREG_VGA_CRTC_ADDRESS); - outb(val, VGAREG_VGA_CRTC_DATA); + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, reg, val); crtce_lock(); } |