diff options
| author | yokota <yokota@FreeBSD.org> | 1999-01-11 03:18:56 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-01-11 03:18:56 +0000 |
| commit | ae16d918a316eb60407be875de416efb373a652f (patch) | |
| tree | 114e5de93fcbb59a8cff261d560719502d115314 /sys/i386/isa/psm.c | |
| parent | f24a0f863faf18c039916001f2cc71561fc29b38 (diff) | |
| download | FreeBSD-src-ae16d918a316eb60407be875de416efb373a652f.zip FreeBSD-src-ae16d918a316eb60407be875de416efb373a652f.tar.gz | |
The first stage of console driver reorganization: activate new
keyboard and video card drivers.
Because of the changes, you are required to update your kernel
configuration file now!
The files in sys/dev/syscons are still i386-specific (but less so than
before), and won't compile for alpha and PC98 yet.
syscons still directly accesses the video card registers here and
there; this will be rectified in the later stages.
Diffstat (limited to 'sys/i386/isa/psm.c')
| -rw-r--r-- | sys/i386/isa/psm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index 4cee984..07290af 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.57 1998/11/20 11:46:43 yokota Exp $ + * $Id: psm.c,v 1.58 1999/01/06 05:40:01 yokota Exp $ */ /* @@ -86,9 +86,10 @@ #include <machine/limits.h> #include <machine/mouse.h> +#include <dev/kbd/atkbdcreg.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> -#include <i386/isa/kbdio.h> /* * Driver specific options: the following options may be set by @@ -1003,7 +1004,7 @@ psmprobe(struct isa_device *dvp) psm_softc[unit] = sc; kbdc_set_device_mask(sc->kbdc, mask | KBD_AUX_CONTROL_BITS); kbdc_lock(sc->kbdc, FALSE); - return (IO_PSMSIZE); + return ((dvp->id_iobase < 0) ? -1 : IO_PSMSIZE); } static int |
