| From 6e615e8fbbd979134868bcd63150365d48d12137 Mon Sep 17 00:00:00 2001 |
| From: Gerd Hoffmann <kraxel@redhat.com> |
| Date: Thu, 28 Apr 2016 16:07:29 +0200 |
| Subject: [PATCH 24/27] vga: add vbe_enabled() helper |
| |
| RH-Author: Gerd Hoffmann <kraxel@redhat.com> |
| Message-id: <1461859652-20918-4-git-send-email-kraxel@redhat.com> |
| Patchwork-id: 70294 |
| O-Subject: [virt-devel] [RHEL-7.3 qemu-kvm PATCH 3/6] vga: add vbe_enabled() helper |
| Bugzilla: 1331413 |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> |
| |
| Makes code a bit easier to read. |
| |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| 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 ba171ba..b694a26 100644 |
| |
| |
| @@ -166,6 +166,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) |
| { |
| MemoryRegion *region, *old_region = s->chain4_alias; |
| @@ -591,7 +596,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; |
| } |
| @@ -775,7 +780,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) | |
| @@ -1170,7 +1175,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; |
| @@ -1623,7 +1628,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; |
| @@ -1635,7 +1640,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 |
| |