diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2012-05-21 15:18:58 -0300 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-09-05 15:48:57 -0300 |
| commit | 8dc4cc7bb57d3f0d6a1d8ba372d9eda1494bcc64 (patch) | |
| tree | 9998c8027de04daabc48193f9af800375dc8792b | |
| parent | d663174dcd9623c44f3af2a46de2a55d16f15c19 (diff) | |
| download | focaccia-qemu-8dc4cc7bb57d3f0d6a1d8ba372d9eda1494bcc64.tar.gz focaccia-qemu-8dc4cc7bb57d3f0d6a1d8ba372d9eda1494bcc64.zip | |
omap_lcdc: rename ppm_save() to omap_ppm_save()
Avoids confusion with the global ppm_save() defined in hw/vga.c. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/omap_lcdc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 39b78cd6d5..3d6328febc 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -224,8 +224,8 @@ static void omap_update_display(void *opaque) omap_lcd->invalidate = 0; } -static int ppm_save(const char *filename, uint8_t *data, - int w, int h, int linesize) +static int omap_ppm_save(const char *filename, uint8_t *data, + int w, int h, int linesize) { FILE *f; uint8_t *d, *d1; @@ -271,9 +271,9 @@ static void omap_screen_dump(void *opaque, const char *filename, bool cswitch, omap_update_display(opaque); if (omap_lcd && ds_get_data(omap_lcd->state)) - ppm_save(filename, ds_get_data(omap_lcd->state), - omap_lcd->width, omap_lcd->height, - ds_get_linesize(omap_lcd->state)); + omap_ppm_save(filename, ds_get_data(omap_lcd->state), + omap_lcd->width, omap_lcd->height, + ds_get_linesize(omap_lcd->state)); } static void omap_invalidate_display(void *opaque) { |