diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-25 13:41:48 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-02-25 13:41:48 +0100 |
| commit | 9e264985ff0bc86927b44b334bd504687f78659d (patch) | |
| tree | 0e0cf83ea14b7cd84f255eedb15ffbf4c395d1ed /hw/display/omap_lcdc.c | |
| parent | ca6155c0f2bd39b4b4162533be401c98bd960820 (diff) | |
| parent | adeefe01671fb06a930beba624dc3db8367901a3 (diff) | |
| download | focaccia-qemu-9e264985ff0bc86927b44b334bd504687f78659d.tar.gz focaccia-qemu-9e264985ff0bc86927b44b334bd504687f78659d.zip | |
Merge branch 'exec_rw_const_v4' of https://github.com/philmd/qemu into HEAD
Diffstat (limited to 'hw/display/omap_lcdc.c')
| -rw-r--r-- | hw/display/omap_lcdc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 6ad13f2e9e..fa4a381db6 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -91,9 +91,9 @@ static void omap_update_display(void *opaque) frame_offset = 0; if (omap_lcd->plm != 2) { - cpu_physical_memory_read(omap_lcd->dma->phys_framebuffer[ - omap_lcd->dma->current_frame], - (void *)omap_lcd->palette, 0x200); + cpu_physical_memory_read( + omap_lcd->dma->phys_framebuffer[omap_lcd->dma->current_frame], + omap_lcd->palette, 0x200); switch (omap_lcd->palette[0] >> 12 & 7) { case 3 ... 7: frame_offset += 0x200; @@ -244,8 +244,8 @@ static void omap_lcd_update(struct omap_lcd_panel_s *s) { if (s->plm != 2 && !s->palette_done) { cpu_physical_memory_read( - s->dma->phys_framebuffer[s->dma->current_frame], - (void *)s->palette, 0x200); + s->dma->phys_framebuffer[s->dma->current_frame], + s->palette, 0x200); s->palette_done = 1; omap_lcd_interrupts(s); } |