From f61afb897f40a6bdd8e15585e478881127ef87bf Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 16 May 2009 21:32:27 -0400 Subject: [PATCH] VGA: Use GET_IVT macro instead of raw GET_FARVAR. --- vgasrc/vga.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/vgasrc/vga.c b/vgasrc/vga.c index a4a3bef..b7cddee 100644 --- a/vgasrc/vga.c +++ b/vgasrc/vga.c @@ -1761,14 +1761,10 @@ biosfn_save_video_state(u16 CX, u16 ES, u16 BX) SET_FARVAR(ES, *(u8*)(BX+0), GET_BDA(video_page)); BX++; /* current font */ - SET_FARVAR(ES, *(u16*)(BX+0), GET_FARVAR(0, *(u16*)(0x1f * 4))); - BX += 2; - SET_FARVAR(ES, *(u16*)(BX+0), GET_FARVAR(0, *(u16*)(0x1f * 4 + 2))); - BX += 2; - SET_FARVAR(ES, *(u16*)(BX+0), GET_FARVAR(0, *(u16*)(0x43 * 4))); - BX += 2; - SET_FARVAR(ES, *(u16*)(BX+0), GET_FARVAR(0, *(u16*)(0x43 * 4 + 2))); - BX += 2; + SET_FARVAR(ES, *(u32*)(BX+0), GET_IVT(0x1f).segoff); + BX += 4; + SET_FARVAR(ES, *(u32*)(BX+0), GET_IVT(0x43).segoff); + BX += 4; } if (CX & 4) { /* XXX: check this */ -- 2.25.1