diff options
author | brian <brian@FreeBSD.org> | 1998-09-08 18:09:51 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1998-09-08 18:09:51 +0000 |
commit | 523f9bb1df1e6197e390a411d458843e51f867d2 (patch) | |
tree | b515b257e39180d39e4ba5526fce799dc154f045 /sys/i386 | |
parent | b0502cca708a846fcaa8653eee63191718f11433 (diff) | |
download | FreeBSD-src-523f9bb1df1e6197e390a411d458843e51f867d2.zip FreeBSD-src-523f9bb1df1e6197e390a411d458843e51f867d2.tar.gz |
Make PCIC_RESUME_RESET an proper option.
My laptop (a CTX Cybernote) needs this. It claims to have a
PC-Card VLSI 82C146 (5 mem & 2 I/O windows)
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/LINT | 5 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 5 | ||||
-rw-r--r-- | sys/i386/conf/PCCARD | 4 | ||||
-rw-r--r-- | sys/i386/conf/options.i386 | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 158e9f8..674f3cc 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.456 1998/08/27 02:37:11 jkh Exp $ +# $Id: LINT,v 1.457 1998/09/03 20:58:34 nsouch 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 @@ -1433,6 +1433,9 @@ controller card0 device pcic0 at card? device pcic1 at card? +# You may need to reset all pccards after resuming +options PCIC_RESUME_RESET # reset after resume + # # Laptop/Notebook options: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 158e9f8..674f3cc 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.456 1998/08/27 02:37:11 jkh Exp $ +# $Id: LINT,v 1.457 1998/09/03 20:58:34 nsouch 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 @@ -1433,6 +1433,9 @@ controller card0 device pcic0 at card? device pcic1 at card? +# You may need to reset all pccards after resuming +options PCIC_RESUME_RESET # reset after resume + # # Laptop/Notebook options: # diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index 738c1ee..fd01f86 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: PCCARD,v 1.1 1997/11/01 18:54:10 nate Exp $ +# $Id: PCCARD,v 1.2 1997/11/11 00:47:01 nate Exp $ machine "i386" cpu "I386_CPU" @@ -81,6 +81,8 @@ controller card0 device pcic0 at card? device pcic1 at card? +options PCIC_RESUME_RESET # reset after resume + device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index ab6cf97..2b232d5 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.83 1998/08/08 19:25:56 jkh Exp $ +# $Id: options.i386,v 1.84 1998/08/10 08:40:27 yokota Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -86,6 +86,8 @@ PSM_HOOKAPM opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h +PCIC_RESUME_RESET opt_pcic.h + KBD_RESETDELAY opt_kbdio.h KBD_MAXRETRY opt_kbdio.h KBD_MAXWAIT opt_kbdio.h |