From 782a5accb69ded4cb79bddb64c136dc18d548122 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 5 Mar 2009 19:10:17 +0000 Subject: 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 --- sys/isa/syscons_isa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sys/isa') 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 -- cgit v1.1