vga: add vbe_enabled() helper
Makes code a bit easier to read. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
3bf1817079
commit
bfa0f151a5
|
@ -142,6 +142,11 @@ static uint32_t expand4[256];
|
||||||
static uint16_t expand2[256];
|
static uint16_t expand2[256];
|
||||||
static uint8_t expand4to8[16];
|
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)
|
static void vga_update_memory_access(VGACommonState *s)
|
||||||
{
|
{
|
||||||
hwaddr base, offset, size;
|
hwaddr base, offset, size;
|
||||||
|
@ -564,7 +569,7 @@ static void vbe_fixup_regs(VGACommonState *s)
|
||||||
uint16_t *r = s->vbe_regs;
|
uint16_t *r = s->vbe_regs;
|
||||||
uint32_t bits, linelength, maxy, offset;
|
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 */
|
/* vbe is turned off -- nothing to do */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1058,7 +1063,7 @@ static void vga_get_offsets(VGACommonState *s,
|
||||||
{
|
{
|
||||||
uint32_t start_addr, line_offset, line_compare;
|
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;
|
line_offset = s->vbe_line_offset;
|
||||||
start_addr = s->vbe_start_addr;
|
start_addr = s->vbe_start_addr;
|
||||||
line_compare = 65535;
|
line_compare = 65535;
|
||||||
|
@ -1383,7 +1388,7 @@ static int vga_get_bpp(VGACommonState *s)
|
||||||
{
|
{
|
||||||
int ret;
|
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];
|
ret = s->vbe_regs[VBE_DISPI_INDEX_BPP];
|
||||||
} else {
|
} else {
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
@ -1395,7 +1400,7 @@ static void vga_get_resolution(VGACommonState *s, int *pwidth, int *pheight)
|
||||||
{
|
{
|
||||||
int width, height;
|
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];
|
width = s->vbe_regs[VBE_DISPI_INDEX_XRES];
|
||||||
height = s->vbe_regs[VBE_DISPI_INDEX_YRES];
|
height = s->vbe_regs[VBE_DISPI_INDEX_YRES];
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue