Skip to contentSkip to conversation

musicpal: Fix regression caused by 6839

PATCH Applied Jan Kiszka 2 participants 2 messages Mar 14, 2009 – Mar 28, 2009

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 musicpal: Fix regression caused by 6839

[ Mmh, I was hoping that bringing down "normal" warnings to a minimum would help people noticing patch regressions more easily... ]

Pass correct DisplayState field to is_surface_bgr().

---

 hw/musicpal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
hw/musicpal.c +2 -1
index abd3afa..8eb1316 100644
@@ -831,7 +831,8 @@ static void lcd_refresh(void *opaque)
         break;
     LCD_REFRESH(8, rgb_to_pixel8)
     LCD_REFRESH(16, rgb_to_pixel16)
-    LCD_REFRESH(32, (is_surface_bgr(s->ds) ? rgb_to_pixel32bgr : rgb_to_pixel32))
+    LCD_REFRESH(32, (is_surface_bgr(s->ds->surface) ?
+                     rgb_to_pixel32bgr : rgb_to_pixel32))
     default:
         cpu_abort(cpu_single_env, "unsupported colour depth %i\n",
                   ds_get_bits_per_pixel(s->ds));
#1 lore raw
Quoted 7 lines · Jan Kiszka

[ Mmh, I was hoping that bringing down "normal" warnings to a minimum would help people noticing patch regressions more easily... ]

Pass correct DisplayState field to is_surface_bgr().

Applied. Thanks.

Regards,

Anthony Liguori

Quoted 23 lines

---

 hw/musicpal.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
hw/musicpal.c +2 -1
index abd3afa..8eb1316 100644
@@ -831,7 +831,8 @@ static void lcd_refresh(void *opaque)
         break;
     LCD_REFRESH(8, rgb_to_pixel8)
     LCD_REFRESH(16, rgb_to_pixel16)
-    LCD_REFRESH(32, (is_surface_bgr(s->ds) ? rgb_to_pixel32bgr : rgb_to_pixel32))
+    LCD_REFRESH(32, (is_surface_bgr(s->ds->surface) ?
+                     rgb_to_pixel32bgr : rgb_to_pixel32))
     default:
         cpu_abort(cpu_single_env, "unsupported colour depth %i\n",
                   ds_get_bits_per_pixel(s->ds));