[PATCH] OMAP4 USB BOOT: remove double line endings

Fabio Porcedda fabio.porcedda at gmail.com
Mon Feb 25 06:05:37 EST 2013


On Mon, Feb 25, 2013 at 9:18 AM, Sascha Hauer <s.hauer at pengutronix.de> wrote:
> On Sun, Feb 24, 2013 at 07:15:14PM +0100, Vicente Bergas wrote:
>> From previous patch that replaced printf with puts:
>>  puts adds it's own line ending, so do not append it manually

Thanks for fixing, I did not remember of the additional newline.

I need to fix the other puts,  i will push a patch to change puts
(str)-> fprinf('%s", str)
for the menu.c.

>>
>> Signed-off-by: Vicente Bergas <vicencb at gmail.com>
>
>
> Applied, thanks
>
> Sascha
>
>
>> ---
>>  scripts/omap4_usbboot.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/scripts/omap4_usbboot.c b/scripts/omap4_usbboot.c
>> index 34e53c0..e521086 100644
>> --- a/scripts/omap4_usbboot.c
>> +++ b/scripts/omap4_usbboot.c
>> @@ -78,7 +78,7 @@ int read_asic_id(struct usb_handle *usb)
>>       const uint32_t msg_getid = 0xF0030003;
>>       int i, j, k, ret;
>>       uint8_t id[81];
>> -     char line[LINEWIDTH*3+8];
>> +     char line[LINEWIDTH*3+5];
>>
>>       printf("reading ASIC ID\n");
>>       memset(id , 0xee, sizeof(id));
>> @@ -96,8 +96,7 @@ int read_asic_id(struct usb_handle *usb)
>>               sprintf(line, "%02X: ", i);
>>               for (j = 0; j < LINEWIDTH && j < sizeof(id)-i; j++)
>>                       sprintf(line+4+j*3, "%02X ", id[i+j]);
>> -             line[4+j*3+0] = '\n';
>> -             line[4+j*3+1] = 0;
>> +             line[4+j*3] = 0;
>>               puts(line);
>>       }
>>       ret = 0;
>> --
>> 1.8.1.4
>>
>>
>> _______________________________________________
>> barebox mailing list
>> barebox at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/barebox
>>
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox



--
Fabio Porcedda



More information about the barebox mailing list