From: Jim Lin <jilin@nvidia.com>
Date: Tue, 13 Aug 2013 11:04:22 +0000 (+0800)
Subject: console: usb: kbd: To improve TFTP booting performance
X-Git-Tag: v2013.10-rc2~2^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07551f23434f35b67aa8e6cf5ccd68ca417c73e6;p=u-boot

console: usb: kbd: To improve TFTP booting performance

TFTP booting is slow when a USB keyboard is installed and
stdin has usbkbd added.
This fix is to change Ctrl-C polling for USB keyboard to every second
when NET transfer is running.

Signed-off-by: Jim Lin <jilin@nvidia.com>
---

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 2ca3767ecf..89e30e88fb 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -104,6 +104,11 @@ struct usb_kbd_pdata {
 	uint8_t		flags;
 };
 
+extern int __maybe_unused net_busy_flag;
+
+/* The period of time between two calls of usb_kbd_testc(). */
+static unsigned long __maybe_unused kbd_testc_tms;
+
 /* Generic keyboard event polling. */
 void usb_kbd_generic_poll(void)
 {
@@ -365,6 +370,16 @@ static int usb_kbd_getc(void)
 	struct usb_device *usb_kbd_dev;
 	struct usb_kbd_pdata *data;
 
+#ifdef CONFIG_CMD_NET
+	/*
+	 * If net_busy_flag is 1, NET transfer is running,
+	 * then we check key-pressed every second (first check may be
+	 * less than 1 second) to improve TFTP booting performance.
+	 */
+	if (net_busy_flag && (get_timer(kbd_testc_tms) < CONFIG_SYS_HZ))
+		return 0;
+	kbd_testc_tms = get_timer(0);
+#endif
 	dev = stdio_get_by_name(DEVNAME);
 	usb_kbd_dev = (struct usb_device *)dev->priv;
 	data = usb_kbd_dev->privptr;