diff options
| author | imp <imp@FreeBSD.org> | 2001-05-19 04:53:20 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-05-19 04:53:20 +0000 |
| commit | 26885aebf5fdd5705ba9e5442caf61b733234219 (patch) | |
| tree | fece2ab05918ff2053bac5fd11aded6f853086af /sys/pccard/i82365.h | |
| parent | 8aa6c173b087c6901df130efb252a23bd6eb1141 (diff) | |
| download | FreeBSD-src-26885aebf5fdd5705ba9e5442caf61b733234219.zip FreeBSD-src-26885aebf5fdd5705ba9e5442caf61b733234219.tar.gz | |
It turns out that Intel's i82365sl-DF step has the same ID as the VLSI
82C146. The Intel i82365SL-DF supports 3.3V cards. The Step A/B/C
parts do not appear to support this. This is hard to know for sure
since it was deduced from "compatible" parts' data sheets and the
article mentioned below.
Rework the VLSI detection to be a little nicer and not depend on
scanning cards twice. This would allow bad VLSI cards to coexist with
a good intel card, for example. We now detect i82365SL-DF cards where
before we'd detect a VLSI. For the most part, this is good, but we
run a small chance of detecting a single slot 82C146 as a i82365SL-DF.
Since I can't find a datasheet for the 82c146, I don't know if this is
a problem or not.
This work is based on an excellent article, in Japanese, by NAKAGAWA,
Yoshihisa-san that appeared in FreeBSD Press Number 4. He provided a
patch against PAO3 in his article. Since the pcic.c code has changed
some since then, I've gone ahead and cleaned up his patch somewhat and
changed how the code detects the buggy '146 cards.
I also removed the comment asking if there were other cards that
matched the 82C146 since we found one and additional information isn't
necessary.
Diffstat (limited to 'sys/pccard/i82365.h')
| -rw-r--r-- | sys/pccard/i82365.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/pccard/i82365.h b/sys/pccard/i82365.h index e8ef822..060eec5 100644 --- a/sys/pccard/i82365.h +++ b/sys/pccard/i82365.h @@ -35,7 +35,7 @@ * $FreeBSD$ */ -#define PCIC_I82365 0 /* Intel chip */ +#define PCIC_I82365 0 /* Intel i82365SL-A/B or clone */ #define PCIC_IBM 1 /* IBM clone */ #define PCIC_VLSI 2 /* VLSI chip */ #define PCIC_PD672X 3 /* Cirrus logic 672x */ @@ -46,9 +46,7 @@ #define PCIC_VG469 8 /* Vadem 469 */ #define PCIC_RF5C396 9 /* Ricoh RF5C396 */ #define PCIC_IBM_KING 10 /* IBM KING PCMCIA Controller */ -#define PCIC_PC98 11 /* NEC PC98 PCMCIA Controller */ -/* These last ones aren't in normal freebsd */ -#define PCIC_TI1130 12 /* TI PCI1130 CardBus */ +#define PCIC_I82365SL_DF 11 /* Intel i82365sl-DF step */ /* * Address of the controllers. Each controller can manage @@ -103,6 +101,7 @@ /* For Identification and Revision (PCIC_ID_REV) */ #define PCIC_INTEL0 0x82 /* Intel 82365SL Rev. 0; Both Memory and I/O */ #define PCIC_INTEL1 0x83 /* Intel 82365SL Rev. 1; Both Memory and I/O */ +#define PCIC_INTEL2 0x84 /* Intel 82365SL step D */ #define PCIC_VLSI82C146 0x84 /* VLSI 82C146 */ #define PCIC_IBM1 0x88 /* IBM PCIC clone; Both Memory and I/O */ #define PCIC_IBM2 0x89 /* IBM PCIC clone; Both Memory and I/O */ |
