浏览代码

video: Name consoles by their number

We must use the console name in the 'stdout' variable to select the one
we want. At present the name is formed from the driver name with a suffix
indicating the rotation value.

It seems better to name them sequentially since this can be controlled by
driver order. So adjust the code to use 'vidconsole' for the first,
'vidconsole1' for the second, etc.

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 9 年之前
父节点
当前提交
f1a1247d89
共有 2 个文件被更改,包括 10 次插入5 次删除
  1. 6 1
      drivers/video/vidconsole-uclass.c
  2. 4 4
      include/configs/sandbox.h

+ 6 - 1
drivers/video/vidconsole-uclass.c

@@ -161,7 +161,12 @@ static int vidconsole_post_probe(struct udevice *dev)
 	struct stdio_dev *sdev = &priv->sdev;
 	struct stdio_dev *sdev = &priv->sdev;
 	int ret;
 	int ret;
 
 
-	strlcpy(sdev->name, dev->name, sizeof(sdev->name));
+	if (dev->seq) {
+		snprintf(sdev->name, sizeof(sdev->name), "vidconsole%d",
+			 dev->seq);
+	} else {
+		strcpy(sdev->name, "vidconsole");
+	}
 	sdev->flags = DEV_FLAGS_OUTPUT;
 	sdev->flags = DEV_FLAGS_OUTPUT;
 	sdev->putc = vidconsole_putc;
 	sdev->putc = vidconsole_putc;
 	sdev->puts = vidconsole_puts;
 	sdev->puts = vidconsole_puts;

+ 4 - 4
include/configs/sandbox.h

@@ -169,12 +169,12 @@
 #define CONFIG_KEYBOARD
 #define CONFIG_KEYBOARD
 
 
 #define SANDBOX_SERIAL_SETTINGS		"stdin=serial,cros-ec-keyb,usbkbd\0" \
 #define SANDBOX_SERIAL_SETTINGS		"stdin=serial,cros-ec-keyb,usbkbd\0" \
-					"stdout=serial,lcd.vidconsole\0" \
-					"stderr=serial,lcd.vidconsole\0"
+					"stdout=serial,vidconsole\0" \
+					"stderr=serial,vidconsole\0"
 #else
 #else
 #define SANDBOX_SERIAL_SETTINGS		"stdin=serial\0" \
 #define SANDBOX_SERIAL_SETTINGS		"stdin=serial\0" \
-					"stdout=serial,lcd.vidconsole\0" \
-					"stderr=serial,lcd.vidconsole\0"
+					"stdout=serial,vidconsole\0" \
+					"stderr=serial,vidconsole\0"
 #endif
 #endif
 
 
 #define SANDBOX_ETH_SETTINGS		"ethaddr=00:00:11:22:33:44\0" \
 #define SANDBOX_ETH_SETTINGS		"ethaddr=00:00:11:22:33:44\0" \