From 619288226b2712f74765e6d3386ba50457128048 Mon Sep 17 00:00:00 2001
From: Jason Wright <jason@cvs.openbsd.org>
Date: Thu, 25 Sep 2003 15:40:55 +0000
Subject: hifn 7956 support

---
 sys/dev/pci/hifn7751.c     | 15 ++++++++++++---
 sys/dev/pci/pcidevs.h      |  3 ++-
 sys/dev/pci/pcidevs_data.h |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 450fca4d330..9fc43d4bd8a 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751.c,v 1.142 2003/09/24 05:23:29 jason Exp $	*/
+/*	$OpenBSD: hifn7751.c,v 1.143 2003/09/25 15:40:54 jason Exp $	*/
 
 /*
  * Invertex AEON / Hifn 7751 driver
@@ -128,6 +128,7 @@ const struct pci_matchid hifn_devices[] = {
 	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7811 },
 	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7951 },
 	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7955 },
+	{ PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7956 },
 	{ PCI_VENDOR_NETSEC, PCI_PRODUCT_NETSEC_7751 },
 };
 
@@ -158,7 +159,9 @@ hifn_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_pci_tag = pa->pa_tag;
 
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_HIFN &&
-	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7951)
+	   (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7951 ||
+	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7955 ||
+	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7956))
 		sc->sc_flags = HIFN_HAS_RNG | HIFN_HAS_PUBLIC;
 
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_HIFN &&
@@ -275,7 +278,8 @@ hifn_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_HIFN &&
-	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7955) {
+	   (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7955 ||
+	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_HIFN_7956)) {
 		sc->sc_maxses = 125;
 		sc->sc_ramsize = 32 * 1024;
 	} else
@@ -577,6 +581,11 @@ struct pci2id {
 		PCI_PRODUCT_HIFN_7955,
 		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		  0x00, 0x00, 0x00, 0x00, 0x00 }
+	}, {
+		PCI_VENDOR_HIFN,
+		PCI_PRODUCT_HIFN_7956,
+		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		  0x00, 0x00, 0x00, 0x00, 0x00 }
 	}, {
 		PCI_VENDOR_NETSEC,
 		PCI_PRODUCT_NETSEC_7751,
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 56c2a6fe33a..ae9df10bea3 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.671 2003/09/25 07:11:15 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.672 2003/09/25 15:39:02 jason Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1052,6 +1052,7 @@
 #define	PCI_PRODUCT_HIFN_8065	0x0016		/* 8065 */
 #define	PCI_PRODUCT_HIFN_8165	0x0017		/* 8165 */
 #define	PCI_PRODUCT_HIFN_8154	0x0018		/* 8154 */
+#define	PCI_PRODUCT_HIFN_7956	0x001d		/* 7956 */
 #define	PCI_PRODUCT_HIFN_7955	0x0020		/* 7955 */
 
 /* Hint */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index ee048073491..1b9c8d58e22 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.671 2003/09/25 07:11:15 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.672 2003/09/25 15:39:02 jason Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -2490,6 +2490,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_8154,
 	    "8154",
 	},
+	{
+	    PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7956,
+	    "7956",
+	},
 	{
 	    PCI_VENDOR_HIFN, PCI_PRODUCT_HIFN_7955,
 	    "7955",
-- 
cgit v1.2.3