From b629181a3df55f7f94227715d44156a27585142b Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 30 Nov 2007 21:45:07 +0000 Subject: Allow the sio acpi attachment to be disabled (ie: use hints only). This hack means you can get the units and flags to match up more easily with serial consoles on machines with acpi tables that cause the com ports to be probed in the wrong order (and hence get the wrong sio unit number). This replaces the common alternative hack of editing the code to comment out the acpi attachment. This could go away entirely when device wiring patches are committed. --- sys/conf/options.amd64 | 1 + sys/conf/options.i386 | 1 + sys/dev/sio/sio_isa.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 79bc816..258b0b7 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -30,6 +30,7 @@ COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h CONSPEED opt_sio.h GDBSPEED opt_sio.h +COM_NO_ACPI opt_sio.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 2325fd9..3fc3fb1 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -80,6 +80,7 @@ COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h CONSPEED opt_sio.h GDBSPEED opt_sio.h +COM_NO_ACPI opt_sio.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c index afb6fac..da8b61c 100644 --- a/sys/dev/sio/sio_isa.c +++ b/sys/dev/sio/sio_isa.c @@ -25,6 +25,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_sio.h" + #include #include #include @@ -167,4 +169,6 @@ sio_isa_attach(dev) } DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); +#ifndef COM_NO_ACPI DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); +#endif -- cgit v1.1