Author: philip
Date: Fri May  8 14:01:40 2009
New Revision: 191913
URL: http://svn.freebsd.org/changeset/base/191913

Log:
  MFC r191894: Add PCI IDs for the Broadcom 5825 incarnation.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/ubsec/ubsec.c
  stable/7/sys/dev/ubsec/ubsecreg.h

Modified: stable/7/sys/dev/ubsec/ubsec.c
==============================================================================
--- stable/7/sys/dev/ubsec/ubsec.c      Fri May  8 13:44:33 2009        
(r191912)
+++ stable/7/sys/dev/ubsec/ubsec.c      Fri May  8 14:01:40 2009        
(r191913)
@@ -220,7 +220,8 @@ ubsec_probe(device_t dev)
             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820 ||
             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
-            pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823
+            pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 ||
+            pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825
             ))
                return (BUS_PROBE_DEFAULT);
        return (ENXIO);
@@ -240,6 +241,7 @@ ubsec_partname(struct ubsec_softc *sc)
                case PCI_PRODUCT_BROADCOM_5821: return "Broadcom 5821";
                case PCI_PRODUCT_BROADCOM_5822: return "Broadcom 5822";
                case PCI_PRODUCT_BROADCOM_5823: return "Broadcom 5823";
+               case PCI_PRODUCT_BROADCOM_5825: return "Broadcom 5825";
                }
                return "Broadcom unknown-part";
        case PCI_VENDOR_BLUESTEEL:
@@ -301,7 +303,8 @@ ubsec_attach(device_t dev)
        if ((pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
             (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
              pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
-             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823)) ||
+             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 ||
+             pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825)) ||
            (pci_get_vendor(dev) == PCI_VENDOR_SUN &&
             (pci_get_device(dev) == PCI_PRODUCT_SUN_SCA1K ||
              pci_get_device(dev) == PCI_PRODUCT_SUN_5821))) {

Modified: stable/7/sys/dev/ubsec/ubsecreg.h
==============================================================================
--- stable/7/sys/dev/ubsec/ubsecreg.h   Fri May  8 13:44:33 2009        
(r191912)
+++ stable/7/sys/dev/ubsec/ubsecreg.h   Fri May  8 14:01:40 2009        
(r191913)
@@ -62,6 +62,7 @@
 #define        PCI_PRODUCT_BROADCOM_5821       0x5821          /* 5821 */
 #define        PCI_PRODUCT_BROADCOM_5822       0x5822          /* 5822 */
 #define        PCI_PRODUCT_BROADCOM_5823       0x5823          /* 5823 */
+#define        PCI_PRODUCT_BROADCOM_5825       0x5825          /* 5825 */
 
 /* Sun Microsystems */
 #define PCI_PRODUCT_SUN_5821           0x5454          /* Crypto 5821 */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to