Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: alexander.sverdlin@nokia.com (Alexander Sverdlin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: Make DEBUG_LL produce CRLF instead of LFCR
Date: Wed, 27 Sep 2017 13:49:28 +0200	[thread overview]
Message-ID: <20170927114929.9259-2-alexander.sverdlin@nokia.com> (raw)
In-Reply-To: <20170927114929.9259-1-alexander.sverdlin@nokia.com>

This change almost doubles the usage of DEBUG_LL macros but
in exchange terminates all the console output with CRLF not LFCR.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
 arch/arm/kernel/debug.S | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index ea9646c..ca502cc 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -80,12 +80,15 @@ hexbuf:		.space 16
 ENTRY(printascii)
 		addruart_current r3, r1, r2
 		b	2f
-1:		waituart r2, r3
+1:		teq	r1, #'\n'
+		bne	3f
+		waituart r2, r3
+		mov	r2, #'\r'
+		senduart r2, r3
+		busyuart r2, r3
+3:		waituart r2, r3
 		senduart r1, r3
 		busyuart r2, r3
-		teq	r1, #'\n'
-		moveq	r1, #'\r'
-		beq	1b
 2:		teq	r0, #0
 		ldrneb	r1, [r0], #1
 		teqne	r1, #0
-- 
2.4.6

  reply	other threads:[~2017-09-27 11:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-27 11:49 [PATCH 0/2] ARM: earlycon: Fix <CR><LF><CR> end-of-line Alexander Sverdlin
2017-09-27 11:49 ` Alexander Sverdlin [this message]
2017-09-27 11:49 ` [PATCH 2/2] ARM: early_printk: Stop emitting double CR on the console Alexander Sverdlin
2017-09-27 11:52 ` [PATCH 0/2] ARM: earlycon: Fix <CR><LF><CR> end-of-line Russell King - ARM Linux
2017-09-27 11:57   ` Alexander Sverdlin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170927114929.9259-2-alexander.sverdlin@nokia.com \
    --to=alexander.sverdlin@nokia.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox