From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azkfY-0006d8-4l for qemu-devel@nongnu.org; Mon, 09 May 2016 08:52:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azkfK-0005Nz-Mk for qemu-devel@nongnu.org; Mon, 09 May 2016 08:52:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azkfK-0005Ne-Hp for qemu-devel@nongnu.org; Mon, 09 May 2016 08:52:02 -0400 From: Gerd Hoffmann Date: Mon, 9 May 2016 14:51:47 +0200 Message-Id: <1462798310-21395-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1462798310-21395-1-git-send-email-kraxel@redhat.com> References: <1462798310-21395-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/5] vga: add vbe_enabled() helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gerd Hoffmann Makes code a bit easier to read. Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index b9191ca..0c1c5b5 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -142,6 +142,11 @@ static uint32_t expand4[256]; static uint16_t expand2[256]; static uint8_t expand4to8[16]; +static inline bool vbe_enabled(VGACommonState *s) +{ + return s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED; +} + static void vga_update_memory_access(VGACommonState *s) { hwaddr base, offset, size; @@ -564,7 +569,7 @@ static void vbe_fixup_regs(VGACommonState *s) uint16_t *r = s->vbe_regs; uint32_t bits, linelength, maxy, offset; - if (!(r[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED)) { + if (!vbe_enabled(s)) { /* vbe is turned off -- nothing to do */ return; } @@ -1058,7 +1063,7 @@ static void vga_get_offsets(VGACommonState *s, { uint32_t start_addr, line_offset, line_compare; - if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { + if (vbe_enabled(s)) { line_offset = s->vbe_line_offset; start_addr = s->vbe_start_addr; line_compare = 65535; @@ -1383,7 +1388,7 @@ static int vga_get_bpp(VGACommonState *s) { int ret; - if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { + if (vbe_enabled(s)) { ret = s->vbe_regs[VBE_DISPI_INDEX_BPP]; } else { ret = 0; @@ -1395,7 +1400,7 @@ static void vga_get_resolution(VGACommonState *s, int *pwidth, int *pheight) { int width, height; - if (s->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) { + if (vbe_enabled(s)) { width = s->vbe_regs[VBE_DISPI_INDEX_XRES]; height = s->vbe_regs[VBE_DISPI_INDEX_YRES]; } else { -- 1.8.3.1