[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] sm501: Use defines instead of constants where
From: |
BALATON Zoltan |
Subject: |
[Qemu-devel] [PATCH 02/10] sm501: Use defines instead of constants where available |
Date: |
Sun, 19 Feb 2017 17:35:23 +0100 |
Signed-off-by: BALATON Zoltan <address@hidden>
---
hw/display/sm501.c | 8 ++++----
hw/display/sm501_template.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 4f40dee..4eb085c 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -555,7 +555,7 @@ static uint32_t get_local_mem_size_index(uint32_t size)
static inline int is_hwc_enabled(SM501State *state, int crt)
{
uint32_t addr = crt ? state->dc_crt_hwc_addr : state->dc_panel_hwc_addr;
- return addr & 0x80000000;
+ return addr & SM501_HWC_EN;
}
/**
@@ -1411,9 +1411,9 @@ void sm501_init(MemoryRegion *address_space_mem, uint32_t
base,
s->local_mem_size_index = get_local_mem_size_index(local_mem_bytes);
SM501_DPRINTF("local mem size=%x. index=%d\n", get_local_mem_size(s),
s->local_mem_size_index);
- s->system_control = 0x00100000;
- s->misc_control = 0x00001000; /* assumes SH, active=low */
- s->dc_panel_control = 0x00010000;
+ s->system_control = 0x00100000; /* 2D engine FIFO empty */
+ s->misc_control = SM501_MISC_IRQ_INVERT; /* assumes SH, active=low */
+ s->dc_panel_control = 0x00010000; /* FIFO level 3 */
s->dc_crt_control = 0x00010000;
/* allocate local memory */
diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h
index aeeac5d..16e500b 100644
--- a/hw/display/sm501_template.h
+++ b/hw/display/sm501_template.h
@@ -108,7 +108,7 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State *s,
int crt,
/* get hardware cursor pattern */
uint32_t cursor_addr = get_hwc_address(s, crt);
assert(0 <= c_y && c_y < SM501_HWC_HEIGHT);
- cursor_addr += 64 * c_y / 4; /* 4 pixels per byte */
+ cursor_addr += SM501_HWC_WIDTH * c_y / 4; /* 4 pixels per byte */
cursor_addr += s->base;
/* get cursor position */
--
2.7.4
- [Qemu-devel] [PATCH 09/10] sm501: Add some more missing registers, (continued)
[Qemu-devel] [PATCH 03/10] sm501: QOMify, BALATON Zoltan, 2017/02/19
[Qemu-devel] [PATCH 02/10] sm501: Use defines instead of constants where available,
BALATON Zoltan <=
[Qemu-devel] [PATCH 08/10] sm501: Add support for panel layer, BALATON Zoltan, 2017/02/19
[Qemu-devel] [PATCH 07/10] sm501: Fix hardware cursor, BALATON Zoltan, 2017/02/19
[Qemu-devel] [PATCH 05/10] sm501: Add missing arbitration control register, BALATON Zoltan, 2017/02/19
[Qemu-devel] [PATCH 06/10] sm501: Fix device endianness, BALATON Zoltan, 2017/02/19