Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87a5d151 authored by Jason Wessel's avatar Jason Wessel Committed by Greg Kroah-Hartman
Browse files

USB: dbgp: insert cr prior to nl as needed 



The rs232 drivers send a carriage return prior to a new line in the
early printk code.

The usb debug driver should do the same because you want to be able to
use the same terminal programs and tools for analysis of early printk
data.

Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df6c5169

drivers/usb/early/ehci-dbgp.c

+16 −6
Original line number Diff line number Diff line
@@ -700,17 +700,27 @@ int __init early_dbgp_init(char *s) 
static void early_dbgp_write(struct console *con, const char *str, u32 n)

{

	int chunk, ret;

	char buf[DBGP_MAX_PACKET];

	int use_cr = 0;



	if (!ehci_debug)

		return;

	while (n > 0) {

		chunk = n;

		if (chunk > DBGP_MAX_PACKET)

			chunk = DBGP_MAX_PACKET;

		for (chunk = 0; chunk < DBGP_MAX_PACKET && n > 0;

		     str++, chunk++, n--) {

			if (!use_cr && *str == '\n') {

				use_cr = 1;

				buf[chunk] = '\r';

				str--;

				n++;

				continue;

			}

			if (use_cr)

				use_cr = 0;

			buf[chunk] = *str;

		}

		ret = dbgp_bulk_write(USB_DEBUG_DEVNUM,

			dbgp_endpoint_out, str, chunk);

		str += chunk;

		n -= chunk;

			dbgp_endpoint_out, buf, chunk);

	}

}