d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an option to the psm driver to skip the parts of the probe which break

Browse Source 
some laptops with PS/2 mice.

Submitted by:	nsayer@quack.kfu.com
This commit is contained in:
dfr 1995-06-22 10:56:56 +00:00
parent cf8979fc27
commit d45b44a63c
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.183 1995/05/27 04:32:12 davidg Exp $
# $Id: LINT,v 1.184 1995/05/28 13:24:16 rgrimes Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -525,6 +525,9 @@ options FDSEEKWAIT="16"
device lpt0 at isa? port "IO_LPT3" tty irq 7 vector lptintr
device mse0 at isa? port 0x23c tty irq 5 vector mseintr
device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
# Options for psm:
options PSM_NO_RESET #don't reset mouse hardware (some laptops)
device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr
# Options for sio:

5
sys/i386/conf/LINT
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.183 1995/05/27 04:32:12 davidg Exp $
# $Id: LINT,v 1.184 1995/05/28 13:24:16 rgrimes Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -525,6 +525,9 @@ options FDSEEKWAIT="16"
device lpt0 at isa? port "IO_LPT3" tty irq 7 vector lptintr
device mse0 at isa? port 0x23c tty irq 5 vector mseintr
device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
# Options for psm:
options PSM_NO_RESET #don't reset mouse hardware (some laptops)
device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr
# Options for sio:

5
sys/i386/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.183 1995/05/27 04:32:12 davidg Exp $
# $Id: LINT,v 1.184 1995/05/28 13:24:16 rgrimes Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -525,6 +525,9 @@ options FDSEEKWAIT="16"
device lpt0 at isa? port "IO_LPT3" tty irq 7 vector lptintr
device mse0 at isa? port 0x23c tty irq 5 vector mseintr
device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
# Options for psm:
options PSM_NO_RESET #don't reset mouse hardware (some laptops)
device sio0 at isa? port "IO_COM1" tty irq 4 vector siointr
# Options for sio:

2
sys/i386/isa/psm.c
View File

@ -150,8 +150,10 @@ int psmprobe(struct isa_device *dvp)
ioport=dvp->id_iobase;
unit=dvp->id_unit;
#ifndef PSM_NO_RESET
psm_write_dev(ioport,0xff); /* Reset aux device */
psm_poll_status();
#endif
outb(ioport+CNTRL,0xa9);
psm_poll_status();
outb(ioport+CNTRL,0xaa);