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

Add real support for obtaining the silicom MAC address from the

Browse Source 
apporpriate place in the CIS, now that we have the CIS scanning code.
This commit is contained in:
Warner Losh 2005-07-15 01:48:38 +00:00
parent faf98cda63
commit 5e2f32718d
1 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/dev/ex/if_ex_pccard.c
View File

@ -146,55 +146,28 @@ ex_pccard_enet_ok(u_char *enaddr)
return (sum != 0);
}
#if 0
#ifdef NETBSD_LIKE
static int
ex_pccard_silicom_cb(struct pccard_tuple *tuple, void *arg)
ex_pccard_silicom_cb(const struct pccard_tuple *tuple, void *arg)
{
u_char *enaddr = arg;
int i;
if (tuple->code != PCMCIA_CISTPL_FUNCE)
if (tuple->code != CISTPL_FUNCE)
return (0);
if (tuple->length != 15)
return (0);
if (CARD_CIS_READ_1(tuple->dev, tuple, 6) != 6)
if (pccard_tuple_read_1(tuple, 6) != 6)
return (0);
for (i = 0; i < 6; i++)
enaddr[i] = CARD_CIS_READ_1(tuple->dev, tuple, 7 + i);
enaddr[i] = pccard_tuple_read_1(tuple, 7 + i);
return (1);
}
#endif
#endif
static void
ex_pccard_get_silicom_mac(device_t dev, u_char *ether_addr)
{
#if 0
#ifdef NETBSD_LIKE
CARD_CIS_SCAN(dev, ex_pccard_silicom_cb, ether_addr);
#endif
#ifdef CS_LIKE
uint8_t buffer[64];
tuple_t tuple;
int i;
tuple.TupleData = buffer;
tuple.TupleDataMax = sizeof(buffer);
tuple.TupleOffset = 0;
tuple.DesiredTuple = CISTPL_FUNCE;
tuple.Attributes = TUPLE_RETURN_COMMON;
if (CARD_SERVICE(dev, GetFirstTuple, &tuple) != CS_SUCCESS)
return;
if (CARD_SERVICES(dev, GetTupleData, &tuple) != CS_SUCCESS)
return;
if (tuple.TupleLength != 15)
return;
if (buffer[6] != 6)
return;
for (i = 0; i < 6; i++)
ether_addr[i] = buffer[7 + i);
#endif
#endif
CARD_CIS_SCAN(device_get_parent(dev), ex_pccard_silicom_cb,
ether_addr);
}
static int