Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

serial: Fix _serial_puts using \n\r instead of \r\n

Browse source 
A string like "test\n" would be broken up into the following sequence of
prints by _serial_puts:

	puts("test\n")
	putc('\r')

Although functionally this is the same as \r\n, it is not the standard
sequence and caused tests to fail. Fix this by excluding the '\n' from
the initial print. The above string will now be broken up like

	puts("test")
	puts("\r\n")

Since we may now need to call ops->puts twice (with the associated retry
logic), break that part of the function off into a helper.

Fixes: 7a76347189 ("serial: dm: Add support for puts")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
This commit is contained in:
Sean Anderson 2022-04-04 14:17:57 -04:00 committed by Tom Rini
parent af298f3dcd
commit 2c777488b6
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/serial/serial-uclass.c
View file

@ -198,6 +198,22 @@ static void _serial_putc(struct udevice *dev, char ch)
} while (err == -EAGAIN);
}
static int __serial_puts(struct udevice *dev, const char *str, size_t len)
{
struct dm_serial_ops *ops = serial_get_ops(dev);
do {
ssize_t written = ops->puts(dev, str, len);
if (written < 0)
return written;
str += written;
len -= written;
} while (len);
return 0;
}
static void _serial_puts(struct udevice *dev, const char *str)
{
struct dm_serial_ops *ops = serial_get_ops(dev);
@ -210,19 +226,15 @@ static void _serial_puts(struct udevice *dev, const char *str)
do {
const char *newline = strchrnul(str, '\n');
size_t len = newline - str + !!*newline;
size_t len = newline - str;
do {
ssize_t written = ops->puts(dev, str, len);
if (__serial_puts(dev, str, len))
return;
if (written < 0)
return;
str += written;
len -= written;
} while (len);
if (*newline && __serial_puts(dev, "\r\n", 2))
return;
if (*newline)
_serial_putc(dev, '\r');
str += len + !!*newline;
} while (*str);
}