From 9a4043dc7e3a28607079caaaa9360172ffa73038 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 29 Apr 2016 08:45:23 +0200 Subject: [PATCH 2/5] vga: add vbe_enabled() helper RH-Author: Gerd Hoffmann Message-id: <1461919526-28456-3-git-send-email-kraxel@redhat.com> Patchwork-id: 70309 O-Subject: [virt-devel] [RHEL-7.2.z qemu-kvm-rhev PATCH 2/5] vga: add vbe_enabled() helper Bugzilla: 1331414 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Laszlo Ersek RH-Acked-by: Dr. David Alan Gilbert Makes code a bit easier to read. Signed-off-by: Gerd Hoffmann Signed-off-by: Miroslav Rezanina --- hw/display/vga.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 2572f51..5bd0f50 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -140,6 +140,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; @@ -561,7 +566,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; } @@ -745,7 +750,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val) /* width */ s->cr[VGA_CRTC_H_DISP] = (s->vbe_regs[VBE_DISPI_INDEX_XRES] >> 3) - 1; - /* height (only meaningful if < 1024) */ + /* height (only meaningful if < 1024) */ h = s->vbe_regs[VBE_DISPI_INDEX_YRES] - 1; s->cr[VGA_CRTC_V_DISP_END] = h; s->cr[VGA_CRTC_OVERFLOW] = (s->cr[VGA_CRTC_OVERFLOW] & ~0x42) | @@ -1055,7 +1060,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; @@ -1380,7 +1385,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; @@ -1392,7 +1397,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