[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 07/13] sm501: Fix device endianness
From: |
BALATON Zoltan |
Subject: |
[Qemu-devel] [PATCH v5 07/13] sm501: Fix device endianness |
Date: |
Thu, 20 Apr 2017 22:43:46 +0200 |
We only emulate the sysbus device in its default LE mode and PCI is LE
as well so specify this for registers and framebuffer memory.
Signed-off-by: BALATON Zoltan <address@hidden>
---
v2: Split off small clean up to other patch
v4: Set serial part to little endian as well
v5: Make framebuffer always LE as suggested by Peter Maydell
hw/display/sm501.c | 8 ++++----
hw/display/sm501_template.h | 19 ++++++-------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index c92a5fa..a628ef1 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -850,7 +850,7 @@ static const MemoryRegionOps sm501_system_config_ops = {
.min_access_size = 4,
.max_access_size = 4,
},
- .endianness = DEVICE_NATIVE_ENDIAN,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
static uint32_t sm501_palette_read(void *opaque, hwaddr addr)
@@ -1086,7 +1086,7 @@ static const MemoryRegionOps sm501_disp_ctrl_ops = {
.min_access_size = 4,
.max_access_size = 4,
},
- .endianness = DEVICE_NATIVE_ENDIAN,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr,
@@ -1174,7 +1174,7 @@ static const MemoryRegionOps sm501_2d_engine_ops = {
.min_access_size = 4,
.max_access_size = 4,
},
- .endianness = DEVICE_NATIVE_ENDIAN,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
/* draw line functions for all console modes */
@@ -1510,7 +1510,7 @@ static void sm501_realize_sysbus(DeviceState *dev, Error
**errp)
if (s->chr_state) {
serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
NULL, /* TODO : chain irq to IRL */
- 115200, s->chr_state, DEVICE_NATIVE_ENDIAN);
+ 115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
}
}
diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h
index 832ee61..54807bd 100644
--- a/hw/display/sm501_template.h
+++ b/hw/display/sm501_template.h
@@ -64,10 +64,10 @@ static void glue(draw_line16_, PIXEL_NAME)(
uint8_t r, g, b;
do {
- rgb565 = lduw_p(s);
- r = ((rgb565 >> 11) & 0x1f) << 3;
- g = ((rgb565 >> 5) & 0x3f) << 2;
- b = ((rgb565 >> 0) & 0x1f) << 3;
+ rgb565 = lduw_le_p(s);
+ r = (rgb565 >> 8) & 0xf8;
+ g = (rgb565 >> 3) & 0xfc;
+ b = (rgb565 << 3) & 0xf8;
*(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);
s += 2;
d += BPP;
@@ -80,16 +80,9 @@ static void glue(draw_line32_, PIXEL_NAME)(
uint8_t r, g, b;
do {
- ldub_p(s);
-#if defined(TARGET_WORDS_BIGENDIAN)
- r = s[1];
- g = s[2];
- b = s[3];
-#else
- b = s[0];
- g = s[1];
r = s[2];
-#endif
+ g = s[1];
+ b = s[0];
*(PIXEL_TYPE *)d = glue(rgb_to_pixel, PIXEL_NAME)(r, g, b);
s += 4;
d += BPP;
--
2.7.4
- [Qemu-devel] [PATCH v5 00/13] Improvements for SM501 display controller emulation, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 13/13] ppc: Add SM501 device in ppc softmmu targets default configs, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 07/13] sm501: Fix device endianness,
BALATON Zoltan <=
- [Qemu-devel] [PATCH v5 10/13] sm501: Add support for panel layer, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 03/13] sm501: Add missing arbitration control register, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 11/13] sm501: Add some more missing registers, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 09/13] sm501: Misc clean ups, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 05/13] sm501: Get rid of base address in draw_hwc_line, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 02/13] sm501: Use defined constants instead of literal values where available, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 04/13] sm501: QOMify, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 06/13] sm501: Add emulation of chip connected via PCI, BALATON Zoltan, 2017/04/20
- [Qemu-devel] [PATCH v5 12/13] sm501: Add vmstate descriptor, BALATON Zoltan, 2017/04/20