summaryrefslogtreecommitdiffstats
path: root/common/console.c
diff options
context:
space:
mode:
authorAlexey Galakhov <agalakhov@gmail.com>2013-07-10 16:15:10 +0600
committerSascha Hauer <s.hauer@pengutronix.de>2013-07-10 23:25:22 +0200
commit3d85dae2be1839e23c04d0a8b93a39dea3be46b6 (patch)
treedca15ab77a302e76323dd313480258b54ef2ac73 /common/console.c
parent4ccf45db0a5f27b998a5dc7560bfb7a228bf5e96 (diff)
downloadbarebox-3d85dae2be1839e23c04d0a8b93a39dea3be46b6.tar.gz
Force set console baudrate at enable time
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/console.c')
-rw-r--r--common/console.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/common/console.c b/common/console.c
index 8a4b224..402dcf5 100644
--- a/common/console.c
+++ b/common/console.c
@@ -79,6 +79,12 @@ static int console_std_set(struct device_d *dev, struct param_d *param,
}
}
+ if (flag && !cdev->f_active) {
+ /* The device is being activated, set its baudrate */
+ if (cdev->setbrg)
+ cdev->setbrg(cdev, cdev->baudrate);
+ }
+
active[i] = 0;
cdev->f_active = flag;
@@ -103,6 +109,10 @@ static int console_baudrate_set(struct param_d *param, void *priv)
struct console_device *cdev = priv;
unsigned char c;
+ /*
+ * If the device is already active, change its baudrate.
+ * The baudrate of an inactive device will be set at activation time.
+ */
if (cdev->f_active) {
printf("## Switch baudrate to %d bps and press ENTER ...\n",
cdev->baudrate);
@@ -112,8 +122,7 @@ static int console_baudrate_set(struct param_d *param, void *priv)
do {
c = getc();
} while (c != '\r' && c != '\n');
- } else
- cdev->setbrg(cdev, cdev->baudrate);
+ }
return 0;
}