[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v5 05/13] sm501: Get rid of base address in draw_h
From: |
BALATON Zoltan |
Subject: |
[Qemu-trivial] [PATCH v5 05/13] sm501: Get rid of base address in draw_hwc_line |
Date: |
Thu, 20 Apr 2017 22:43:46 +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>
---
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-trivial] [PATCH v5 00/13] Improvements for SM501 display controller emulation, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 13/13] ppc: Add SM501 device in ppc softmmu targets default configs, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 02/13] sm501: Use defined constants instead of literal values where available, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 03/13] sm501: Add missing arbitration control register, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 10/13] sm501: Add support for panel layer, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 07/13] sm501: Fix device endianness, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 05/13] sm501: Get rid of base address in draw_hwc_line,
BALATON Zoltan <=
- [Qemu-trivial] [PATCH v5 09/13] sm501: Misc clean ups, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 12/13] sm501: Add vmstate descriptor, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 06/13] sm501: Add emulation of chip connected via PCI, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 08/13] sm501: Fix hardware cursor, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 04/13] sm501: QOMify, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 11/13] sm501: Add some more missing registers, BALATON Zoltan, 2017/04/20
- [Qemu-trivial] [PATCH v5 01/13] sm501: Fixed code style and a few typos in comments, BALATON Zoltan, 2017/04/20