svn commit: r183814 - head/sys/dev/jme

[Pyun YongHyeon]

Author: yongari
Date: Mon Oct 13 01:11:28 2008
New Revision: 183814
URL: http://svn.freebsd.org/changeset/base/183814

Log:
  Read PCI device id instead of PCI revision id. Also checks the read
  device id is JMC260 family. Previously it just verified the deivce
  is JMC260 Rev A0. This will make it easy for newer JMC2xx support.
  
  Pointed out by:	bouyer at NetBSD

Modified:
  head/sys/dev/jme/if_jme.c
  head/sys/dev/jme/if_jmereg.h

Modified: head/sys/dev/jme/if_jme.c
==============================================================================
--- head/sys/dev/jme/if_jme.c	Sun Oct 12 23:47:06 2008	(r183813)
+++ head/sys/dev/jme/if_jme.c	Mon Oct 13 01:11:28 2008	(r183814)
@@ -624,8 +624,8 @@ jme_attach(device_t dev)
 		goto fail;
 	}
 
-	sc->jme_rev = pci_get_revid(dev);
-	if (sc->jme_rev == DEVICEID_JMC260) {
+	sc->jme_rev = pci_get_device(dev);
+	if ((sc->jme_rev & DEVICEID_JMC2XX_MASK) == DEVICEID_JMC260) {
 		sc->jme_flags |= JME_FLAG_FASTETH;
 		sc->jme_flags |= JME_FLAG_NOJUMBO;
 	}

Modified: head/sys/dev/jme/if_jmereg.h
==============================================================================
--- head/sys/dev/jme/if_jmereg.h	Sun Oct 12 23:47:06 2008	(r183813)
+++ head/sys/dev/jme/if_jmereg.h	Mon Oct 13 01:11:28 2008	(r183814)
@@ -48,6 +48,8 @@
 #define	DEVICEID_JMC260		0x0260
 #define	DEVICEREVID_JMC260_A0	0x00
 
+#define	DEVICEID_JMC2XX_MASK	0x0FF0
+
 /* JMC250 PCI configuration register. */
 #define	JME_PCI_BAR0		0x10	/* 16KB memory window. */