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

Add PCI IDs for the Compex RL100-TX, which uses the Macronix 98713 chip.

Browse Source
This commit is contained in:
Bill Paul 1999-04-08 17:38:05 +00:00
parent 8961398416
commit e31c685452
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/pci/if_mx.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_mx.c,v 1.37 1999/04/01 02:00:04 wpaul Exp $
* $Id: if_mx.c,v 1.39 1999/04/08 17:33:23 wpaul Exp $
*/
/*
@ -94,7 +94,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_mx.c,v 1.37 1999/04/01 02:00:04 wpaul Exp $";
"$Id: if_mx.c,v 1.39 1999/04/08 17:33:23 wpaul Exp $";
#endif
/*
@ -105,6 +105,10 @@ static struct mx_type mx_devs[] = {
"Macronix 98713 10/100BaseTX" },
{ MX_VENDORID, MX_DEVICEID_98713,
"Macronix 98713A 10/100BaseTX" },
{ CP_VENDORID, CP_DEVICEID_98713,
"Compex RL100-TX 10/100BaseTX" },
{ CP_VENDORID, CP_DEVICEID_98713,
"Compex RL100-TX 10/100BaseTX" },
{ MX_VENDORID, MX_DEVICEID_987x5,
"Macronix 98715/98715A 10/100BaseTX" },
{ MX_VENDORID, MX_DEVICEID_987x5,
@ -1257,6 +1261,9 @@ mx_probe(config_id, device_id)
if (t->mx_did == MX_DEVICEID_98713 &&
rev >= MX_REVISION_98713A)
t++;
if (t->mx_did == CP_DEVICEID_98713 &&
rev >= MX_REVISION_98713A)
t++;
if (t->mx_did == MX_DEVICEID_987x5 &&
rev >= MX_REVISION_98725)
t++;
@ -1387,6 +1394,8 @@ mx_attach(config_id, unit)
if (pci_id == MX_DEVICEID_98713 && revision < MX_REVISION_98713A)
sc->mx_type = MX_TYPE_98713;
else if (pci_id == CP_DEVICEID_98713 && revision < MX_REVISION_98713A)
sc->mx_type = MX_TYPE_98713;
else if (pci_id == MX_DEVICEID_98713 && revision >= MX_REVISION_98713A)
sc->mx_type = MX_TYPE_98713A;
else
@ -1580,7 +1589,7 @@ static int mx_list_rx_init(sc)
for (i = 0; i < MX_RX_LIST_CNT; i++) {
cd->mx_rx_chain[i].mx_ptr =
(volatile struct mx_desc *)&ld->mx_rx_list[i];
(struct mx_desc *)&ld->mx_rx_list[i];
if (mx_newbuf(sc, &cd->mx_rx_chain[i]) == ENOBUFS)
return(ENOBUFS);
if (i == (MX_RX_LIST_CNT - 1)) {
@ -1951,7 +1960,7 @@ static int mx_encap(sc, c, m_head)
struct mbuf *m_head;
{
int frag = 0;
volatile struct mx_desc *f = NULL;
struct mx_desc *f = NULL;
int total_len;
struct mbuf *m;

36
sys/pci/if_mxreg.h
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_mxreg.h,v 1.14 1999/04/01 02:01:04 wpaul Exp $
* $Id: if_mxreg.h,v 1.16 1999/04/08 17:35:38 wpaul Exp $
*/
/*
@ -332,10 +332,10 @@
*/
struct mx_desc {
volatile u_int32_t mx_status;
volatile u_int32_t mx_ctl;
volatile u_int32_t mx_ptr1;
volatile u_int32_t mx_ptr2;
u_int32_t mx_status;
u_int32_t mx_ctl;
u_int32_t mx_ptr1;
u_int32_t mx_ptr2;
};
#define mx_data mx_ptr1
@ -406,7 +406,7 @@ struct mx_desc {
* back to back.
*/
struct mx_txdesc {
volatile struct mx_desc mx_frag[MX_MAXFRAGS];
struct mx_desc mx_frag[MX_MAXFRAGS];
};
#define MX_TXNEXT(x) x->mx_ptr->mx_frag[x->mx_lastdesc].mx_next
@ -419,19 +419,19 @@ struct mx_txdesc {
#define MX_UNSENT 0x12341234
struct mx_list_data {
volatile struct mx_desc mx_rx_list[MX_RX_LIST_CNT];
volatile struct mx_txdesc mx_tx_list[MX_TX_LIST_CNT];
struct mx_desc mx_rx_list[MX_RX_LIST_CNT];
struct mx_txdesc mx_tx_list[MX_TX_LIST_CNT];
};
struct mx_chain {
volatile struct mx_txdesc *mx_ptr;
struct mbuf *mx_mbuf;
struct mx_chain *mx_nextdesc;
u_int8_t mx_lastdesc;
struct mx_txdesc *mx_ptr;
struct mbuf *mx_mbuf;
struct mx_chain *mx_nextdesc;
u_int8_t mx_lastdesc;
};
struct mx_chain_onefrag {
volatile struct mx_desc *mx_ptr;
struct mx_desc *mx_ptr;
struct mbuf *mx_mbuf;
struct mx_chain_onefrag *mx_nextdesc;
};
@ -528,6 +528,16 @@ struct mx_softc {
#define MX_DEVICEID_98713 0x0512
#define MX_DEVICEID_987x5 0x0531
/*
* Compex PCI vendor ID.
*/
#define CP_VENDORID 0x11F6
/*
* Compex PMAC PCI device IDs.
*/
#define CP_DEVICEID_98713 0x9881
/*
* Texas Instruments PHY identifiers
*/