summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2009-03-05 19:10:17 +0000
committerjhb <jhb@FreeBSD.org>2009-03-05 19:10:17 +0000
commit782a5accb69ded4cb79bddb64c136dc18d548122 (patch)
treed32e5743e14baba766d12a31f18473f4852cec6b
parentb4cf24773d1947fa04db07aa75d5a24f7db4e44f (diff)
downloadFreeBSD-src-782a5accb69ded4cb79bddb64c136dc18d548122.zip
FreeBSD-src-782a5accb69ded4cb79bddb64c136dc18d548122.tar.gz
Allow syscons to work on amd64 and i386 without any hints:
- Enable keyboard autodetection by default for ISA syscons attachments. - If there are no syscons hints at all, assume there is a single sc0 device anyway. The console probe will still fail unless a VGA adapter is found. MFC after: 2 weeks
-rw-r--r--sys/isa/syscons_isa.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index af43a67..237e188 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -101,7 +101,9 @@ scprobe(device_t dev)
static int
scattach(device_t dev)
{
- return sc_attach_unit(device_get_unit(dev), device_get_flags(dev));
+
+ return (sc_attach_unit(device_get_unit(dev), device_get_flags(dev) |
+ SC_AUTODETECT_KBD));
}
static int
@@ -238,8 +240,10 @@ sc_get_cons_priority(int *unit, int *flags)
*flags = f;
}
}
- if (*unit < 0)
- return CN_DEAD;
+ if (*unit < 0) {
+ *unit = 0;
+ *flags = 0;
+ }
#if 0
return ((*flags & SC_KERNEL_CONSOLE) ? CN_INTERNAL : CN_NORMAL);
#endif
OpenPOWER on IntegriCloud