Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Because memory mapped access doesn't fail only with the docking station

Browse Source 
for the TI TravelMate 5000 but also with at least one Compaq NIC we
prefer I/O mapped access again. Fixes PR kern/6690.
This commit is contained in:
tron 1999-01-11 22:45:41 +00:00
parent 3ed4fcf61e
commit edd69ba694
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/pci/if_tl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tl.c,v 1.21 1998/10/30 23:30:16 thorpej Exp $ */
/* $NetBSD: if_tl.c,v 1.22 1999/01/11 22:45:41 tron Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@ -200,21 +200,21 @@ struct cfattach tl_ca = {
const struct tl_product_desc tl_compaq_products[] = {
{ PCI_PRODUCT_COMPAQ_N100TX, TLPHY_MEDIA_NO_10_T,
0, "Compaq Netelligent 10/100 TX" },
"Compaq Netelligent 10/100 TX" },
{ PCI_PRODUCT_COMPAQ_N10T, TLPHY_MEDIA_10_5,
0, "Compaq Netelligent 10 T" },
"Compaq Netelligent 10 T" },
{ PCI_PRODUCT_COMPAQ_IntNF3P, TLPHY_MEDIA_10_2,
0, "Compaq Integrated NetFlex 3/P" },
"Compaq Integrated NetFlex 3/P" },
{ PCI_PRODUCT_COMPAQ_IntPL100TX, TLPHY_MEDIA_10_2|TLPHY_MEDIA_NO_10_T,
0, "Compaq ProLiant Integrated Netelligent 10/100 TX" },
"Compaq ProLiant Integrated Netelligent 10/100 TX" },
{ PCI_PRODUCT_COMPAQ_DPNet100TX, TLPHY_MEDIA_10_5|TLPHY_MEDIA_NO_10_T,
0, "Compaq Dual Port Netelligent 10/100 TX" },
"Compaq Dual Port Netelligent 10/100 TX" },
{ PCI_PRODUCT_COMPAQ_DP4000, TLPHY_MEDIA_10_5,
0, "Compaq Deskpro 4000 5233MMX" },
"Compaq Deskpro 4000 5233MMX" },
{ PCI_PRODUCT_COMPAQ_NF3P_BNC, TLPHY_MEDIA_10_2,
0, "Compaq NetFlex 3/P w/ BNC" },
"Compaq NetFlex 3/P w/ BNC" },
{ PCI_PRODUCT_COMPAQ_NF3P, TLPHY_MEDIA_10_5,
0, "Compaq NetFlex 3/P" },
"Compaq NetFlex 3/P" },
{ 0, 0, NULL },
};
@ -222,10 +222,9 @@ const struct tl_product_desc tl_ti_products[] = {
/*
* Built-in Ethernet on the TI TravelMate 5000
* docking station; better product description?
* XXX Seems to have broken memory-mapped access.
*/
{ PCI_PRODUCT_TI_TLAN, 0,
TPF_BROKEN_MEM, "Texas Instruments ThunderLAN" },
"Texas Instruments ThunderLAN" },
{ 0, 0, NULL },
};
@ -313,12 +312,12 @@ tl_pci_attach(parent, self, aux)
PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT,
0, &memt, &memh, NULL, NULL) == 0);
if (memh_valid && (tp->tp_flags & TPF_BROKEN_MEM) == 0) {
sc->tl_bustag = memt;
sc->tl_bushandle = memh;
} else if (ioh_valid) {
if (ioh_valid) {
sc->tl_bustag = iot;
sc->tl_bushandle = ioh;
} else if (memh_valid) {
sc->tl_bustag = memt;
sc->tl_bushandle = memh;
} else {
printf("%s: unable to map device registers\n",
sc->sc_dev.dv_xname);

6
sys/dev/pci/if_tlvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tlvar.h,v 1.2 1998/08/15 16:49:33 bouyer Exp $ */
/* $NetBSD: if_tlvar.h,v 1.3 1999/01/11 22:45:42 tron Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@ -38,13 +38,9 @@
struct tl_product_desc {
u_int32_t tp_product;
int tp_tlphymedia;
int tp_flags;
const char *tp_desc;
};
/* tp_flags */
#define TPF_BROKEN_MEM 0x00000001 /* memory-mapped access is broken */
struct tl_softc {
struct device sc_dev; /* base device */
bus_space_tag_t tl_bustag;