diff mbox

[01/14] lm32: Fix mixup of uint32 and uint32_t

Message ID 1326674823-13069-2-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Jan. 16, 2012, 12:46 a.m. UTC
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(-)

Comments

Peter Maydell Jan. 16, 2012, 11:27 a.m. UTC | #1
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
Andreas Färber Jan. 16, 2012, 12:18 p.m. UTC | #2
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
Michael Walle Jan. 16, 2012, 9:39 p.m. UTC | #3
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 mbox

Patch

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;              \