Message ID | 1326674823-13069-2-git-send-email-afaerber@suse.de |
---|---|
State | New |
Headers | show |
On 16 January 2012 00:46, Andreas Färber <afaerber@suse.de> wrote: > diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h > index 69af9ef..544b55e 100644 > --- a/hw/milkymist-vgafb_template.h > +++ b/hw/milkymist-vgafb_template.h > @@ -39,7 +39,7 @@ > #elif BITS == 24 > #define COPY_PIXEL(to, r, g, b) \ > do { \ > - uint32 tmp = rgb_to_pixel24(r, g, b); \ > + uint32_t tmp = rgb_to_pixel24(r, g, b); \ > *(to++) = tmp & 0xff; \ > *(to++) = (tmp >> 8) & 0xff; \ > *(to++) = (tmp >> 16) & 0xff; \ This change breaks the otherwise consistent alignment of the '\' characters in column 51... -- PMM
Am 16.01.2012 12:27, schrieb Peter Maydell: > On 16 January 2012 00:46, Andreas Färber <afaerber@suse.de> wrote: >> diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h >> index 69af9ef..544b55e 100644 >> --- a/hw/milkymist-vgafb_template.h >> +++ b/hw/milkymist-vgafb_template.h >> @@ -39,7 +39,7 @@ >> #elif BITS == 24 >> #define COPY_PIXEL(to, r, g, b) \ >> do { \ >> - uint32 tmp = rgb_to_pixel24(r, g, b); \ >> + uint32_t tmp = rgb_to_pixel24(r, g, b); \ >> *(to++) = tmp & 0xff; \ >> *(to++) = (tmp >> 8) & 0xff; \ >> *(to++) = (tmp >> 16) & 0xff; \ > > This change breaks the otherwise consistent alignment of the '\' > characters in column 51... Thanks, will fix! Andreas
Am Montag 16 Januar 2012, 12:27:01 schrieb Peter Maydell: > On 16 January 2012 00:46, Andreas Färber <afaerber@suse.de> wrote: > > diff --git a/hw/milkymist-vgafb_template.h > > b/hw/milkymist-vgafb_template.h index 69af9ef..544b55e 100644 > > --- a/hw/milkymist-vgafb_template.h > > +++ b/hw/milkymist-vgafb_template.h > > @@ -39,7 +39,7 @@ > > #elif BITS == 24 > > #define COPY_PIXEL(to, r, g, b) \ > > do { \ > > - uint32 tmp = rgb_to_pixel24(r, g, b); \ > > + uint32_t tmp = rgb_to_pixel24(r, g, b); \ > > *(to++) = tmp & 0xff; \ > > *(to++) = (tmp >> 8) & 0xff; \ > > *(to++) = (tmp >> 16) & 0xff; \ > > This change breaks the otherwise consistent alignment of the '\' > characters in column 51... apart from that, Acked-by: Michael Walle <michael@walle.cc>
diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h index 69af9ef..544b55e 100644 --- a/hw/milkymist-vgafb_template.h +++ b/hw/milkymist-vgafb_template.h @@ -39,7 +39,7 @@ #elif BITS == 24 #define COPY_PIXEL(to, r, g, b) \ do { \ - uint32 tmp = rgb_to_pixel24(r, g, b); \ + uint32_t tmp = rgb_to_pixel24(r, g, b); \ *(to++) = tmp & 0xff; \ *(to++) = (tmp >> 8) & 0xff; \ *(to++) = (tmp >> 16) & 0xff; \
Commit d23948b15a9920fb7f6374b55a6db1ecff81f3ee (lm32: add Milkymist VGAFB support) introduced a stray usage of the softfloat uint32 type. Use uint32_t instead. Signed-off-by: Andreas Färber <afaerber@suse.de> Cc: Michael Walle <michael@walle.cc> --- hw/milkymist-vgafb_template.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)