diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-08 15:57:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-08 15:57:51 +0000 |
| commit | 1f6b12f75f2c22f861d0202374033a7594c91707 (patch) | |
| tree | d73dab520852a93d373c1349596deefb0795455e /hw/display | |
| parent | 3ea3bd62451ac79478b440ad9fe2a4cd69783a1f (diff) | |
| parent | f41152bd9d01ab327c19a3828bb7896d67cf0752 (diff) | |
| download | qemu-1f6b12f75f2c22f861d0202374033a7594c91707.zip qemu-1f6b12f75f2c22f861d0202374033a7594c91707.tar.gz qemu-1f6b12f75f2c22f861d0202374033a7594c91707.tar.bz2 | |
Merge remote-tracking branch 'remotes/mwalle/tags/lm32-fixes/20140204' into staging
target-lm32: fixes
# gpg: Signature made Tue 04 Feb 2014 18:47:56 GMT using DSA key ID 3F98A378
# gpg: Can't check signature: public key not found
* remotes/mwalle/tags/lm32-fixes/20140204:
hw/lm32: print error if cpu model is not found
target-lm32: stop VM on illegal or unknown instruction
lm32_sys: dump cpu state if test case fails
lm32_sys: print test result on stderr
target-lm32: add breakpoint/watchpoint support
target-lm32: move model features to LM32CPU
target-lm32: kill cpu_abort() calls
milkymist-vgafb: swap pixel data in source buffer
lm32_uart/lm32_juart: use qemu_chr_fe_write_all()
milkymist-uart: use qemu_chr_fe_write_all() instead of qemu_chr_fe_write()
tests: lm32: new rule for single test cases
lm32_sys: increase test case name length limit
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/milkymist-vgafb_template.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/milkymist-vgafb_template.h b/hw/display/milkymist-vgafb_template.h index e0036e1..4883780 100644 --- a/hw/display/milkymist-vgafb_template.h +++ b/hw/display/milkymist-vgafb_template.h @@ -61,7 +61,7 @@ static void glue(draw_line_, BITS)(void *opaque, uint8_t *d, const uint8_t *s, uint8_t r, g, b; while (width--) { - memcpy(&rgb565, s, sizeof(rgb565)); + rgb565 = lduw_be_p(s); r = ((rgb565 >> 11) & 0x1f) << 3; g = ((rgb565 >> 5) & 0x3f) << 2; b = ((rgb565 >> 0) & 0x1f) << 3; |