d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync to 1.16 pccarddevs to get new PCMCIA_ symbols

Browse Source
This commit is contained in:
imp 2001-11-11 20:15:47 +00:00
parent db8e4ff08f
commit eac3f73dc1
4 changed files with 567 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/pccard/pccard_cis.c
View File

@ -89,8 +89,8 @@ pccard_read_cis(struct pccard_softc *sc)
state.card->cis1_info[1] = NULL;
state.card->cis1_info[2] = NULL;
state.card->cis1_info[3] = NULL;
state.card->manufacturer = PCCARD_VENDOR_INVALID;
state.card->product = PCCARD_PRODUCT_INVALID;
state.card->manufacturer = PCMCIA_VENDOR_INVALID;
state.card->product = PCMCIA_PRODUCT_INVALID;
STAILQ_INIT(&state.card->pf_head);
state.pf = NULL;

28
sys/dev/pccard/pccard_cis_quirks.c
View File

@ -183,23 +183,23 @@ static struct pccard_config_entry pccard_ndc_nd5100_func0_cfe0 = {
};
static struct pccard_cis_quirk pccard_cis_quirks[] = {
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556, PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID,
&pccard_3cxem556_func0, &pccard_3cxem556_func0_cfe0 },
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556, PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID,
&pccard_3cxem556_func1, &pccard_3cxem556_func1_cfe0 },
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556INT, PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID,
&pccard_3cxem556_func0, &pccard_3cxem556_func0_cfe0 },
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CXEM556INT, PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID,
&pccard_3cxem556_func1, &pccard_3cxem556_func1_cfe0 },
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CCFEM556BI,
PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
PCMCIA_CIS_INVALID,
&pccard_3ccfem556bi_func0, &pccard_3ccfem556bi_func0_cfe0 },
{ PCCARD_VENDOR_3COM, PCCARD_PRODUCT_3COM_3CCFEM556BI,
PCCARD_CIS_INVALID,
{ PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
PCMCIA_CIS_INVALID,
&pccard_3ccfem556bi_func1, &pccard_3ccfem556bi_func1_cfe0 },
{ PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, PCCARD_CIS_SVEC_LANCARD,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD,
&pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 },
{ PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, PCCARD_CIS_NDC_ND5100_E,
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E,
&pccard_ndc_nd5100_func0, &pccard_ndc_nd5100_func0_cfe0 },
};
@ -220,10 +220,10 @@ void pccard_check_cis_quirks(device_t dev)
for (i=0; i<n_pccard_cis_quirks; i++) {
if ((sc->card.manufacturer == pccard_cis_quirks[i].manufacturer) &&
(sc->card.product == pccard_cis_quirks[i].product) &&
(((sc->card.manufacturer != PCCARD_VENDOR_INVALID) &&
(sc->card.product != PCCARD_PRODUCT_INVALID)) ||
((sc->card.manufacturer == PCCARD_VENDOR_INVALID) &&
(sc->card.product == PCCARD_PRODUCT_INVALID) &&
(((sc->card.manufacturer != PCMCIA_VENDOR_INVALID) &&
(sc->card.product != PCMCIA_PRODUCT_INVALID)) ||
((sc->card.manufacturer == PCMCIA_VENDOR_INVALID) &&
(sc->card.product == PCMCIA_PRODUCT_INVALID) &&
sc->card.cis1_info[0] &&
(strcmp(sc->card.cis1_info[0],
pccard_cis_quirks[i].cis1_info[0]) == 0) &&

1096
sys/dev/pccard/pccarddevs.h
View File

File diff suppressed because it is too large Load Diff

6
sys/dev/pccard/pccardvar.h
View File

@ -176,11 +176,11 @@ struct pccard_card {
* indicates no id was found.
*/
int32_t manufacturer;
#define PCCARD_VENDOR_INVALID -1
#define PCMCIA_VENDOR_INVALID -1
int32_t product;
#define PCCARD_PRODUCT_INVALID -1
#define PCMCIA_PRODUCT_INVALID -1
u_int16_t error;
#define PCCARD_CIS_INVALID { NULL, NULL, NULL, NULL }
#define PCMCIA_CIS_INVALID { NULL, NULL, NULL, NULL }
STAILQ_HEAD(, pccard_function) pf_head;
};