From 1beaab1960301007add5198696d5d7d15e941278 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 9 Jan 2006 12:44:15 +0000 Subject: Binary driver for nVidia ethernet --- sysutils/nvnet/DESCR | 2 ++ sysutils/nvnet/MESSAGE | 14 ++++++++++++++ sysutils/nvnet/Makefile | 42 +++++++++++++++++++++++++++++++++++++++++ sysutils/nvnet/PLIST | 3 +++ sysutils/nvnet/distinfo | 13 +++++++++++++ sysutils/nvnet/patches/patch-aa | 14 ++++++++++++++ sysutils/nvnet/patches/patch-ab | 11 +++++++++++ sysutils/nvnet/patches/patch-ac | 13 +++++++++++++ sysutils/nvnet/patches/patch-ad | 27 ++++++++++++++++++++++++++ sysutils/nvnet/patches/patch-ae | 31 ++++++++++++++++++++++++++++++ 10 files changed, 170 insertions(+) create mode 100644 sysutils/nvnet/DESCR create mode 100644 sysutils/nvnet/MESSAGE create mode 100644 sysutils/nvnet/Makefile create mode 100644 sysutils/nvnet/PLIST create mode 100644 sysutils/nvnet/distinfo create mode 100644 sysutils/nvnet/patches/patch-aa create mode 100644 sysutils/nvnet/patches/patch-ab create mode 100644 sysutils/nvnet/patches/patch-ac create mode 100644 sysutils/nvnet/patches/patch-ad create mode 100644 sysutils/nvnet/patches/patch-ae diff --git a/sysutils/nvnet/DESCR b/sysutils/nvnet/DESCR new file mode 100644 index 00000000000..31c2ee87188 --- /dev/null +++ b/sysutils/nvnet/DESCR @@ -0,0 +1,2 @@ +This is a wrapper for the nVidia network controller binary driver from +nVidia. diff --git a/sysutils/nvnet/MESSAGE b/sysutils/nvnet/MESSAGE new file mode 100644 index 00000000000..d26f9a5eeff --- /dev/null +++ b/sysutils/nvnet/MESSAGE @@ -0,0 +1,14 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ + +The module can be loaded manually by typing +modload ${PREFIX}/lkm/nv.o + +In order to load it automatically at boot time, +- Add to your /etc/rc.conf file: +lkm=YES + +- Add to your /etc/lkm.conf: +${PREFIX}/lkm/nv.o - - - - BEFORENET + +=========================================================================== diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile new file mode 100644 index 00000000000..8d8cbc45cd3 --- /dev/null +++ b/sysutils/nvnet/Makefile @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +# + +PKGNAME= nvnet-20050620nb1 +DISTNAME= nvnet-netbsd-src-20050620.tgz +DISTNAME+= NFORCE-Linux-x86-1.0-0310-pkg1.run +CATEGORIES= sysutils +MASTER_SITES+= http://www.morgart.com/NetBSD/nVidia/nvnet/ +MASTER_SITES+= http://download.nvidia.com/XFree86/nforce/1.0-0310/ + +EXTRACT_SUFX= + +MAINTAINER= manu@NetBSD.org +HOMEPAGE= http://www.morgart.com/NetBSD/nVidia/nvnet/ +COMMENT= Driver for nVidia ethernet + +LICENSE= nvidia-license + +RESTRICTED= "nVidia Licensed Software: http://www.nvidia.com/object/nv_swlicense.html" +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} + + +WRKSRC= ${WRKDIR}/nvnet + +ONLY_FOR_PLATFORM= NetBSD-*-i386 + +INSTALLATION_DIRS= lkm man/man4 + +MESSAGE_SUBST+= PREFIX=${PREFIX:Q} + +do-extract: + ${TAR} -xzf ${DISTDIR}/nvnet-netbsd-src-20050620.tgz -C ${WRKDIR} + cd ${WRKDIR} && ${SH} ${DISTDIR}/NFORCE-Linux-x86-1.0-0310-pkg1.run -x + +do-install: + ${INSTALL} -c -m 755 ${WRKSRC}/module/nv.o ${PREFIX}/lkm/nv.o + ${INSTALL_MAN} ${WRKSRC}/man/nv.4 ${PREFIX}/man/man4/nv.4 + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/nvnet/PLIST b/sysutils/nvnet/PLIST new file mode 100644 index 00000000000..084a8cb90b2 --- /dev/null +++ b/sysutils/nvnet/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +lkm/nv.o +man/man4/nv.4 diff --git a/sysutils/nvnet/distinfo b/sysutils/nvnet/distinfo new file mode 100644 index 00000000000..2fefcdc9769 --- /dev/null +++ b/sysutils/nvnet/distinfo @@ -0,0 +1,13 @@ +$NetBSD: distinfo,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ + +SHA1 (nvnet-netbsd-src-20050620.tgz) = d5299c739fa94c6030349119648be4fd96c818cb +RMD160 (nvnet-netbsd-src-20050620.tgz) = fbcdd95f9acfe273cff5d7a799813af88d95a14d +Size (nvnet-netbsd-src-20050620.tgz) = 24995 bytes +SHA1 (NFORCE-Linux-x86-1.0-0310-pkg1.run) = d99f0f7f3a100833a8f1f81073c4edc35b9c400e +RMD160 (NFORCE-Linux-x86-1.0-0310-pkg1.run) = 9fc1a7503876ba5a90fb062ec17c9411d7841fcb +Size (NFORCE-Linux-x86-1.0-0310-pkg1.run) = 6031508 bytes +SHA1 (patch-aa) = 0a4df7a2f84347cc14eb2ccda649b9685e8f7d03 +SHA1 (patch-ab) = e926aebb2a7307b9eeebfdcd4034ec95a514708c +SHA1 (patch-ac) = 8a79c254d1145aaa5c628170ce61a5826d0c239a +SHA1 (patch-ad) = 60ebc00fc100f0a1a6615b4af9aa7bed5c3d2fb4 +SHA1 (patch-ae) = 5d1111d465f9949f4410d724c073d534c260bcf7 diff --git a/sysutils/nvnet/patches/patch-aa b/sysutils/nvnet/patches/patch-aa new file mode 100644 index 00000000000..a008ccf4371 --- /dev/null +++ b/sysutils/nvnet/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +--- Makefile.orig 2005-06-21 02:18:41.000000000 +0000 ++++ Makefile 2006-01-05 11:25:04.000000000 +0000 +@@ -3,9 +3,9 @@ + # doc directory is not being made ... + + .include + +-NFORCE=../nforce ++NFORCE=../NFORCE-Linux-x86-1.0-0310-pkg1 + + .if ${OSTYPE} == "NetBSD" + .if ${OSVERSION} < 299000000 + diff --git a/sysutils/nvnet/patches/patch-ab b/sysutils/nvnet/patches/patch-ab new file mode 100644 index 00000000000..507a0a16d9b --- /dev/null +++ b/sysutils/nvnet/patches/patch-ab @@ -0,0 +1,11 @@ +$NetBSD: patch-ab,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +--- module/Makefile.orig 2005-06-21 02:18:41.000000000 +0000 ++++ module/Makefile 2006-01-05 11:25:11.000000000 +0000 +@@ -1,6 +1,6 @@ + +-NFORCE=../nforce ++NFORCE=../NFORCE-Linux-x86-1.0-0310-pkg1 + NV_ROOT= ${.CURDIR}/.. + NVIDIA_ROOT= ${.CURDIR}/../${NFORCE} + NVOBJ= ${NVIDIA_ROOT}/nvnet/nvenetlib.o + CFLAGS+= -I${NVIDIA_ROOT}/nvnet diff --git a/sysutils/nvnet/patches/patch-ac b/sysutils/nvnet/patches/patch-ac new file mode 100644 index 00000000000..fa4e643f72a --- /dev/null +++ b/sysutils/nvnet/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +--- module/nvnet.h.orig 2005-06-21 02:25:21.000000000 +0000 ++++ module/nvnet.h 2002-01-04 21:10:44.000000000 +0000 +@@ -45,8 +45,9 @@ + #define NFORCE_MCPNET8_DEVICEID 0x0056 + #define NFORCE_MCPNET9_DEVICEID 0x0057 + #define NFORCE_MCPNET10_DEVICEID 0x0037 + #define NFORCE_MCPNET11_DEVICEID 0x0038 ++#define NFORCE_MCPNET51_DEVICEID 0x0269 + + #define NV_RID 0x10 + + #define TX_RING_SIZE 64 diff --git a/sysutils/nvnet/patches/patch-ad b/sysutils/nvnet/patches/patch-ad new file mode 100644 index 00000000000..2da25c22e00 --- /dev/null +++ b/sysutils/nvnet/patches/patch-ad @@ -0,0 +1,27 @@ +$NetBSD: patch-ad,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +--- module/nvnet_drv.c.orig 2005-06-21 02:18:41.000000000 +0000 ++++ module/nvnet_drv.c 2006-01-05 13:07:32.000000000 +0000 +@@ -153,8 +153,12 @@ + NFORCE_MCPNET11_DEVICEID, + "NVIDIA nForce MCP11 Networking Adapter" + }, + { ++ NFORCE_MCPNET51_DEVICEID, ++ "NVIDIA nForce MCP51 Networking Adapter" ++ }, ++ { + 0, NULL + } + }; + /* if_media interface */ +@@ -685,9 +690,9 @@ + sc->tx_errors++; + return; + } + /* Set watchdog timer. */ +- ifp->if_timer = 8; ++ ifp->if_timer = 64; + + /* Copy packet to BPF tap */ + BPF_MTAP(ifp, m0); + } diff --git a/sysutils/nvnet/patches/patch-ae b/sysutils/nvnet/patches/patch-ae new file mode 100644 index 00000000000..05cef48a430 --- /dev/null +++ b/sysutils/nvnet/patches/patch-ae @@ -0,0 +1,31 @@ +$NetBSD: patch-ae,v 1.1.1.1 2006/01/09 12:44:15 manu Exp $ +--- module/nvnet_lkm.c.orig 2005-06-21 02:18:41.000000000 +0000 ++++ module/nvnet_lkm.c 2006-01-04 14:17:00.000000000 +0000 +@@ -7,9 +7,15 @@ + #include + #include + + /* autoconf(9) structures */ +-static const char *const nv_attrs[] = {"mii", NULL}; ++static const struct cfiattrdata miicf_iattrdata = { ++ "mii", 1, ++ { ++ {"phy", "-1", -1}, ++ } ++}; ++static const struct cfiattrdata * const nv_attrs[] = { &miicf_iattrdata, NULL }; + CFDRIVER_DECL(nv, DV_IFNET, nv_attrs); + extern struct cfattach nv_ca; + + +@@ -18,9 +24,9 @@ + "pci", "pci", DVUNIT_ANY + }; + + static struct cfdata nv_cfdata[] = { +- {"nv", "nv", 0, FSTATE_STAR, pciloc, 0, &pciparent, 0}, ++ {"nv", "nv", 0, FSTATE_STAR, pciloc, 0, &pciparent}, + {0} + }; + + static struct cfdriver *nv_cfdrivers[] = { -- cgit v1.2.3