summaryrefslogtreecommitdiffstats
path: root/arch/sandbox/os
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2017-05-31 18:12:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-01 09:42:48 +0200
commita8de37dbef75665b6bdd98e9ce54f9fb20484785 (patch)
tree6bcd4797317fa8ddc77ffc3a67ce3ccaebda4cc6 /arch/sandbox/os
parent44ae52f30ff074be01214a3a77495a1c248ac02a (diff)
downloadbarebox-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>
Diffstat (limited to 'arch/sandbox/os')
-rw-r--r--arch/sandbox/os/common.c6
1 files changed, 3 insertions, 3 deletions
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();