65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 26 Apr 2016 14:11:34 +0200
|
|
Subject: [PATCH] vga: add vbe_enabled() helper
|
|
|
|
Makes code a bit easier to read.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit bfa0f151a564a83b5a26f3e917da98674bf3cf62)
|
|
---
|
|
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 a26c8f4..955ad6f 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;
|
|
@@ -562,7 +567,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;
|
|
}
|
|
@@ -1056,7 +1061,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;
|
|
@@ -1381,7 +1386,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;
|
|
@@ -1393,7 +1398,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 {
|