summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/vr/if_vr.c8
-rw-r--r--sys/dev/vr/if_vrreg.h28
-rw-r--r--sys/pci/if_rl.c11
-rw-r--r--sys/pci/if_rlreg.h32
-rw-r--r--sys/pci/if_vr.c8
-rw-r--r--sys/pci/if_vrreg.h28
6 files changed, 94 insertions, 21 deletions
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 9d04b52..7c4c1d8 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vr.c,v 1.7 1999/01/10 18:51:49 wpaul Exp $
+ * $Id: if_vr.c,v 1.18 1999/02/23 06:47:52 wpaul Exp $
*/
/*
@@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: if_vr.c,v 1.7 1999/01/10 18:51:49 wpaul Exp $";
+ "$Id: if_vr.c,v 1.18 1999/02/23 06:47:52 wpaul Exp $";
#endif
/*
@@ -108,6 +108,10 @@ static struct vr_type vr_devs[] = {
"VIA VT3043 Rhine I 10/100BaseTX" },
{ VIA_VENDORID, VIA_DEVICEID_RHINE_II,
"VIA VT86C100A Rhine II 10/100BaseTX" },
+ { DELTA_VENDORID, DELTA_DEVICEID_RHINE_II,
+ "Delta Electronics Rhine II 10/100BaseTX" },
+ { ADDTRON_VENDORID, ADDTRON_DEVICEID_RHINE_II,
+ "Addtron Technology Rhine II 10/100BaseTX" },
{ 0, 0, NULL }
};
diff --git a/sys/dev/vr/if_vrreg.h b/sys/dev/vr/if_vrreg.h
index b44dcab..f511b92 100644
--- a/sys/dev/vr/if_vrreg.h
+++ b/sys/dev/vr/if_vrreg.h
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vrreg.h,v 1.9 1999/01/10 18:06:10 wpaul Exp $
+ * $Id: if_vrreg.h,v 1.10 1999/02/23 06:47:52 wpaul Exp $
*/
/*
@@ -439,13 +439,33 @@ struct vr_softc {
*
* VIA vendor ID
*/
-#define VIA_VENDORID 0x1106
+#define VIA_VENDORID 0x1106
/*
* VIA Rhine device IDs.
*/
-#define VIA_DEVICEID_RHINE 0x3043
-#define VIA_DEVICEID_RHINE_II 0x6100
+#define VIA_DEVICEID_RHINE 0x3043
+#define VIA_DEVICEID_RHINE_II 0x6100
+
+/*
+ * Delta Electronics device ID.
+ */
+#define DELTA_VENDORID 0x1500
+
+/*
+ * Delta device IDs.
+ */
+#define DELTA_DEVICEID_RHINE_II 0x1320
+
+/*
+ * Addtron vendor ID.
+ */
+#define ADDTRON_VENDORID 0x4033
+
+/*
+ * Addtron device IDs.
+ */
+#define ADDTRON_DEVICEID_RHINE_II 0x1320
/*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 943cbd6..eff59a1 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_rl.c,v 1.10 1999/01/22 15:25:04 wpaul Exp $
+ * $Id: if_rl.c,v 1.22 1999/02/23 06:42:42 wpaul Exp $
*/
/*
@@ -127,7 +127,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: if_rl.c,v 1.10 1999/01/22 15:25:04 wpaul Exp $";
+ "$Id: if_rl.c,v 1.22 1999/02/23 06:42:42 wpaul Exp $";
#endif
/*
@@ -140,6 +140,10 @@ static struct rl_type rl_devs[] = {
"RealTek 8139 10/100BaseTX" },
{ ACCTON_VENDORID, ACCTON_DEVICEID_5030,
"Accton MPX 5030/5038 10/100BaseTX" },
+ { DELTA_VENDORID, DELTA_DEVICEID_8139,
+ "Delta Electronics 8139 10/100BaseTX" },
+ { ADDTRON_VENDORID, ADDTRON_DEVICEID_8139,
+ "Addtron Technolgy 8139 10/100BaseTX" },
{ 0, 0, NULL }
};
@@ -1119,7 +1123,8 @@ rl_attach(config_id, unit)
*/
rl_read_eeprom(sc, (caddr_t)&rl_did, RL_EE_PCI_DID, 1, 0);
- if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030)
+ if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030 ||
+ rl_did == DELTA_DEVICEID_8139)
sc->rl_type = RL_8139;
else if (rl_did == RT_DEVICEID_8129)
sc->rl_type = RL_8129;
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index 5263b5a..af47fa2 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_rlreg.h,v 1.14 1998/12/07 00:16:44 wpaul Exp $
+ * $Id: if_rlreg.h,v 1.16 1999/02/23 06:42:42 wpaul Exp $
*/
/*
@@ -371,22 +371,42 @@ struct rl_softc {
#define RT_VENDORID 0x10EC
/*
- * Accton PCI vendor ID
- */
-#define ACCTON_VENDORID 0x1113
-
-/*
* RealTek chip device IDs.
*/
#define RT_DEVICEID_8129 0x8129
#define RT_DEVICEID_8139 0x8139
/*
+ * Accton PCI vendor ID
+ */
+#define ACCTON_VENDORID 0x1113
+
+/*
* Accton MPX 5030/5038 device ID.
*/
#define ACCTON_DEVICEID_5030 0x1211
/*
+ * Delta Electronics Vendor ID.
+ */
+#define DELTA_VENDORID 0x1500
+
+/*
+ * Delta device IDs.
+ */
+#define DELTA_DEVICEID_8139 0x1360
+
+/*
+ * Addtron vendor ID.
+ */
+#define ADDTRON_VENDORID 0x4033
+
+/*
+ * Addtron device IDs.
+ */
+#define ADDTRON_DEVICEID_8139 0x1360
+
+/*
* Texas Instruments PHY identifiers
*/
#define TI_PHY_VENDORID 0x4000
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 9d04b52..7c4c1d8 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vr.c,v 1.7 1999/01/10 18:51:49 wpaul Exp $
+ * $Id: if_vr.c,v 1.18 1999/02/23 06:47:52 wpaul Exp $
*/
/*
@@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: if_vr.c,v 1.7 1999/01/10 18:51:49 wpaul Exp $";
+ "$Id: if_vr.c,v 1.18 1999/02/23 06:47:52 wpaul Exp $";
#endif
/*
@@ -108,6 +108,10 @@ static struct vr_type vr_devs[] = {
"VIA VT3043 Rhine I 10/100BaseTX" },
{ VIA_VENDORID, VIA_DEVICEID_RHINE_II,
"VIA VT86C100A Rhine II 10/100BaseTX" },
+ { DELTA_VENDORID, DELTA_DEVICEID_RHINE_II,
+ "Delta Electronics Rhine II 10/100BaseTX" },
+ { ADDTRON_VENDORID, ADDTRON_DEVICEID_RHINE_II,
+ "Addtron Technology Rhine II 10/100BaseTX" },
{ 0, 0, NULL }
};
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index b44dcab..f511b92 100644
--- a/sys/pci/if_vrreg.h
+++ b/sys/pci/if_vrreg.h
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_vrreg.h,v 1.9 1999/01/10 18:06:10 wpaul Exp $
+ * $Id: if_vrreg.h,v 1.10 1999/02/23 06:47:52 wpaul Exp $
*/
/*
@@ -439,13 +439,33 @@ struct vr_softc {
*
* VIA vendor ID
*/
-#define VIA_VENDORID 0x1106
+#define VIA_VENDORID 0x1106
/*
* VIA Rhine device IDs.
*/
-#define VIA_DEVICEID_RHINE 0x3043
-#define VIA_DEVICEID_RHINE_II 0x6100
+#define VIA_DEVICEID_RHINE 0x3043
+#define VIA_DEVICEID_RHINE_II 0x6100
+
+/*
+ * Delta Electronics device ID.
+ */
+#define DELTA_VENDORID 0x1500
+
+/*
+ * Delta device IDs.
+ */
+#define DELTA_DEVICEID_RHINE_II 0x1320
+
+/*
+ * Addtron vendor ID.
+ */
+#define ADDTRON_VENDORID 0x4033
+
+/*
+ * Addtron device IDs.
+ */
+#define ADDTRON_DEVICEID_RHINE_II 0x1320
/*
OpenPOWER on IntegriCloud