Whitespace. Portions from Igor Sobrado in PR kern/22595.
Deploy <space><tab> where needed so columns don't teleport when
commenting or uncommenting things.

Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Merged by yours truly as the set of configs has changed quite a bit since
the PR was filed in 2003, and I may have missed some stuff. These changes
should probably be merged into other arches' configs; I'm not going to do
that now though.

branches: 1.79.8;
Remove esl(4)

branches: 1.78.52; 1.78.56; 1.78.58; 1.78.62;
Use ATA timing, instead of busmaster wait, for adding waits.
Use default wait value 0x01.

branches: 1.77.2; 1.77.4;
Add njata* at cardbus?

branches: 1.76.4; 1.76.8;
merge ktrace-lwp.

remove "dev" locators from cardbus device definitions, it doesn't
make sense technically and might be removed

branches: 1.74.2;
Rework the configuration scheme for PCI fixups:

* bus enumeration fixups are not PCIBIOS-specific, interrupt fixups are done
by both PCIBIOS and ACPI. The redundancy is very redundant. Therefore,
rename PCIBIOS_*_FIXUP to PCI_*_FIXUP, use PCI_INTR_FIXUP in place of
ACPI_PCI_FIXUP, and change code refences to match.

* move the fixup defines from opt_pcibios.h to opt_pcifixup.h to reflect
the above.

* fix up the PCI bus numbering in mainbus_attach(), right after we detect the
configuration mode. This probably renders the fixup in pcibios.c
redundant -- but it should be harmless.

These changes make cardbus work in ACPI-only machines, when PCI_BUS_FIXUP
and PCI_INTR_FIXUP are defined.

Add njs to some generic config files (I tested on i386 and sparc64).

branches: 1.72.2;
Add ath(4) for Atheros 802.11a/b/g cards.

Add atw at cardbus (ADMtek ADM8211).

branches: 1.70.6;
CARDBUS was rotting. Make it truly GENERIC+Cardbus by including GENERIC.

add [commented out] cgd's to generic kernel configs.

Merge Bill Sommerfeld's i386 MP branch. This code has some known
caveats, but works quite well in a lot of MP cases, and all
UP cases that I have tested. Parts of this will hopefully be
reworked in the not-too-distant future.

Add one space between "#option" and "<tab>IPFILTER_DEFAULT_BLOCK"

Added (commented out) IPFILTER_DEFAULT_BLOCK.

enable USERCONF by default; it's small and extremely useful to have available.

Add elansc* at pci? (AMD Elan SC520 System Controller).

chenge comment for wi(4)
- add vender Intersil

Sync (commented out) SHMMAXPGS value with vmparam.h.
Closes port-i386/12708 by Patrick Welche.

- replace all "scsibus* at XXXX" with a single "scsibus* at scsi?"
- replace all "atapibus* at XXXX" with a single "atapibus* at atapi?"
- replace all "audio* at XXXX" with a single "audio* at audiobus?"
- replace all "midi* at XXXX" (except "midi* at pcppi?") with a single
"midi* at midibus?"

Enable "pseudo-device clockctl" in all kernels, except
installation related kernels (INSTALL* and RAMDISK*).
This enables rc.conf(5) $ntpd_chroot to be used "out of the box"

Include PERFCTRS to match MTRR option. Now pmc(1) does something useful.

branches: 1.58.2; 1.58.4;
Add the INCLUDE_CONFIG_FILE option to all config files. In config
files that are generic (ie, GENERIC, GENERICSBC, GENERIC32, ALL, or
ALPHA), it is uncommented.

Remove opms(4) and its device, /dev/pms0, from the i386 port, because
it has been obsoleted by pms(4).

Reviewed by fvdl and christos.

Switch from de to tlp by default.

The functionality of pmsi has been implemented in pms, so it's time for pmsi
to go back where it came from.

Add commented-out USERCONF option. Mainly useful for install media
and can be optionally enabled based on miniroot and ramdisk size
requirements.

The "gif*" tunnelling interface does everything ipip does.
Move usage example from ipip.4 to gif.4
Excise ipip and stitch up the scars.

Update description for icsphy.

Keep adv in alphabetical order.

