summaryrefslogtreecommitdiffstats
path: root/sys/pccard/pcic_isa.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2001-05-23 05:06:04 +0000
committerimp <imp@FreeBSD.org>2001-05-23 05:06:04 +0000
commit4ebc84e6166b69dab863d6c8505142c68e0deec4 (patch)
treed91bed80b6e039d8e28c19567a84fe7d812ec76e /sys/pccard/pcic_isa.c
parentf5bcf454fa146dde495f120baa099f28344be2ba (diff)
downloadFreeBSD-src-4ebc84e6166b69dab863d6c8505142c68e0deec4.zip
FreeBSD-src-4ebc84e6166b69dab863d6c8505142c68e0deec4.tar.gz
Add better support for the Ricoh 5C296 and 5C396 chips. These chips
have a slightly different 3.3V support than the other clones, so compensate as best we can. Note: 3.3V support is untested since I do not have any 3.3V cards that I know of to test it with.
Diffstat (limited to 'sys/pccard/pcic_isa.c')
-rw-r--r--sys/pccard/pcic_isa.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/pccard/pcic_isa.c b/sys/pccard/pcic_isa.c
index e69baba..03fc578 100644
--- a/sys/pccard/pcic_isa.c
+++ b/sys/pccard/pcic_isa.c
@@ -66,7 +66,8 @@ static struct {
{ "Vadem 465", PCIC_VG_POWER},
{ "Vadem 468", PCIC_VG_POWER},
{ "Vadem 469", PCIC_VG_POWER},
- { "Ricoh RF5C396", PCIC_AB_POWER},
+ { "Ricoh RF5C296", PCIC_RICOH_POWER},
+ { "Ricoh RF5C396", PCIC_RICOH_POWER},
{ "IBM KING", PCIC_KING_POWER},
{ "Intel i82365SL-DF", PCIC_DF_POWER}
};
@@ -214,16 +215,17 @@ pcic_isa_probe(device_t dev)
}
/*
- * Check for RICOH RF5C396 PCMCIA Controller
+ * Check for RICOH RF5C[23]96 PCMCIA Controller
*/
- c = sp->getb(sp, 0x3a);
- if (c == 0xb2) {
+ c = sp->getb(sp, PCIC_RICOH_ID);
+ if (c == PCIC_RID_396)
sp->controller = PCIC_RF5C396;
- }
+ else if (c == PCIC_RID_296)
+ sp->controller = PCIC_RF5C296;
break;
/*
- * Intel i82365D or maybe a vlsi 82c146
+ * Intel i82365sl-DF step or maybe a vlsi 82c146
* we detected the vlsi case earlier, so if the controller
* isn't set, we know it is a i82365sl step D.
*/
OpenPOWER on IntegriCloud