X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=hw%2Fpxa2xx_lcd.c;h=715b2f1a48522b3b60ef2f56d020fb1a21af5bfd;hb=0e1f5a0c495dd7a5c72c9321a29541bdde8f423a;hp=5e834fe76e1671b8171994599375ad364495d9e3;hpb=cab3bee2d6f1d6eb6ad74006b8a63562cda9ba4d;p=qemu.git diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index 5e834fe76..715b2f1a4 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -650,7 +650,7 @@ static void pxa2xx_palette_parse(struct pxa2xx_lcdc_s *s, int ch, int bpp) } break; } - switch (s->ds->depth) { + switch (ds_get_bits_per_pixel(s->ds)) { case 8: *dest = rgb_to_pixel8(r, g, b) | alpha; break; @@ -693,7 +693,7 @@ static void pxa2xx_lcdc_dma0_redraw_horiz(struct pxa2xx_lcdc_s *s, else if (s->bpp > pxa_lcdc_8bpp) src_width *= 2; - dest = s->ds->data; + dest = ds_get_data(s->ds); dest_width = s->xres * s->dest_width; addr = (ram_addr_t) (fb - phys_ram_base); @@ -750,7 +750,7 @@ static void pxa2xx_lcdc_dma0_redraw_vert(struct pxa2xx_lcdc_s *s, src_width *= 2; dest_width = s->yres * s->dest_width; - dest = s->ds->data + dest_width * (s->xres - 1); + dest = ds_get_data(s->ds) + dest_width * (s->xres - 1); addr = (ram_addr_t) (fb - phys_ram_base); start = addr + s->yres * src_width; @@ -1006,7 +1006,7 @@ struct pxa2xx_lcdc_s *pxa2xx_lcdc_init(target_phys_addr_t base, qemu_irq irq, pxa2xx_invalidate_display, pxa2xx_screen_dump, NULL, s); - switch (s->ds->depth) { + switch (ds_get_bits_per_pixel(s->ds)) { case 0: s->dest_width = 0; break;