add options PIPE_SOCKETPAIR to individual kernel configs
the option is commented out on everything but kernels I was able
to recognize as INSTALL-like or ones for small memory machines

Add entries for the 'esa at pci' audio driver (ESS Allegro-1 / Maestro-3).

moved ARMADA specific CARDBUS options to CARDBUS
added cardbus/pci bridge to CARDBUS config.
removed ARMADA config (as promised)

Update for new uhidev device attachment.

cleanup:
options SPACE TAB
makeoptions TAB
psuedo-device TAB
remove trailing whitespace
replace multiple spaces -> tabs
options "FOO" -> options FOO
options "FOO=bar" -> options FOO=bar
options "FOO=\"bar\"" -> options FOO="\"bar\""

- pull in opt_kgdb.h where necessary
- replace opt_kgdb_machdep.h with opt_kgdb.h
- defparam opt_kgdb.h:
KGDB_DEV KGDB_DEVNAME KGDB_DEVADDR KGDB_DEVRATE KGDB_DEVMODE
- move from opt_ddbparam.h to opt_ddb.h:
DDB_FROMCONSOLE DDB_ONPANIC DDB_HISTORY_SIZE DDB_BREAK_CHAR SYMTAB_SPACE
- replace KGDBDEV with KGDB_DEV
- replace KGDBADDR with KGDB_DEVADDR
- replace KGDBMODE with KGDB_DEVMODE
- replace KGDBRATE with KGDB_DEVRATE
- use `9600' instead of `0x2580' for 9600 baud rate
- use correct quotes for options KGDB_DEVNAME="\"com\""
- use correct quotes for options KGDB_DEV="17*256+0"
- remove unnecessary dependancy on Makefile for kgdb_stub.o
- minor whitespace cleanup

The wsmux pseudo device does not need a count anymore.

Use options<SPC><TAB> consistently (except for GENERIC_ISDN since it is
indented rather differently).

add adv@cardbus.
(commented out if ahc@cardbus is commented out.)

Add mpu at cmpci and opl at cmpci attachment.
I always test it on alpha, and add cmpci entries to alpha config files.

merge in changes from GENERIC revs 1.400 ... 1.432:
- add MTRR
- comment out DIAGNOSTIC
- add commented out SEM{MNI,MNS,UME,MNU} COMPAT_MACH EXEC_MACHO
- comment out EISA stuff
- add commented out MCA stuff
- add audio devices: esl, emuxki, yds
- add pseudo-device bridge

branches: 1.39.2;
Change all instances of "[e]isa* at foo?" to "[e]isa0 at foo?".

This prevents attaching multiple [E]ISA buses, which we don't support
(Is there any such thing to support? I'm skeptical) and avoids the
"panic: isaattach: ISA bus already seen" that occurs on some laptops
with docking stations and EISA boxes. Since there is only one [E]ISA bus,
logically, the ISA device probe will still find devices on the
docking station.

This does not address the problem of inserting or removing the docking station
at runtime.

Relevant PRs: kern/6544, port-i386/10392, kern/11627, kern/13557,
install/13865.

branches: 1.38.2;
More comment changes: 90x[B] -> 90x[BC]

branches: 1.37.2;
Standardise TCP_COMPAT_42 as commented out, grouped with other COMPAT options,
and with the comment '4.2BSD TCP/IP bug compat. Not recommended'
Add commented out 'TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG'
(All hail amiga and atari which make some attempt to automate the
multiplicity of config files...)

Remove (commented out) ncr* at pci? lines.

Fix typo: Pnp -> PnP

s/cheap/expensive/ for DIAGNOSTIC

support umct USB-serial device

sync to GENERIC 1.400

branches: 1.31.2;
add umidi.

Add uyap.

sync to GENERIC 1.390:
- add an NIC & vlan
- add auich, esm, neo audio

branches: 1.28.2;
lsu -> ld, by popular request.

pull up stuff changed in GENERIC from 1.370 - 1.377, appropriately
commented out if it's not relevant to a laptop

WSCONS_DEFAULT_TYPE is obsolete; use VGA_CONSOLE_SCREENTYPE instead.

don't specify number of ptys if >= 16 (current default initial number)
pty comments: normalize and g/c what is no longer relevant

Make this a more likely laptop config file.

Enable VM86 -- it's needed for some X servers (notably, S3 Savage,
which runs the VESA BIOS in VM86 emulation in order to switch video
modes).

