summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Stender <bst@pengutronix.de>2017-02-28 15:31:25 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-28 15:52:35 +0100
commitb4f55fcf355a4d0ac456445a5f42f259f2812b57 (patch)
tree5fa0f1945aac9a1d850271a59b474c8218565b93
parent123357079882de948f5f42a15c1af21a26130af2 (diff)
downloadbarebox-b4f55fcf355a4d0ac456445a5f42f259f2812b57.tar.gz
barebox-b4f55fcf355a4d0ac456445a5f42f259f2812b57.tar.xz
console: expose consoles in devfs
This enables displaying text on e.g. a framebuffer console by issueing echo -o /dev/fbconsole0 abc123 Signed-off-by: Bastian Stender <bst@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/console.c53
-rw-r--r--include/console.h3
2 files changed, 56 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c
index eccbeed0ca..668c870ab4 100644
--- a/common/console.c
+++ b/common/console.c
@@ -272,6 +272,40 @@ static int __console_puts(struct console_device *cdev, const char *s)
return n;
}
+static int fops_open(struct cdev *cdev, unsigned long flags)
+{
+ struct console_device *priv = cdev->priv;
+
+ return console_open(priv);
+}
+
+static int fops_close(struct cdev *dev)
+{
+ struct console_device *priv = dev->priv;
+
+ return console_close(priv);
+}
+
+static int fops_flush(struct cdev *dev)
+{
+ struct console_device *priv = dev->priv;
+
+ if (priv->flush)
+ priv->flush(priv);
+
+ return 0;
+}
+
+static int fops_write(struct cdev* dev, const void* buf, size_t count,
+ loff_t offset, ulong flags)
+{
+ struct console_device *priv = dev->priv;
+
+ priv->puts(priv, buf);
+
+ return 0;
+}
+
int console_register(struct console_device *newcdev)
{
struct device_d *dev = &newcdev->class_dev;
@@ -326,6 +360,25 @@ int console_register(struct console_device *newcdev)
console_set_active(newcdev, CONSOLE_STDIN |
CONSOLE_STDOUT | CONSOLE_STDERR);
+ /* expose console as device in fs */
+ newcdev->devfs.name = basprintf("%s%d", newcdev->class_dev.name,
+ newcdev->class_dev.id);
+ newcdev->devfs.priv = newcdev;
+ newcdev->devfs.dev = dev;
+ newcdev->devfs.ops = &newcdev->fops;
+ newcdev->devfs.flags = DEVFS_IS_CHARACTER_DEV;
+ newcdev->fops.open = fops_open;
+ newcdev->fops.close = fops_close;
+ newcdev->fops.flush = fops_flush;
+ newcdev->fops.write = fops_write;
+
+ ret = devfs_create(&newcdev->devfs);
+
+ if (ret) {
+ pr_err("device creation failed with %s\n", strerror(-ret));
+ return ret;
+ }
+
return 0;
}
EXPORT_SYMBOL(console_register);
diff --git a/include/console.h b/include/console.h
index a1ebc8581b..126c2e8aa3 100644
--- a/include/console.h
+++ b/include/console.h
@@ -61,6 +61,9 @@ struct console_device {
unsigned int baudrate_param;
const char *linux_console_name;
+
+ struct cdev devfs;
+ struct file_operations fops;
};
int console_register(struct console_device *cdev);