diff options
-rw-r--r-- | share/man/man4/ti.4 | 6 | ||||
-rw-r--r-- | sys/dev/ti/if_ti.c | 8 | ||||
-rw-r--r-- | sys/dev/ti/if_tireg.h | 1 | ||||
-rw-r--r-- | sys/pci/if_ti.c | 8 | ||||
-rw-r--r-- | sys/pci/if_tireg.h | 1 |
5 files changed, 20 insertions, 4 deletions
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4 index 2b9a919..9157b3f 100644 --- a/share/man/man4/ti.4 +++ b/share/man/man4/ti.4 @@ -70,13 +70,15 @@ driver has been tested with the following Tigon-based adapters: .It The Alteon AceNIC V gigabit ethernet adapter (1000baseSX) .It -The Alteon AceNIC V gigabit ethernet adapter (1000bassTX) +The Alteon AceNIC V gigabit ethernet adapter (1000bassT) .It The 3Com 3c985-SX gigabit ethernet adapter (Tigon 1) .It The 3Com 3c985B-SX gigabit ethernet adapter (Tigon 2) .It -The Netgear GA620 gigabit ethernet adapter +The Netgear GA620 gigabit ethernet adapter (1000baseSX) +.It +The Netgear GA620T gigabit ethernet adapter (1000baseT) .El .Pp The following should also be supported but have not yet been tested: diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index c766abf..7e1b6f7 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -141,7 +141,9 @@ static struct ti_type ti_devs[] = { { TC_VENDORID, TC_DEVICEID_3C985, "3Com 3c985-SX Gigabit Ethernet" }, { NG_VENDORID, NG_DEVICEID_GA620, - "Netgear GA620 Gigabit Ethernet" }, + "Netgear GA620 1000baseSX Gigabit Ethernet" }, + { NG_VENDORID, NG_DEVICEID_GA620T, + "Netgear GA620 1000baseT Gigabit Ethernet" }, { SGI_VENDORID, SGI_DEVICEID_TIGON, "Silicon Graphics Gigabit Ethernet" }, { DEC_VENDORID, DEC_DEVICEID_FARALLON_PN9000SX, @@ -1700,6 +1702,10 @@ static int ti_attach(dev) if (pci_get_vendor(dev) == ALT_VENDORID && pci_get_device(dev) == ALT_DEVICEID_ACENIC_COPPER) sc->ti_copper = 1; + /* Ok, it's not the only copper card available. */ + if (pci_get_vendor(dev) == NG_VENDORID && + pci_get_device(dev) == NG_DEVICEID_GA620T) + sc->ti_copper = 1; /* Set default tuneable values. */ sc->ti_stat_ticks = 2 * TI_TICKS_PER_SEC; diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h index 1e632f5..4712272 100644 --- a/sys/dev/ti/if_tireg.h +++ b/sys/dev/ti/if_tireg.h @@ -73,6 +73,7 @@ */ #define NG_VENDORID 0x1385 #define NG_DEVICEID_GA620 0x620A +#define NG_DEVICEID_GA620T 0x630A /* * SGI device/vendor ID. diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c index c766abf..7e1b6f7 100644 --- a/sys/pci/if_ti.c +++ b/sys/pci/if_ti.c @@ -141,7 +141,9 @@ static struct ti_type ti_devs[] = { { TC_VENDORID, TC_DEVICEID_3C985, "3Com 3c985-SX Gigabit Ethernet" }, { NG_VENDORID, NG_DEVICEID_GA620, - "Netgear GA620 Gigabit Ethernet" }, + "Netgear GA620 1000baseSX Gigabit Ethernet" }, + { NG_VENDORID, NG_DEVICEID_GA620T, + "Netgear GA620 1000baseT Gigabit Ethernet" }, { SGI_VENDORID, SGI_DEVICEID_TIGON, "Silicon Graphics Gigabit Ethernet" }, { DEC_VENDORID, DEC_DEVICEID_FARALLON_PN9000SX, @@ -1700,6 +1702,10 @@ static int ti_attach(dev) if (pci_get_vendor(dev) == ALT_VENDORID && pci_get_device(dev) == ALT_DEVICEID_ACENIC_COPPER) sc->ti_copper = 1; + /* Ok, it's not the only copper card available. */ + if (pci_get_vendor(dev) == NG_VENDORID && + pci_get_device(dev) == NG_DEVICEID_GA620T) + sc->ti_copper = 1; /* Set default tuneable values. */ sc->ti_stat_ticks = 2 * TI_TICKS_PER_SEC; diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h index 1e632f5..4712272 100644 --- a/sys/pci/if_tireg.h +++ b/sys/pci/if_tireg.h @@ -73,6 +73,7 @@ */ #define NG_VENDORID 0x1385 #define NG_DEVICEID_GA620 0x620A +#define NG_DEVICEID_GA620T 0x630A /* * SGI device/vendor ID. |