Fix typos.
No functional changes.

move "options PULLDOWN_TEST" into sys/sys/mbuf.h (in #ifdef _KERNEL),
as it is no wthe default setting for everyone.

the reason we still use the name "PULLDOWN_TEST" while it is now default:
kame code sharing.

add commented out PCIBIOS_INTR_GUESS

remove COMPAT_AOUT option.

hexadecimal constant in "options" value doesn't need quotation.

Turn on DDB history by default.

Pullup rev 1.233 - rev 1.358 of GENERIC to CARDBUS, and merge conflicts.
Add GENERIC rev in "from:" line to aid future merging.
Major highlights include COMPAT_14, COMPAT_AOUT, NTFS, OVERLAY,
SOFTDEP, INET6, IPSEC, pcic iosiz changes, cz, dpt, rtk (cardbus!),
awi, cnw, ray, wi, xi, joy, and gif.

Comment out EON ISO-over-ip tunneling pseudo-driver, and document as
broken/fragile. Unlikely to be of much use, and confuses new users
when their system crashes when they, or their dhclient stumble over
it. See kern/10500, kern/8994 for the gory details.

branches: 1.14.2;
Remove pcvt tentacles.

branches: 1.13.4;
add com at cardbus

add commented out option PCI_CONFIG_DUMP whever there's a PCIVERBOSE.

s/options\t/options \t/ for CONS_OVERRIDE line, so that addition/removal of
"#" does not affect indentation.

Add ahc at cardbus

Add USB-Ethernet adapters.

branches: 1.8.2;
s/16x450/16x50/

Add tlp at cardbus, and nsphyter.

add:
#options SOFTDEP # FFS soft updates support.

Add dev and function locators to cardbus devices.

add fxp CardBus cards

EXEC_ELF32 is already defined in std.i386

branches: 1.2.2; 1.2.4;
Add ohci at cardbus.

This is the first check-in of CardBus driver. CardBus driver contains
CardBus bus stub, YENTA PCI-CardBus bridge (cbb), 3Com 3C575TX driver
(ex) and Intel fxp driver.

TODO:
o Conform to the KNF more strictly.
o Be unified with pcmcia code as much as possible.
o Add more drivers for CardBus card, such as APA-1480 or USB card.

The affected files are listed below.

sys/arch/i386/conf/files.i386
sys/arch/macppc/conf/files.macppc
sys/conf/files
sys/dev/ic/elinkxl.c
sys/dev/ic/elinkxlvar.h
sys/dev/ic/i82365.c
sys/dev/ic/i82365var.h
sys/dev/isa/i82365_isasubr.c
sys/dev/pci/files.pci
sys/dev/pcmcia/pcmcia.c
sys/dev/pcmcia/pcmciachip.h

The added files are listed below.

sys/arch/i386/conf/CARDBUS
sys/arch/i386/include/rbus_machdep.h
sys/arch/i386/i386/rbus_machdep.c
sys/arch/macppc/include/rbus_machdep.h
sys/arch/macppc/macppc/rbus_machdep.c
sys/dev/cardbus/if_ex_cardbus.c
sys/dev/cardbus/Makefile.cardbusdevs
sys/dev/cardbus/cardbus.c
sys/dev/cardbus/cardbus_map.c
sys/dev/cardbus/cardbusdevs
sys/dev/cardbus/cardbusdevs.h
sys/dev/cardbus/cardbusdevs_data.h
sys/dev/cardbus/cardbusvar.h
sys/dev/cardbus/cardslot.c
sys/dev/cardbus/cardslotvar.h
sys/dev/cardbus/devlist2h.awk
sys/dev/cardbus/files.cardbus
sys/dev/cardbus/if_fxp_cardbus.c
sys/dev/cardbus/pccardcis.h
sys/dev/cardbus/rbus.c
sys/dev/cardbus/rbus.h
sys/dev/pci/pccbb.c
sys/dev/pci/pccbbreg.h
sys/dev/pci/pccbbvar.h