PERFORCE change 61319 for review
Julian Elischer
julian at FreeBSD.org
Fri Sep 10 14:41:30 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=61319
Change 61319 by julian at julian_ref on 2004/09/10 21:40:41
IFC at 61307
Affected files ...
.. //depot/projects/nsched/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/nsched/sys/conf/files#24 integrate
.. //depot/projects/nsched/sys/dev/mii/ciphy.c#1 branch
.. //depot/projects/nsched/sys/dev/mii/ciphyreg.h#1 branch
.. //depot/projects/nsched/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/nsched/sys/dev/vge/if_vge.c#1 branch
.. //depot/projects/nsched/sys/dev/vge/if_vgereg.h#1 branch
.. //depot/projects/nsched/sys/dev/vge/if_vgevar.h#1 branch
.. //depot/projects/nsched/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/nsched/sys/kern/kern_switch.c#14 integrate
.. //depot/projects/nsched/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/nsched/sys/kern/sched_4bsd.c#44 integrate
.. //depot/projects/nsched/sys/kern/sched_ule.c#27 integrate
.. //depot/projects/nsched/sys/modules/Makefile#12 integrate
.. //depot/projects/nsched/sys/modules/vge/Makefile#1 branch
.. //depot/projects/nsched/sys/pc98/conf/GENERIC#9 integrate
.. //depot/projects/nsched/sys/sys/conf.h#7 integrate
.. //depot/projects/nsched/sys/sys/sched.h#16 integrate
Differences ...
==== //depot/projects/nsched/sys/amd64/conf/GENERIC#10 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.423 2004/09/07 22:37:43 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.424 2004/09/10 20:57:46 wpaul Exp $
machine amd64
cpu HAMMER
@@ -184,6 +184,8 @@
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+device lge # Level 1 LXT1001 gigabit ethernet
+device nge # NatSemi DP83820 gigabit ethernet
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -194,6 +196,7 @@
device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
+device vge # VIA VT612x gigabit ethernet
device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
==== //depot/projects/nsched/sys/conf/files#24 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.951 2004/09/05 09:43:47 des Exp $
+# $FreeBSD: src/sys/conf/files,v 1.952 2004/09/10 20:57:45 wpaul Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -549,6 +549,7 @@
dev/mii/amphy.c optional miibus
dev/mii/bmtphy.c optional miibus
dev/mii/brgphy.c optional miibus
+dev/mii/ciphy.c optional miibus
dev/mii/dcphy.c optional miibus pci
dev/mii/e1000phy.c optional miibus
dev/mii/exphy.c optional miibus
@@ -842,6 +843,7 @@
dev/vinum/vinumrevive.c optional vinum
dev/vinum/vinumstate.c optional vinum
dev/vinum/vinumutil.c optional vinum
+dev/vge/if_vge.c optional vge
dev/vx/if_vx.c optional vx
dev/vx/if_vx_eisa.c optional vx eisa
dev/vx/if_vx_pci.c optional vx pci
==== //depot/projects/nsched/sys/dev/mii/miidevs#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/mii/miidevs,v 1.27 2003/09/20 10:53:08 wilko Exp $
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.28 2004/09/10 20:57:45 wpaul Exp $
/*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
/*-
@@ -52,6 +52,7 @@
oui ALTIMA 0x0010a9 Altima Communications
oui AMD 0x00001a Advanced Micro Devices
oui BROADCOM 0x001018 Broadcom Corporation
+oui CICADA 0x0003F1 Cicada Semiconductor
oui DAVICOM 0x00606e Davicom Semiconductor
oui ICS 0x00a0be Integrated Circuit Systems
oui INTEL 0x00aa00 Intel
@@ -121,6 +122,11 @@
model xxBROADCOM BCM5704 0x0019 BCM5704 10/100/1000baseTX PHY
model xxBROADCOM BCM5705 0x001a BCM5705 10/100/1000baseTX PHY
+/* Cicada Semiconductor PHYs (now owned by Vitesse?) */
+model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY
+model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY
+model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY
+
/* Davicom Semiconductor PHYs */
model xxDAVICOM DM9101 0x0000 DM9101 10/100 media interface
==== //depot/projects/nsched/sys/i386/conf/GENERIC#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.416 2004/09/07 22:44:55 scottl Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.417 2004/09/10 20:57:46 wpaul Exp $
machine i386
cpu I486_CPU
@@ -203,6 +203,8 @@
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+device lge # Level 1 LXT1001 gigabit ethernet
+device nge # NatSemi DP83820 gigabit ethernet
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -213,6 +215,7 @@
device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
+device vge # VIA VT612x gigabit ethernet
device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
==== //depot/projects/nsched/sys/kern/kern_switch.c#14 (text+ko) ====
@@ -86,7 +86,7 @@
***/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.88 2004/09/07 06:38:22 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.89 2004/09/10 21:04:38 julian Exp $");
#include "opt_sched.h"
==== //depot/projects/nsched/sys/kern/kern_synch.c#13 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.259 2004/09/05 02:09:53 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.260 2004/09/10 21:04:38 julian Exp $");
#include "opt_ktrace.h"
==== //depot/projects/nsched/sys/kern/sched_4bsd.c#44 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.60 2004/09/06 07:23:14 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.61 2004/09/10 21:04:38 julian Exp $");
#define kse td_sched
@@ -764,7 +764,6 @@
if ((p->p_flag & P_NOLOAD) == 0)
sched_tdcnt--;
-
/*
* We are volunteering to switch out so we get to nominate
* a successor for the rest of our quantum
==== //depot/projects/nsched/sys/kern/sched_ule.c#27 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.125 2004/09/05 02:09:53 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.126 2004/09/10 21:04:38 julian Exp $");
#include <opt_sched.h>
==== //depot/projects/nsched/sys/modules/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.399 2004/09/05 09:43:47 des Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.400 2004/09/10 20:57:45 wpaul Exp $
# pcic -- currently broken and being worked on out of tree.
# oldcard -- specialized use for debugging only.
@@ -240,6 +240,7 @@
uvisor \
uvscom \
${_vesa} \
+ vge \
vinum \
vpo \
vr \
==== //depot/projects/nsched/sys/pc98/conf/GENERIC#9 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.258 2004/09/07 22:37:43 scottl Exp $
+# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.259 2004/09/10 20:57:46 wpaul Exp $
machine pc98
#cpu I386_CPU # Do not enable with other cpu types
@@ -186,6 +186,8 @@
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
+device lge # Level 1 LXT1001 gigabit ethernet
+device nge # NatSemi DP83820 gigabit ethernet
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -196,6 +198,7 @@
device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
+device vge # VIA VT612x gigabit ethernet
device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
==== //depot/projects/nsched/sys/sys/conf.h#7 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/conf.h,v 1.190 2004/07/11 23:03:37 phk Exp $
+ * $FreeBSD: src/sys/sys/conf.h,v 1.191 2004/09/10 20:49:30 phk Exp $
*/
#ifndef _SYS_CONF_H_
@@ -153,6 +153,9 @@
typedef int d_mmap_t(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr,
int nprot);
+typedef int d_spare1_t(struct cdev *dev);
+typedef int d_spare2_t(struct cdev *dev);
+
typedef int dumper_t(
void *priv, /* Private to the driver. */
void *virtual, /* Virtual (mapped) address. */
@@ -216,6 +219,8 @@
d_strategy_t *d_strategy;
dumper_t *d_dump;
d_kqfilter_t *d_kqfilter;
+ d_spare1_t *d_spare1;
+ d_spare2_t *d_spare2;
/* These fields should not be messed with by drivers */
LIST_ENTRY(cdevsw) d_list;
==== //depot/projects/nsched/sys/sys/sched.h#16 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/sched.h,v 1.16 2004/09/05 02:09:54 julian Exp $
+ * $FreeBSD: src/sys/sys/sched.h,v 1.17 2004/09/10 21:04:37 julian Exp $
*/
#ifndef _SYS_SCHED_H_
More information about the p4-projects
mailing list