diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2017-05-31 18:12:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-01 09:42:48 +0200 |
| commit | a8de37dbef75665b6bdd98e9ce54f9fb20484785 (patch) | |
| tree | 6bcd4797317fa8ddc77ffc3a67ce3ccaebda4cc6 | |
| parent | 44ae52f30ff074be01214a3a77495a1c248ac02a (diff) | |
| download | barebox-a8de37dbef75665b6bdd98e9ce54f9fb20484785.tar.gz barebox-a8de37dbef75665b6bdd98e9ce54f9fb20484785.tar.xz | |
sandbox: fix registering multiple consoles
Consoles need to be registered with the "console" device name so that
they are probed by the correct driver. The barebox_register_console()
was already forcing this as it was overwriting the name that was being
passed as argument, but it was failing to provide a unique id for
each new console, so the underlying register_device() would just
return an error when wanting to re-register a device with device name
"console" and id 0.
We remove the unused name parameter from barebox_register_console() as
it is really nowhere used, and also specify DEVICE_ID_DYNAMIC as id,
so that a new unique device id is given to each newly registered
console device.
Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/sandbox/board/console.c | 5 | ||||
| -rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/linux.h | 2 | ||||
| -rw-r--r-- | arch/sandbox/os/common.c | 6 | ||||
| -rw-r--r-- | drivers/serial/linux_console.c | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/arch/sandbox/board/console.c b/arch/sandbox/board/console.c index cd5ad57235..cf1781d156 100644 --- a/arch/sandbox/board/console.c +++ b/arch/sandbox/board/console.c @@ -22,7 +22,7 @@ #include <mach/linux.h> #include <xfuncs.h> -int barebox_register_console(char *name, int stdinfd, int stdoutfd) +int barebox_register_console(int stdinfd, int stdoutfd) { struct device_d *dev; struct linux_console_data *data; @@ -32,9 +32,8 @@ int barebox_register_console(char *name, int stdinfd, int stdoutfd) data = (struct linux_console_data *)(dev + 1); dev->platform_data = data; - strcpy(dev->name, name); - strcpy(dev->name, "console"); + dev->id = DEVICE_ID_DYNAMIC; data->stdoutfd = stdoutfd; data->stdinfd = stdinfd; diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 1f11ed4498..1327a56cab 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -19,7 +19,7 @@ void __attribute__((noreturn)) linux_exit(void); int linux_execve(const char * filename, char *const argv[], char *const envp[]); -int barebox_register_console(char *name_template, int stdinfd, int stdoutfd); +int barebox_register_console(int stdinfd, int stdoutfd); int barebox_register_dtb(const void *dtb); diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 67667d40da..192917ac22 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -366,7 +366,7 @@ int main(int argc, char *argv[]) exit(1); } - barebox_register_console("cout", -1, fd); + barebox_register_console(-1, fd); break; case 'I': fd = open(optarg, O_RDWR); @@ -375,7 +375,7 @@ int main(int argc, char *argv[]) exit(1); } - barebox_register_console("cin", fd, -1); + barebox_register_console(fd, -1); break; case 'x': sdl_xres = strtoul(optarg, NULL, 0); @@ -426,7 +426,7 @@ int main(int argc, char *argv[]) } } - barebox_register_console("console", fileno(stdin), fileno(stdout)); + barebox_register_console(fileno(stdin), fileno(stdout)); rawmode(); start_barebox(); diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c index 760b3b81fe..0d5da9d1b0 100644 --- a/drivers/serial/linux_console.c +++ b/drivers/serial/linux_console.c @@ -73,6 +73,9 @@ static int linux_console_probe(struct device_d *dev) console_register(cdev); + pr_info("%s: registered as %s%d\n", dev->name, cdev->class_dev.name, + cdev->class_dev.id); + return 0; } |