diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-05-10 10:23:40 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-05-10 10:23:40 +0000 |
| commit | 7a9757f3a5087bb39063f42272dfcdafccf4bf53 (patch) | |
| tree | 54a69f61a2da95e02ffdc56317acb00d22b4f223 | |
| parent | ce68c9929a563b13359a26db8ccf85340f68cfe7 (diff) | |
Notes
| -rw-r--r-- | sys/dev/cy/cy_pci.c | 9 | ||||
| -rw-r--r-- | sys/pci/cy_pci.c | 9 | ||||
| -rw-r--r-- | sys/pci/cy_pcireg.h | 6 |
3 files changed, 9 insertions, 15 deletions
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c index f6cd10c9ff3c..3034deefcf86 100644 --- a/sys/dev/cy/cy_pci.c +++ b/sys/dev/cy/cy_pci.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $ + * $Id: cy_pci.c,v 1.14 1999/05/09 17:06:43 peter Exp $ */ /* @@ -72,11 +72,10 @@ cy_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; { - if ((device_id & 0xffff) == CY_VENDORID_CYCLADES && - ((device_id >> 16) == CY_DEVICEID_CYCLOM_Y_1 || - (device_id >> 16) == CY_DEVICEID_CYCLOM_Y_2)) + device_id &= ~0x00060000; + if (device_id == 0x0100120e || device_id == 0x0101120e) return ("Cyclades Cyclom-Y Serial Adapter"); - return NULL; + return (NULL); } static void diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c index f6cd10c9ff3c..3034deefcf86 100644 --- a/sys/pci/cy_pci.c +++ b/sys/pci/cy_pci.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $ + * $Id: cy_pci.c,v 1.14 1999/05/09 17:06:43 peter Exp $ */ /* @@ -72,11 +72,10 @@ cy_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; { - if ((device_id & 0xffff) == CY_VENDORID_CYCLADES && - ((device_id >> 16) == CY_DEVICEID_CYCLOM_Y_1 || - (device_id >> 16) == CY_DEVICEID_CYCLOM_Y_2)) + device_id &= ~0x00060000; + if (device_id == 0x0100120e || device_id == 0x0101120e) return ("Cyclades Cyclom-Y Serial Adapter"); - return NULL; + return (NULL); } static void diff --git a/sys/pci/cy_pcireg.h b/sys/pci/cy_pcireg.h index cc3bb60eb004..150dc54ae57d 100644 --- a/sys/pci/cy_pcireg.h +++ b/sys/pci/cy_pcireg.h @@ -24,13 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cy_pcireg.h,v 1.4 1999/01/11 23:35:01 bde Exp $ + * $Id: cy_pcireg.h,v 1.5 1999/01/11 23:43:54 bde Exp $ */ -#define CY_VENDORID_CYCLADES 0x120e -#define CY_DEVICEID_CYCLOM_Y_1 0x100 -#define CY_DEVICEID_CYCLOM_Y_2 0x101 - #define CY_PCI_BASE_ADDR0 0x10 #define CY_PCI_BASE_ADDR1 0x14 #define CY_PCI_BASE_ADDR2 0x18 |