* [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc()
@ 2016-03-18 6:59 Bin Meng
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bin Meng @ 2016-03-18 6:59 UTC (permalink / raw)
To: u-boot
A carriage return needs to execute before a line feed.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
lib/efi/efi_stub.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c
index e138709..8b4bb4e 100644
--- a/lib/efi/efi_stub.c
+++ b/lib/efi/efi_stub.c
@@ -65,6 +65,9 @@ void _debug_uart_init(void)
void putc(const char ch)
{
+ if (ch == '\n')
+ putc('\r');
+
if (use_uart) {
NS16550_t com_port = (NS16550_t)0x3f8;
@@ -74,8 +77,6 @@ void putc(const char ch)
} else {
efi_putc(global_priv, ch);
}
- if (ch == '\n')
- putc('\r');
}
void puts(const char *str)
--
1.8.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling
2016-03-18 6:59 [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Bin Meng
@ 2016-03-18 6:59 ` Bin Meng
2016-03-18 13:26 ` Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
2016-03-18 13:26 ` [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 2 replies; 6+ messages in thread
From: Bin Meng @ 2016-03-18 6:59 UTC (permalink / raw)
To: u-boot
Since commit b391d74 "debug_uart: output CR along with LF", the
handling in puts() is duplicated, not to mention that it should
output carriage return before line feed.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
common/console.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/common/console.c b/common/console.c
index 6a0d11b..12293f3 100644
--- a/common/console.c
+++ b/common/console.c
@@ -515,8 +515,6 @@ void puts(const char *s)
int ch = *s++;
printch(ch);
- if (ch == '\n')
- printch('\r');
}
return;
}
--
1.8.2.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
@ 2016-03-18 13:26 ` Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2016-03-18 13:26 UTC (permalink / raw)
To: u-boot
On Thu, Mar 17, 2016 at 11:59:04PM -0700, Bin Meng wrote:
> Since commit b391d74 "debug_uart: output CR along with LF", the
> handling in puts() is duplicated, not to mention that it should
> output carriage return before line feed.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160318/17a7297b/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [U-Boot, 2/2] debug_uart: Remove duplicated carriage return handling
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
2016-03-18 13:26 ` Tom Rini
@ 2016-03-27 22:27 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2016-03-27 22:27 UTC (permalink / raw)
To: u-boot
On Thu, Mar 17, 2016 at 11:59:04PM -0700, Bin Meng wrote:
> Since commit b391d74 "debug_uart: output CR along with LF", the
> handling in puts() is duplicated, not to mention that it should
> output carriage return before line feed.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160327/7d048ea9/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc()
2016-03-18 6:59 [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Bin Meng
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
@ 2016-03-18 13:26 ` Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2016-03-18 13:26 UTC (permalink / raw)
To: u-boot
On Thu, Mar 17, 2016 at 11:59:03PM -0700, Bin Meng wrote:
> A carriage return needs to execute before a line feed.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160318/d10ccaa3/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [U-Boot, 1/2] efi_stub: Move carriage return before line feed in putc()
2016-03-18 6:59 [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Bin Meng
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
2016-03-18 13:26 ` [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Tom Rini
@ 2016-03-27 22:27 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2016-03-27 22:27 UTC (permalink / raw)
To: u-boot
On Thu, Mar 17, 2016 at 11:59:03PM -0700, Bin Meng wrote:
> A carriage return needs to execute before a line feed.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160327/c61fa340/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-27 22:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-18 6:59 [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Bin Meng
2016-03-18 6:59 ` [U-Boot] [PATCH 2/2] debug_uart: Remove duplicated carriage return handling Bin Meng
2016-03-18 13:26 ` Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
2016-03-18 13:26 ` [U-Boot] [PATCH 1/2] efi_stub: Move carriage return before line feed in putc() Tom Rini
2016-03-27 22:27 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox