summaryrefslogtreecommitdiffstats
path: root/sys/dev/ofw
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-09-26 19:35:50 +0000
committerphk <phk@FreeBSD.org>2003-09-26 19:35:50 +0000
commit0c8bfb6d004a87cd501c13516a69b3ef59ed6c7c (patch)
treeb043c185e95f23eb60516b39361aaf3ed74ca525 /sys/dev/ofw
parent62fcef349695e2b63bcd465cb80df34a2bb21b46 (diff)
downloadFreeBSD-src-0c8bfb6d004a87cd501c13516a69b3ef59ed6c7c.zip
FreeBSD-src-0c8bfb6d004a87cd501c13516a69b3ef59ed6c7c.tar.gz
OK, I messed up /dev/console with what I had hoped would be compat
code. Convert remaining console drivers and hope for the best.
Diffstat (limited to 'sys/dev/ofw')
-rw-r--r--sys/dev/ofw/ofw_console.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index b835dd1..920733a 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -92,15 +92,16 @@ cn_drvinit(void *unused)
{
phandle_t options;
char output[32];
+ dev_t dev;
- if (ofw_consdev.cn_dev != NULL) {
+ if (ofw_consdev.cn_pri != CN_DEAD) {
if ((options = OF_finddevice("/options")) == -1 ||
OF_getprop(options, "output-device", output,
sizeof(output)) == -1)
return;
- make_dev(&ofw_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "%s",
+ dev = make_dev(&ofw_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "%s",
output);
- make_dev_alias(ofw_consdev.cn_dev, "ofwcons");
+ make_dev_alias(dev, "ofwcons");
}
}
@@ -275,7 +276,6 @@ ofw_cons_probe(struct consdev *cp)
return;
}
- cp->cn_dev = NULL;
cp->cn_pri = CN_INTERNAL;
}
OpenPOWER on IntegriCloud