diff options
| -rw-r--r-- | sys/conf/NOTES | 5 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 5 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 5 | ||||
| -rw-r--r-- | sys/i386/isa/psm.c | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b233893..27f4ffa 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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: diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index b233893..27f4ffa 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -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: diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index b233893..27f4ffa 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -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: diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index 2026a45..a4fb84e 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -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); |
