Detect PCI device IDs for latest boards. Simplified the ID comparisons.

Submitted by:	Ivan Passos <ivan@cyclades.com> (rewritten by me)
This commit is contained in:
Bruce Evans 1999-05-10 10:23:40 +00:00
parent ce68c9929a
commit 7a9757f3a5
3 changed files with 9 additions and 15 deletions

View File

@ -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

View File

@ -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

View File

@ -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