PERFORCE change 86071 for review
Robert Watson
rwatson at FreeBSD.org
Sun Oct 30 07:34:04 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=86071
Change 86071 by rwatson at rwatson_zoo on 2005/10/30 15:33:59
Integrate netsmp branch.
Affected files ...
.. //depot/projects/netsmp/src/sys/amd64/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/netsmp/src/sys/boot/forth/beastie.4th#2 integrate
.. //depot/projects/netsmp/src/sys/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/boot/i386/loader/loader.rc#1 branch
.. //depot/projects/netsmp/src/sys/conf/Makefile.alpha#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.amd64#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.ia64#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.pc98#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#2 integrate
.. //depot/projects/netsmp/src/sys/conf/files#11 integrate
.. //depot/projects/netsmp/src/sys/conf/files.i386#5 integrate
.. //depot/projects/netsmp/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/netsmp/src/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/netsmp/src/sys/conf/kmod.mk#4 integrate
.. //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/cardbus/cardbusvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_ed_pccard.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/en/midway.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/isp/isp_ioctl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/pci/pci.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/txp/if_txpreg.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_ebus.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/uart/uart_bus_pccard.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/netsmp/src/sys/i386/isa/pcf.c#2 delete
.. //depot/projects/netsmp/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_time.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/syscalls.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/netsmp/src/sys/kern/tty.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#16 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_aio.c#4 integrate
.. //depot/projects/netsmp/src/sys/modules/Makefile#6 integrate
.. //depot/projects/netsmp/src/sys/modules/i2c/controllers/pcf/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_bridge.h#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_ksocket.h#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_parse.h#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_pppoe.h#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_vlan.h#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/in.c#10 integrate
.. //depot/projects/netsmp/src/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/netsmp/src/sys/pc98/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_vr.c#8 integrate
.. //depot/projects/netsmp/src/sys/pci/if_vrreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/pci/if_wb.c#9 integrate
.. //depot/projects/netsmp/src/sys/pci/if_wbreg.h#3 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/netsmp/src/sys/sys/aio.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/signal.h#4 integrate
.. //depot/projects/netsmp/src/sys/sys/signalvar.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/syscall.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/syscall.mk#3 integrate
.. //depot/projects/netsmp/src/sys/sys/sysproto.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/timers.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/unistd.h#3 integrate
.. //depot/projects/netsmp/src/tools/regression/aio/kqueue/lio/Makefile#2 integrate
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command1.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command2.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command3.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command3.0.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command4.127#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command5.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command5.0.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command6.127#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/command6.127.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/regress.sh#3 integrate
.. //depot/projects/netsmp/src/tools/regression/geom_gpt/gctl.t#1 branch
.. //depot/projects/netsmp/src/tools/regression/geom_gpt/test.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/geom_uzip/Makefile#2 integrate
.. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.img.gz.uue#2 delete
.. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.img.uzip.uue#1 branch
.. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-1.sh#2 integrate
.. //depot/projects/netsmp/src/tools/regression/geom_uzip/test-2.sh#2 integrate
.. //depot/projects/netsmp/src/tools/regression/lib/libutil/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch
.. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/lib/libutil/test-trimdomain.t#1 branch
.. //depot/projects/netsmp/src/tools/regression/ufs/uprintf/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/ufs/uprintf/ufs_uprintf.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/Makefile#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.2#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.3#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.4#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.status.5#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.3#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.4#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stderr.5#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.3#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.4#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/expected.stdout.5#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/enl/test.t#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.status.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.status.2#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stderr.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stderr.2#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stdout.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/expected.stdout.2#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/make/syntax/semi/test.t#1 branch
Differences ...
==== //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#4 (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.442 2005/09/08 03:29:18 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.444 2005/10/27 18:54:43 peter Exp $
machine amd64
cpu HAMMER
@@ -76,15 +76,11 @@
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
-# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
-device atpic # 8259A compatability
-
# Linux 32-bit ABI support
options LINPROCFS # Cannot be a module yet.
-# Bus support. Do not remove isa, even if you have no isa slots
+# Bus support.
device acpi
-device isa
device pci
# Floppy drives
@@ -234,8 +230,6 @@
# Pseudo devices.
device loop # Network loopback
-device mem # Memory and kernel memory devices
-device io # I/O device
device random # Entropy device
device ether # Ethernet support
device sl # Kernel SLIP
==== //depot/projects/netsmp/src/sys/boot/forth/beastie.4th#2 (text+ko) ====
@@ -23,7 +23,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.10 2004/12/01 07:17:57 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.11 2005/10/30 05:36:23 scottl Exp $
marker task-beastie.4th
@@ -50,7 +50,7 @@
46 constant dot
\ The BSD Daemon. He is 19 rows high and 34 columns wide
-: technicolor-beastie ( x y -- )
+: beastie-logo ( x y -- )
2dup at-xy ." [1;31m, ," 1+
2dup at-xy ." /( )`" 1+
2dup at-xy ." \ \___ / |" 1+
@@ -72,7 +72,7 @@
at-xy ." `--{__________) [0m"
;
-: boring-beastie ( x y -- )
+: beastiebw-logo ( x y -- )
2dup at-xy ." , ," 1+
2dup at-xy ." /( )`" 1+
2dup at-xy ." \ \___ / |" 1+
@@ -94,18 +94,51 @@
at-xy ." `--{__________)"
;
-: print-beastie ( x y -- )
- s" loader_color" getenv
+: fbsdbw-logo ( x y -- )
+ 2dup at-xy ." ______" 1+
+ 2dup at-xy ." | ____| __ ___ ___ " 1+
+ 2dup at-xy ." | |__ | '__/ _ \/ _ \" 1+
+ 2dup at-xy ." | __|| | | __/ __/" 1+
+ 2dup at-xy ." | | | | | | |" 1+
+ 2dup at-xy ." |_| |_| \___|\___|" 1+
+ 2dup at-xy ." ____ _____ _____" 1+
+ 2dup at-xy ." | _ \ / ____| __ \" 1+
+ 2dup at-xy ." | |_) | (___ | | | |" 1+
+ 2dup at-xy ." | _ < \___ \| | | |" 1+
+ 2dup at-xy ." | |_) |____) | |__| |" 1+
+ 2dup at-xy ." | | | |" 1+
+ at-xy ." |____/|_____/|_____/"
+;
+
+: print-logo ( x y -- )
+ s" loader_logo" getenv
dup -1 = if
drop
- boring-beastie
+ fbsdbw-logo
+ exit
+ then
+ 2dup s" fbsdbw" compare-insensitive 0= if
+ 2drop
+ fbsdbw-logo
+ exit
+ then
+ 2dup s" beastiebw" compare-insensitive 0= if
+ 2drop
+ beastiebw-logo
+ exit
+ then
+ 2dup s" beastie" compare-insensitive 0= if
+ 2drop
+ beastie-logo
exit
then
- s" YES" compare-insensitive 0<> if
- boring-beastie
+ 2dup s" none" compare-insensitive 0= if
+ 2drop
+ \ no logo
exit
then
- technicolor-beastie
+ 2drop
+ fbsdbw-logo
;
: acpienabled? ( -- flag )
@@ -144,7 +177,7 @@
8 menuY !
5 menuX !
clear
- 46 4 print-beastie
+ 46 4 print-logo
42 20 2 2 box
13 6 at-xy ." Welcome to FreeBSD!"
printmenuitem ." Boot FreeBSD [default]" bootkey !
==== //depot/projects/netsmp/src/sys/boot/i386/loader/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.81 2005/06/01 15:32:57 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.82 2005/10/30 05:41:42 scottl Exp $
PROG= loader.sym
INTERNALPROG=
@@ -73,7 +73,7 @@
.PATH: ${.CURDIR}/../../forth
FILES= loader loader.help loader.4th support.4th loader.conf
-FILES+= screen.4th frames.4th
+FILES+= screen.4th frames.4th beastie.4th
# XXX INSTALLFLAGS_loader= -b
FILESMODE_loader= ${BINMODE} -b
FILESDIR_loader.conf= /boot/defaults
==== //depot/projects/netsmp/src/sys/conf/Makefile.alpha#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.135 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.136 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/netsmp/src/sys/conf/Makefile.amd64#3 (text+ko) ====
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.17 2005/09/07 17:38:46 obrien Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.18 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
STD8X16FONT?= iso
==== //depot/projects/netsmp/src/sys/conf/Makefile.arm#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.13 2005/10/17 18:31:37 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.14 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
# Temporary stuff while we're still embryonic
NO_MODULES=
==== //depot/projects/netsmp/src/sys/conf/Makefile.i386#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.265 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.266 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
STD8X16FONT?= iso
==== //depot/projects/netsmp/src/sys/conf/Makefile.ia64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.ia64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.62 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.63 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
STD8X16FONT?= iso
==== //depot/projects/netsmp/src/sys/conf/Makefile.pc98#2 (text+ko) ====
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.167 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.168 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.powerpc -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.278 2005/09/07 17:38:46 obrien Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.279 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
STD8X16FONT?= iso
==== //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.33 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.34 2005/10/27 19:27:54 jhb Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600002
+%VERSREQ= 600003
STD8X16FONT?= iso
==== //depot/projects/netsmp/src/sys/conf/files#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1060 2005/10/23 00:22:02 njl Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1061 2005/10/28 15:58:17 joerg Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -763,6 +763,7 @@
dev/pccbb/pccbb.c optional cbb
dev/pccbb/pccbb_isa.c optional cbb isa
dev/pccbb/pccbb_pci.c optional cbb pci
+dev/pcf/pcf.c optional pcf
dev/pci/eisa_pci.c optional pci eisa
dev/pci/fixup_pci.c optional pci
dev/pci/ignore_pci.c optional pci
==== //depot/projects/netsmp/src/sys/conf/files.i386#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.541 2005/09/17 03:36:46 anholt Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.542 2005/10/28 15:58:18 joerg Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -199,6 +199,7 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nve/if_nve.c optional nve pci
+dev/pcf/pcf_isa.c optional pcf
dev/ppc/ppc.c optional ppc
dev/ppc/ppc_puc.c optional ppc puc pci
dev/random/nehemiah.c optional random
@@ -325,7 +326,6 @@
i386/isa/isa_dma.c optional isa
i386/isa/nmi.c standard
i386/isa/npx.c optional npx
-i386/isa/pcf.c optional pcf
i386/isa/pcvt/pcvt_drv.c optional vt
i386/isa/pcvt/pcvt_ext.c optional vt
i386/isa/pcvt/pcvt_kbd.c optional vt
==== //depot/projects/netsmp/src/sys/conf/files.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.73 2005/06/12 00:47:21 marcel Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.74 2005/10/28 15:58:18 joerg Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -46,6 +46,8 @@
dev/ofw/openfirm.c standard
dev/ofw/openfirmio.c standard
dev/ofw/openpromio.c standard
+dev/pcf/envctrl.c optional pcf
+dev/pcf/pcf_ebus.c optional pcf ebus
dev/sound/sbus/cs4231.c optional snd_audiocs ebus
dev/sound/sbus/cs4231.c optional snd_audiocs sbus
dev/syscons/scgfbrndr.c optional sc
==== //depot/projects/netsmp/src/sys/conf/kern.post.mk#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.86 2005/10/25 09:05:07 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.89 2005/10/27 17:39:03 ru Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -29,11 +29,7 @@
# Handle out of tree ports
.if !defined(NO_MODULES) && defined(PORTS_MODULES)
-.for _dir in ${.CURDIR}/../../..
-.if !defined(SYSDIR) && exists(${_dir}/kern/)
-SYSDIR= ${_dir}
-.endif
-.endfor
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
PORTSMODULESENV=SYSDIR=${SYSDIR}
.for __target in all install reinstall clean
${__target}: ports-${__target}
@@ -67,8 +63,11 @@
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL_KO}.debug
-${KERNEL_KO}: ${FULLKERNEL}
- ${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
+${KERNEL_KO}: ${FULLKERNEL} ${KERNEL_KO}.symbols
+ ${OBJCOPY} --strip-debug --add-gnu-debuglink=${KERNEL_KO}.symbols\
+ ${FULLKERNEL} ${.TARGET}
+${KERNEL_KO}.symbols: ${FULLKERNEL}
+ ${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET}
install.debug reinstall.debug: gdbinit
cd ${.CURDIR}; ${MAKE} ${.TARGET:R}
@@ -109,7 +108,8 @@
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
- ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \
+ ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \
+ linterrs makelinks tags vers.c \
vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
${CLEAN}
@@ -186,7 +186,7 @@
.endif
kernel-install:
- @if [ ! -f ${FULLKERNEL} ] ; then \
+ @if [ ! -f ${KERNEL_KO} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
@@ -205,18 +205,16 @@
fi
.endif
mkdir -p ${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO}
-.else
- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}/${KERNEL_KO}
-.else
- ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
config.o env.o hints.o vers.o vnode_if.o:
==== //depot/projects/netsmp/src/sys/conf/kmod.mk#4 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.197 2005/10/25 09:05:07 ru Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.199 2005/10/27 17:39:03 ru Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -143,8 +143,11 @@
FULLPROG= ${PROG}
.else
FULLPROG= ${PROG}.debug
-${PROG}: ${FULLPROG}
- ${OBJCOPY} --strip-debug ${FULLPROG} ${PROG}
+${PROG}: ${FULLPROG} ${PROG}.symbols
+ ${OBJCOPY} --strip-debug --add-gnu-debuglink=${PROG}.symbols\
+ ${FULLPROG} ${.TARGET}
+${PROG}.symbols: ${FULLPROG}
+ ${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET}
.endif
.if ${MACHINE_ARCH} != amd64
@@ -226,7 +229,7 @@
CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS}
.if defined(DEBUG_FLAGS)
-CLEANFILES+= ${FULLPROG}
+CLEANFILES+= ${FULLPROG} ${PROG}.symbols
.endif
.if !target(install)
@@ -240,12 +243,11 @@
realinstall: _kmodinstall
.ORDER: beforeinstall _kmodinstall
_kmodinstall:
+ ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG)
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/${PROG}
-.else
- ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
+ ${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
.endif
.include <bsd.links.mk>
==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.257 2005/09/14 12:45:06 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.258 2005/10/27 16:32:39 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -533,12 +533,7 @@
struct ata_channel *ch;
int ctlr;
- /* release the hook that got us here, only needed during boot */
- if (ata_delayed_attach) {
- config_intrhook_disestablish(ata_delayed_attach);
- free(ata_delayed_attach, M_TEMP);
- ata_delayed_attach = NULL;
- }
+ mtx_lock(&Giant); /* newbus suckage it needs Giant */
/* kick of probe and attach on all channels */
for (ctlr = 0; ctlr < devclass_get_maxunit(ata_devclass); ctlr++) {
@@ -546,6 +541,15 @@
ata_identify(ch->dev);
}
}
+
+ /* release the hook that got us here, we are only needed once during boot */
+ if (ata_delayed_attach) {
+ config_intrhook_disestablish(ata_delayed_attach);
+ ata_delayed_attach = NULL;
+ free(ata_delayed_attach, M_TEMP);
+ }
+
+ mtx_unlock(&Giant); /* newbus suckage dealt with, release Giant */
}
==== //depot/projects/netsmp/src/sys/dev/ata/atapi-cd.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.182 2005/10/10 19:13:27 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.183 2005/10/28 21:41:42 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -337,9 +337,11 @@
bcopy(&cdp->toc, toc, sizeof(struct toc));
entry = toc->tab + (toc->hdr.ending_track + 1 -
toc->hdr.starting_track) + 1;
- while (--entry >= toc->tab)
+ while (--entry >= toc->tab) {
lba2msf(ntohl(entry->addr.lba), &entry->addr.msf.minute,
&entry->addr.msf.second, &entry->addr.msf.frame);
+ entry->addr_type = CD_MSF_FORMAT;
+ }
}
error = copyout(toc->tab + starting_track - toc->hdr.starting_track,
te->data, len);
@@ -940,17 +942,17 @@
int8_t ccb[16];
int track, ntracks, len;
- if (acd_test_ready(dev))
- return;
-
if (!(atadev->flags & ATA_D_MEDIA_CHANGED))
return;
atadev->flags &= ~ATA_D_MEDIA_CHANGED;
bzero(&cdp->toc, sizeof(cdp->toc));
- bzero(ccb, sizeof(ccb));
cdp->disk_size = -1; /* hack for GEOM SOS */
+ if (acd_test_ready(dev))
+ return;
+
+ bzero(ccb, sizeof(ccb));
len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);
ccb[0] = ATAPI_READ_TOC;
ccb[7] = len>>8;
==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.53 2005/09/27 13:33:46 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.54 2005/10/28 06:03:53 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,8 +112,8 @@
return;
}
- if (reg == CARDBUS_ROM_REG)
- testval = CARDBUS_ROM_ADDRMASK;
+ if (reg == PCIR_BIOS)
+ testval = PCIM_BIOS_ADDR_MASK;
else
testval = ~0;
@@ -435,50 +435,48 @@
device_t child;
int cardattached = 0;
int bus, slot, func;
+ int cardbusfunchigh = 0;
cardbus_detach_card(cbdev); /* detach existing cards */
POWER_ENABLE_SOCKET(brdev, cbdev);
bus = pcib_get_bus(cbdev);
+ slot = 0;
/* For each function, set it up and try to attach a driver to it */
- for (slot = 0; slot <= CARDBUS_SLOTMAX; slot++) {
- int cardbusfunchigh = 0;
- for (func = 0; func <= cardbusfunchigh; func++) {
- struct cardbus_devinfo *dinfo;
+ for (func = 0; func <= cardbusfunchigh; func++) {
+ struct cardbus_devinfo *dinfo;
- dinfo = (struct cardbus_devinfo *)
- pci_read_device(brdev, bus, slot, func,
- sizeof(struct cardbus_devinfo));
- if (dinfo == NULL)
- continue;
- if (dinfo->pci.cfg.mfdev)
- cardbusfunchigh = CARDBUS_FUNCMAX;
+ dinfo = (struct cardbus_devinfo *)
+ pci_read_device(brdev, bus, slot, func,
+ sizeof(struct cardbus_devinfo));
+ if (dinfo == NULL)
+ continue;
+ if (dinfo->pci.cfg.mfdev)
+ cardbusfunchigh = PCI_FUNCMAX;
- cardbus_device_setup_regs(brdev, bus, slot, func,
- &dinfo->pci.cfg);
- child = device_add_child(cbdev, NULL, -1);
- if (child == NULL) {
- DEVPRINTF((cbdev, "Cannot add child!\n"));
- pci_freecfg((struct pci_devinfo *)dinfo);
- continue;
- }
- dinfo->pci.cfg.dev = child;
- resource_list_init(&dinfo->pci.resources);
- device_set_ivars(child, dinfo);
- if (cardbus_do_cis(cbdev, child) != 0) {
- DEVPRINTF((cbdev, "Can't parse cis\n"));
- pci_freecfg((struct pci_devinfo *)dinfo);
- continue;
- }
- cardbus_pickup_maps(cbdev, child);
- cardbus_alloc_resources(cbdev, child);
- pci_print_verbose(&dinfo->pci);
- if (device_probe_and_attach(child) != 0)
- cardbus_release_all_resources(cbdev, dinfo);
- else
- cardattached++;
+ cardbus_device_setup_regs(brdev, bus, slot, func,
+ &dinfo->pci.cfg);
+ child = device_add_child(cbdev, NULL, -1);
+ if (child == NULL) {
+ DEVPRINTF((cbdev, "Cannot add child!\n"));
+ pci_freecfg((struct pci_devinfo *)dinfo);
+ continue;
+ }
+ dinfo->pci.cfg.dev = child;
+ resource_list_init(&dinfo->pci.resources);
+ device_set_ivars(child, dinfo);
+ if (cardbus_do_cis(cbdev, child) != 0) {
+ DEVPRINTF((cbdev, "Can't parse cis\n"));
+ pci_freecfg((struct pci_devinfo *)dinfo);
+ continue;
}
+ cardbus_pickup_maps(cbdev, child);
+ cardbus_alloc_resources(cbdev, child);
+ pci_print_verbose(&dinfo->pci);
+ if (device_probe_and_attach(child) != 0)
+ cardbus_release_all_resources(cbdev, dinfo);
+ else
+ cardattached++;
}
-
if (cardattached > 0)
return (0);
POWER_DISABLE_SOCKET(brdev, cbdev);
==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_cis.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.50 2005/02/20 20:36:16 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.52 2005/10/28 05:55:52 imp Exp $");
/*
* CIS Handling for the Cardbus Bus
@@ -325,7 +325,7 @@
}
/* Convert from BAR type to BAR offset */
- bar = CARDBUS_BASE0_REG + (bar - 1) * 4;
+ bar = PCIR_BAR(bar - 1);
if (type == SYS_RES_MEMORY) {
if (reg & TPL_BAR_REG_PREFETCHABLE)
@@ -491,32 +491,27 @@
uint32_t testval;
uint32_t size;
struct resource *res;
+ uint32_t space;
- switch (CARDBUS_CIS_SPACE(*start)) {
- case CARDBUS_CIS_ASI_TUPLE:
+ space = *start & PCIM_CIS_ASI_MASK;
+ switch (space) {
+ case PCIM_CIS_ASI_TUPLE:
/* CIS in PCI config space need no initialization */
return ((struct resource*)~0UL);
- case CARDBUS_CIS_ASI_BAR0:
- case CARDBUS_CIS_ASI_BAR1:
- case CARDBUS_CIS_ASI_BAR2:
- case CARDBUS_CIS_ASI_BAR3:
- case CARDBUS_CIS_ASI_BAR4:
- case CARDBUS_CIS_ASI_BAR5:
- *rid = CARDBUS_BASE0_REG + (CARDBUS_CIS_SPACE(*start) - 1) * 4;
+ case PCIM_CIS_ASI_BAR0:
+ case PCIM_CIS_ASI_BAR1:
+ case PCIM_CIS_ASI_BAR2:
+ case PCIM_CIS_ASI_BAR3:
+ case PCIM_CIS_ASI_BAR4:
+ case PCIM_CIS_ASI_BAR5:
+ *rid = PCIR_BAR(space - PCIM_CIS_ASI_BAR0);
break;
- case CARDBUS_CIS_ASI_ROM:
- *rid = CARDBUS_ROM_REG;
-#if 0
- /*
- * This mask doesn't contain the bit that actually enables
- * the Option ROM.
- */
- pci_write_config(child, *rid, CARDBUS_ROM_ADDRMASK, 4);
-#endif
+ case PCIM_CIS_ASI_ROM:
+ *rid = PCIR_BIOS;
break;
default:
device_printf(cbdev, "Unable to read CIS: Unknown space: %d\n",
- CARDBUS_CIS_SPACE(*start));
+ space);
return (NULL);
}
@@ -528,7 +523,7 @@
* This bit has a different meaning depending if we are dealing
* with a normal BAR or an Option ROM BAR.
*/
- if (((testval & 0x1) == 0x1) && (*rid != CARDBUS_ROM_REG)) {
+ if (((testval & 0x1) == 0x1) && (*rid != PCIR_BIOS)) {
device_printf(cbdev, "CIS Space is IO, expecting memory.\n");
return (NULL);
}
@@ -546,13 +541,12 @@
return (NULL);
}
pci_write_config(child, *rid,
- rman_get_start(res) | ((*rid == CARDBUS_ROM_REG)?
- CARDBUS_ROM_ENABLE : 0),
+ rman_get_start(res) | ((*rid == PCIR_BIOS) ? PCIM_BIOS_ENABLE : 0),
4);
PCI_ENABLE_IO(cbdev, child, SYS_RES_MEMORY);
/* Flip to the right ROM image if CIS is in ROM */
- if (CARDBUS_CIS_SPACE(*start) == CARDBUS_CIS_ASI_ROM) {
+ if (space == PCIM_CIS_ASI_ROM) {
bus_space_tag_t bt;
bus_space_handle_t bh;
uint32_t imagesize;
@@ -565,7 +559,7 @@
bt = rman_get_bustag(res);
bh = rman_get_bushandle(res);
- imagenum = CARDBUS_CIS_ASI_ROM_IMAGE(*start);
+ imagenum = (*start & PCIM_CIS_ROM_MASK) >> 28;
for (romnum = 0;; romnum++) {
romsig = bus_space_read_2(bt, bh,
imagebase + CARDBUS_EXROM_SIGNATURE);
@@ -617,9 +611,9 @@
}
imagebase += imagesize;
}
- *start = imagebase + CARDBUS_CIS_ADDR(*start);
+ *start = imagebase + (*start & PCIM_CIS_ADDR_MASK);
} else {
- *start = CARDBUS_CIS_ADDR(*start);
+ *start = *start & PCIM_CIS_ADDR_MASK;
}
return (res);
@@ -658,7 +652,7 @@
bzero(tupledata, MAXTUPLESIZE);
expect_linktarget = TRUE;
- if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0) {
+ if ((start = pci_read_config(child, PCIR_CIS, 4)) == 0) {
device_printf(cbdev, "CIS pointer is 0!\n");
return (ENXIO);
}
==== //depot/projects/netsmp/src/sys/dev/cardbus/cardbusreg.h#2 (text+ko) ====
@@ -23,40 +23,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.8 2005/01/13 19:12:10 imp Exp $
+ * $FreeBSD: src/sys/dev/cardbus/cardbusreg.h,v 1.11 2005/10/28 06:03:53 imp Exp $
*/
/*
* Register definitions for the Cardbus Bus
*/
-
-/* Cardbus bus constants */
-#define CARDBUS_SLOTMAX 0
-#define CARDBUS_FUNCMAX 7
-
-/* Cardbus configuration header registers */
-#define CARDBUS_BASE0_REG 0x10
-#define CARDBUS_BASE1_REG 0x14
-#define CARDBUS_BASE2_REG 0x18
-#define CARDBUS_BASE3_REG 0x1C
-#define CARDBUS_BASE4_REG 0x20
-#define CARDBUS_BASE5_REG 0x24
-#define CARDBUS_CIS_REG 0x28
-# define CARDBUS_CIS_ASIMASK 0x07
-# define CARDBUS_CIS_ADDRMASK 0x0ffffff8
-# define CARDBUS_CIS_ASI_TUPLE 0x00
-# define CARDBUS_CIS_ASI_BAR0 0x01
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list