Import rewritten nve device id's, which brings this more
inline with if_nfe. PR: 110883 Submitted by: Claudel <regis at claudel dot ch> Approved by: imp (mentor, implicit) MFC after: 1 week
This commit is contained in:
parent
06518ce4b1
commit
ee62f2271d
@ -211,32 +211,52 @@ DRIVER_MODULE(nve, pci, nve_driver, nve_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, nve, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
static struct nve_type nve_devs[] = {
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET1_DEVICEID,
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_LAN,
|
||||
"NVIDIA nForce MCP Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET2_DEVICEID,
|
||||
"NVIDIA nForce MCP2 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET3_DEVICEID,
|
||||
"NVIDIA nForce MCP3 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET4_DEVICEID,
|
||||
"NVIDIA nForce MCP4 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET5_DEVICEID,
|
||||
"NVIDIA nForce MCP5 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET6_DEVICEID,
|
||||
"NVIDIA nForce MCP6 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET7_DEVICEID,
|
||||
"NVIDIA nForce MCP7 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET8_DEVICEID,
|
||||
"NVIDIA nForce MCP8 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET9_DEVICEID,
|
||||
"NVIDIA nForce MCP9 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET10_DEVICEID,
|
||||
"NVIDIA nForce MCP10 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET11_DEVICEID,
|
||||
"NVIDIA nForce MCP11 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET12_DEVICEID,
|
||||
"NVIDIA nForce MCP12 Networking Adapter"},
|
||||
{NVIDIA_VENDORID, NFORCE_MCPNET13_DEVICEID,
|
||||
"NVIDIA nForce MCP13 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_LAN,
|
||||
"NVIDIA nForce2 MCP2 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1,
|
||||
"NVIDIA nForce2 400 MCP4 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2,
|
||||
"NVIDIA nForce2 400 MCP5 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN1,
|
||||
"NVIDIA nForce3 MCP3 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN,
|
||||
"NVIDIA nForce3 250 MCP6 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN4,
|
||||
"NVIDIA nForce3 MCP7 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN1,
|
||||
"NVIDIA nForce4 CK804 MCP8 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN2,
|
||||
"NVIDIA nForce4 CK804 MCP9 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN1,
|
||||
"NVIDIA nForce MCP04 Networking Adapter"}, // MCP10
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN2,
|
||||
"NVIDIA nForce MCP04 Networking Adapter"}, // MCP11
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN1,
|
||||
"NVIDIA nForce 430 MCP12 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN2,
|
||||
"NVIDIA nForce 430 MCP13 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN1,
|
||||
"NVIDIA nForce MCP55 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN2,
|
||||
"NVIDIA nForce MCP55 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN1,
|
||||
"NVIDIA nForce MCP61 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN2,
|
||||
"NVIDIA nForce MCP61 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN3,
|
||||
"NVIDIA nForce MCP61 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN4,
|
||||
"NVIDIA nForce MCP61 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN1,
|
||||
"NVIDIA nForce MCP65 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN2,
|
||||
"NVIDIA nForce MCP65 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN3,
|
||||
"NVIDIA nForce MCP65 Networking Adapter"},
|
||||
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN4,
|
||||
"NVIDIA nForce MCP65 Networking Adapter"},
|
||||
{0, 0, NULL}
|
||||
};
|
||||
|
||||
|
@ -31,23 +31,41 @@
|
||||
#ifndef _IF_NVEREG_H_
|
||||
#define _IF_NVEREG_H_
|
||||
|
||||
#ifndef NVIDIA_VENDORID
|
||||
#define NVIDIA_VENDORID 0x10DE
|
||||
#ifndef PCI_VENDOR_NVIDIA
|
||||
#define PCI_VENDOR_NVIDIA 0x10DE
|
||||
#endif
|
||||
|
||||
#define NFORCE_MCPNET1_DEVICEID 0x01C3
|
||||
#define NFORCE_MCPNET2_DEVICEID 0x0066
|
||||
#define NFORCE_MCPNET3_DEVICEID 0x00D6
|
||||
#define NFORCE_MCPNET4_DEVICEID 0x0086
|
||||
#define NFORCE_MCPNET5_DEVICEID 0x008C
|
||||
#define NFORCE_MCPNET6_DEVICEID 0x00E6
|
||||
#define NFORCE_MCPNET7_DEVICEID 0x00DF
|
||||
#define NFORCE_MCPNET8_DEVICEID 0x0056
|
||||
#define NFORCE_MCPNET9_DEVICEID 0x0057
|
||||
#define NFORCE_MCPNET10_DEVICEID 0x0037
|
||||
#define NFORCE_MCPNET11_DEVICEID 0x0038
|
||||
#define NFORCE_MCPNET12_DEVICEID 0x0268
|
||||
#define NFORCE_MCPNET13_DEVICEID 0x0269
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE_LAN 0x01C3
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00D6
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 0x0086
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 0x008C
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN 0x00E6
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00DF
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 0x0056
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 0x0057
|
||||
#define PCI_PRODUCT_NVIDIA_MCP04_LAN1 0x0037
|
||||
#define PCI_PRODUCT_NVIDIA_MCP04_LAN2 0x0038
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 0x0268
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 0x0269
|
||||
#define PCI_PRODUCT_NVIDIA_MCP55_LAN1 0x0372
|
||||
#define PCI_PRODUCT_NVIDIA_MCP55_LAN2 0x0373
|
||||
#define PCI_PRODUCT_NVIDIA_MCP61_LAN1 0x03e5
|
||||
#define PCI_PRODUCT_NVIDIA_MCP61_LAN2 0x03e6
|
||||
#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee
|
||||
#define PCI_PRODUCT_NVIDIA_MCP61_LAN4 0x03ef
|
||||
#define PCI_PRODUCT_NVIDIA_MCP65_LAN1 0x0450
|
||||
#define PCI_PRODUCT_NVIDIA_MCP65_LAN2 0x0451
|
||||
#define PCI_PRODUCT_NVIDIA_MCP65_LAN3 0x0452
|
||||
#define PCI_PRODUCT_NVIDIA_MCP65_LAN4 0x0453
|
||||
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2
|
||||
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN
|
||||
#define PCI_PRODUCT_NVIDIA_CK804_LAN1 PCI_PRODUCT_NVIDIA_NFORCE4_LAN1
|
||||
#define PCI_PRODUCT_NVIDIA_CK804_LAN2 PCI_PRODUCT_NVIDIA_NFORCE4_LAN2
|
||||
#define PCI_PRODUCT_NVIDIA_MCP51_LAN1 PCI_PRODUCT_NVIDIA_NFORCE430_LAN1
|
||||
#define PCI_PRODUCT_NVIDIA_MCP51_LAN2 PCI_PRODUCT_NVIDIA_NFORCE430_LAN2
|
||||
|
||||
#define NV_RID 0x10
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user