[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/13] sm501: Get rid of base address in draw_hwc
From: |
BALATON Zoltan |
Subject: |
[Qemu-devel] [PATCH v7 05/13] sm501: Get rid of base address in draw_hwc_line |
Date: |
Fri, 21 Apr 2017 17:18:09 +0200 |
Do not use the base address to access data in local memory. This is in
preparation to allow chip connected via PCI where base address depends
on where the BAR is mapped so it will be unknown.
Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Tested-by: Aurelien Jarno <address@hidden>
---
hw/display/sm501.c | 6 ++----
hw/display/sm501_template.h | 8 ++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 571a7e6..09c023d 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -461,7 +461,6 @@ typedef struct SM501State {
QemuConsole *con;
/* status & internal resources */
- hwaddr base;
uint32_t local_mem_size_index;
uint8_t *local_mem;
MemoryRegion local_mem_region;
@@ -1432,10 +1431,9 @@ static void sm501_reset(SM501State *s)
s->twoD_control = 0;
}
-static void sm501_init(SM501State *s, DeviceState *dev, uint32_t base,
+static void sm501_init(SM501State *s, DeviceState *dev,
uint32_t local_mem_bytes)
{
- s->base = base;
s->local_mem_size_index = get_local_mem_size_index(local_mem_bytes);
SM501_DPRINTF("sm501 local mem size=%x. index=%d\n", get_local_mem_size(s),
s->local_mem_size_index);
@@ -1489,7 +1487,7 @@ static void sm501_realize_sysbus(DeviceState *dev, Error
**errp)
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
DeviceState *usb_dev;
- sm501_init(&s->state, dev, s->base, s->vram_size);
+ sm501_init(&s->state, dev, s->vram_size);
if (get_local_mem_size(&s->state) != s->vram_size) {
error_setg(errp, "Invalid VRAM size, nearest valid size is %" PRIu32,
get_local_mem_size(&s->state));
diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h
index 16e500b..832ee61 100644
--- a/hw/display/sm501_template.h
+++ b/hw/display/sm501_template.h
@@ -103,13 +103,13 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State
*s, int crt,
uint8_t *palette, int c_y, uint8_t *d, int width)
{
int x, i;
- uint8_t bitset = 0;
+ uint8_t *pixval, bitset = 0;
/* get hardware cursor pattern */
uint32_t cursor_addr = get_hwc_address(s, crt);
assert(0 <= c_y && c_y < SM501_HWC_HEIGHT);
cursor_addr += SM501_HWC_WIDTH * c_y / 4; /* 4 pixels per byte */
- cursor_addr += s->base;
+ pixval = s->local_mem + cursor_addr;
/* get cursor position */
x = get_hwc_x(s, crt);
@@ -120,8 +120,8 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(SM501State *s,
int crt,
/* get pixel value */
if (i % 4 == 0) {
- bitset = ldub_phys(&address_space_memory, cursor_addr);
- cursor_addr++;
+ bitset = ldub_p(pixval);
+ pixval++;
}
v = bitset & 3;
bitset >>= 2;
--
2.7.4
- [Qemu-devel] [PATCH v7 08/13] sm501: Fix hardware cursor, (continued)
- [Qemu-devel] [PATCH v7 08/13] sm501: Fix hardware cursor, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 04/13] sm501: QOMify, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 10/13] sm501: Add support for panel layer, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 13/13] ppc: Add SM501 device in ppc softmmu targets default configs, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 12/13] sm501: Add vmstate descriptor, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 01/13] sm501: Fixed code style and a few typos in comments, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 11/13] sm501: Add some more missing registers, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 02/13] sm501: Use defined constants instead of literal values where available, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 03/13] sm501: Add missing arbitration control register, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 07/13] sm501: Fix device endianness, BALATON Zoltan, 2017/04/21
- [Qemu-devel] [PATCH v7 05/13] sm501: Get rid of base address in draw_hwc_line,
BALATON Zoltan <=
- Re: [Qemu-devel] [PATCH v7 00/13] Improvements for SM501 display controller emulation, Aurelien Jarno, 2017/04/22
- Re: [Qemu-devel] [PATCH v7 00/13] Improvements for SM501 display controller emulation, Peter Maydell, 2017/04/24