mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

o Set CBB_CARD_OK just before CARD_ATTACH_CARD. If ATTACH_CARD fails, then

Browse Source 
clear the bit.  This allows ata driver to attach its children because
  it needs the interrupts enabled to succeed.

Submitted by: iwasaki-san

o Spell CardBus as CardBus, not Cardbus or CardBUS while I'm here.
This commit is contained in:
Warner Losh 2002-10-11 04:30:59 +00:00
parent 192e439ed4
commit 93642ba9bf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=104830
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/pccbb/pccbb.c
View File

@ -60,7 +60,7 @@
*/
/*
* Driver for PCI to Cardbus Bridge chips
* Driver for PCI to CardBus Bridge chips
*
* References:
* TI Datasheets:
@ -510,8 +510,8 @@ cbb_chipinit(struct cbb_softc *sc)
topic_common:;
/*
* At offset 0xa0: SLOT CONTROL
* 0x80 Enable Cardbus Functionality
* 0x40 Enable Cardbus and PC Card registers
* 0x80 Enable CardBus Functionality
* 0x40 Enable CardBus and PC Card registers
* 0x20 Lock ID in exca regs
* 0x10 Write protect ID in config regs
* Clear the rest of the bits, which defaults the slot
@ -955,11 +955,12 @@ cbb_insert(struct cbb_softc *sc)
if (sockstate & CBB_SOCKET_STAT_16BIT) {
if (sc->pccarddev != NULL) {
sc->flags |= CBB_16BIT_CARD;
if (CARD_ATTACH_CARD(sc->pccarddev) != 0)
sc->flags |= CBB_CARD_OK;
if (CARD_ATTACH_CARD(sc->pccarddev) != 0) {
device_printf(sc->dev,
"PC Card card activation failed\n");
else
sc->flags |= CBB_CARD_OK;
sc->flags &= ~CBB_CARD_OK;
}
} else {
device_printf(sc->dev,
"PC Card inserted, but no pccard bus.\n");
@ -967,14 +968,15 @@ cbb_insert(struct cbb_softc *sc)
} else if (sockstate & CBB_SOCKET_STAT_CB) {
if (sc->cbdev != NULL) {
sc->flags &= ~CBB_16BIT_CARD;
if (CARD_ATTACH_CARD(sc->cbdev) != 0)
sc->flags |= CBB_CARD_OK;
if (CARD_ATTACH_CARD(sc->cbdev) != 0) {
device_printf(sc->dev,
"CardBus card activation failed\n");
else
sc->flags |= CBB_CARD_OK;
sc->flags &= ~CBB_CARD_OK;
}
} else {
device_printf(sc->dev,
"CardBUS card inserted, but no cardbus bus.\n");
"CardBus card inserted, but no cardbus bus.\n");
}
} else {
/*
@ -1233,7 +1235,7 @@ cbb_do_power(device_t brdev)
}
/************************************************************************/
/* Cardbus power functions */
/* CardBus power functions */
/************************************************************************/
static void
@ -1281,7 +1283,7 @@ cbb_cardbus_power_disable_socket(device_t brdev, device_t child)
}
/************************************************************************/
/* Cardbus Resource */
/* CardBus Resource */
/************************************************************************/
static int