diff options
| author | nate <nate@FreeBSD.org> | 1997-10-26 04:36:24 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-10-26 04:36:24 +0000 |
| commit | c68183d0b8cb8cb595c0fac05b6d989132543595 (patch) | |
| tree | 3e3880b90341465871c326ce768b275780757e2d /sys/amd64/conf | |
| parent | bc21da1f3f59930a96cd6829bfaf0147d28b7754 (diff) | |
| download | FreeBSD-src-c68183d0b8cb8cb595c0fac05b6d989132543595.zip FreeBSD-src-c68183d0b8cb8cb595c0fac05b6d989132543595.tar.gz | |
- Do a bunch of gratuitous changes intended to make the code easier to
follow.
* Rename/reorder all of the pccard structures, change many of the member
names to be descriptive, and follow more closely other 'bus' drivers
naming schemes.
* Rename a bunch of parameter and local variable names to be more
consistant in the code.
* Renamed the PCCARD 'crd' device to be the 'card' device
* KNF and make the code consistant where it was obvious.
* ifdef'd out some unused code
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 21666fb..93b47ce 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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: GENERIC,v 1.97 1997/10/08 17:05:03 nate Exp $ +# $Id: GENERIC,v 1.98 1997/10/18 10:59:06 joerg Exp $ machine "i386" cpu "I386_CPU" @@ -109,9 +109,9 @@ device npx0 at isa? port "IO_NPX" irq 13 vector npxintr device apm0 at isa? disable flags 0x31 # Advanced Power Management # PCCARD (PCMCIA) support -#controller crd0 -#device pcic0 at crd? -#device pcic1 at crd? +#controller card0 +#device pcic0 at card? +#device pcic1 at card? 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 |
