PERFORCE change 36995 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue Aug 26 16:51:18 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36995
Change 36995 by marcel at marcel_nfs on 2003/08/26 16:51:09
IFC @36992
Affected files ...
.. //depot/projects/ia64/Makefile.inc1#78 integrate
.. //depot/projects/ia64/contrib/top/top.X#3 integrate
.. //depot/projects/ia64/games/fortune/datfiles/startrek#5 integrate
.. //depot/projects/ia64/lib/libc/rpc/publickey.5#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/ep.4#3 integrate
.. //depot/projects/ia64/share/man/man4/man4.i386/fe.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ti.4#6 integrate
.. //depot/projects/ia64/share/man/man7/development.7#5 integrate
.. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#11 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#8 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#10 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#9 integrate
.. //depot/projects/ia64/sys/alpha/alpha/machdep.c#36 integrate
.. //depot/projects/ia64/sys/alpha/conf/NOTES#6 integrate
.. //depot/projects/ia64/sys/boot/common/bcache.c#4 integrate
.. //depot/projects/ia64/sys/boot/common/boot.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/commands.c#4 integrate
.. //depot/projects/ia64/sys/boot/common/console.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/dev_net.c#3 integrate
.. //depot/projects/ia64/sys/boot/common/devopen.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/interp.c#3 integrate
.. //depot/projects/ia64/sys/boot/common/interp_backslash.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/interp_forth.c#5 integrate
.. //depot/projects/ia64/sys/boot/common/interp_parse.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/isapnp.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/load.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/load_elf.c#13 integrate
.. //depot/projects/ia64/sys/boot/common/load_elf32.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/load_elf64.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/ls.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/misc.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/module.c#5 integrate
.. //depot/projects/ia64/sys/boot/common/panic.c#3 integrate
.. //depot/projects/ia64/sys/boot/common/pnp.c#2 integrate
.. //depot/projects/ia64/sys/boot/common/ufsread.c#7 integrate
.. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#17 integrate
.. //depot/projects/ia64/sys/boot/i386/kgzldr/boot.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/kgzldr/lib.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#6 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/bioscd.c#5 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biosdisk.c#7 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biosmem.c#3 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biospci.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biospnp.c#5 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#7 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo32.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/comconsole.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/devicename.c#3 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/gatea20.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/i386_copy.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#7 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/nullconsole.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/pread.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/pxe.c#3 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/time.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/libi386/vidconsole.c#2 integrate
.. //depot/projects/ia64/sys/boot/i386/loader/conf.c#7 integrate
.. //depot/projects/ia64/sys/boot/i386/loader/main.c#5 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#51 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#36 integrate
.. //depot/projects/ia64/sys/conf/options.alpha#10 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#39 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.h#15 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-card.c#14 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#7 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#23 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-disk.c#26 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-dma.c#28 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-isa.c#13 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.c#32 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#26 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#17 integrate
.. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#16 integrate
.. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#13 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt.c#13 integrate
.. //depot/projects/ia64/sys/dev/isp/isp.c#19 integrate
.. //depot/projects/ia64/sys/dev/pccard/pccard.c#23 integrate
.. //depot/projects/ia64/sys/dev/sio/sio.c#48 integrate
.. //depot/projects/ia64/sys/dev/sio/sio_isa.c#17 integrate
.. //depot/projects/ia64/sys/dev/sio/sio_pccard.c#11 integrate
.. //depot/projects/ia64/sys/dev/sio/siovar.h#15 edit
.. //depot/projects/ia64/sys/dev/syscons/scgfbrndr.c#5 integrate
.. //depot/projects/ia64/sys/dev/syscons/syscons.c#22 integrate
.. //depot/projects/ia64/sys/dev/usb/ucom.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/ufm.c#11 integrate
.. //depot/projects/ia64/sys/dev/usb/ugen.c#17 integrate
.. //depot/projects/ia64/sys/dev/usb/uhid.c#15 integrate
.. //depot/projects/ia64/sys/dev/usb/ulpt.c#14 integrate
.. //depot/projects/ia64/sys/dev/usb/ums.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/urio.c#15 integrate
.. //depot/projects/ia64/sys/dev/usb/usb.c#16 integrate
.. //depot/projects/ia64/sys/dev/usb/uscanner.c#14 integrate
.. //depot/projects/ia64/sys/gnu/ext2fs/ext2_bitops.h#1 branch
.. //depot/projects/ia64/sys/gnu/ext2fs/ext2_linux_balloc.c#5 integrate
.. //depot/projects/ia64/sys/gnu/ext2fs/ext2_linux_ialloc.c#4 integrate
.. //depot/projects/ia64/sys/gnu/ext2fs/ia64-bitops.h#2 delete
.. //depot/projects/ia64/sys/i386/i386/atomic.c#3 integrate
.. //depot/projects/ia64/sys/i386/i386/bios.c#16 integrate
.. //depot/projects/ia64/sys/i386/i386/db_disasm.c#5 integrate
.. //depot/projects/ia64/sys/i386/i386/db_interface.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/db_trace.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/dump_machdep.c#6 integrate
.. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/i386-gdbstub.c#7 integrate
.. //depot/projects/ia64/sys/i386/i386/i686_mem.c#9 integrate
.. //depot/projects/ia64/sys/i386/i386/identcpu.c#25 integrate
.. //depot/projects/ia64/sys/i386/i386/initcpu.c#13 integrate
.. //depot/projects/ia64/sys/i386/i386/k6_mem.c#4 integrate
.. //depot/projects/ia64/sys/i386/i386/legacy.c#5 integrate
.. //depot/projects/ia64/sys/i386/i386/mp_clock.c#8 integrate
.. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#28 integrate
.. //depot/projects/ia64/sys/i386/i386/mpapic.c#11 integrate
.. //depot/projects/ia64/sys/i386/i386/nexus.c#8 integrate
.. //depot/projects/ia64/sys/i386/i386/perfmon.c#10 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#60 integrate
.. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#22 integrate
.. //depot/projects/ia64/sys/i386/i386/tsc.c#8 integrate
.. //depot/projects/ia64/sys/i386/i386/vm86.c#12 integrate
.. //depot/projects/ia64/sys/i386/isa/bs/bshw_dma.c#3 integrate
.. //depot/projects/ia64/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/ia64/sys/kern/kern_mac.c#31 integrate
.. //depot/projects/ia64/sys/kern/kern_thread.c#67 integrate
.. //depot/projects/ia64/sys/kern/sched_ule.c#24 integrate
.. //depot/projects/ia64/sys/netinet/raw_ip.c#26 integrate
.. //depot/projects/ia64/sys/pc98/pc98/syscons.c#19 delete
.. //depot/projects/ia64/sys/pci/if_dc.c#46 integrate
.. //depot/projects/ia64/sys/pci/meteor.c#12 integrate
.. //depot/projects/ia64/sys/vm/vm_page.h#23 integrate
.. //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#11 integrate
Differences ...
==== //depot/projects/ia64/Makefile.inc1#78 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.383 2003/08/17 07:50:15 gordon Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.385 2003/08/25 18:30:06 imp Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -123,8 +123,12 @@
MAKEOBJDIRPREFIX?= /usr/obj
.if !defined(OSRELDATE)
+.if exists(/usr/include/osreldate.h)
OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
/usr/include/osreldate.h
+.else
+OSRELDATE!= sysctl -n kern.osreldate
+.endif
.endif
TARGET_ARCH?= ${MACHINE_ARCH}
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
@@ -387,7 +391,7 @@
.if ${TARGET_ARCH} == ${MACHINE_ARCH} && !defined(DISTDIR) && \
(!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/")
@echo "Checking to see if your booted kernel is fresh enough.."
- ${.OBJDIR}/bin/sh/sh -c \
+ @${.OBJDIR}/bin/sh/sh -c \
'echo "Testing installed kernel for new sigaction(2) syscall"'
@echo "Seems ok.."
.endif
==== //depot/projects/ia64/contrib/top/top.X#3 (text+ko) ====
@@ -1,6 +1,6 @@
.\" NOTE: changes to the manual page for "top" should be made in the
.\" file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.8 2002/01/24 17:54:04 dwmalone Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.9 2003/08/26 15:37:19 eivind Exp $
.nr N %topn%
.nr D %delay%
.TH TOP 1 Local
@@ -315,7 +315,7 @@
.br
/etc/passwd used to map uid numbers to user names
.br
-/kernel system image
+/boot/kernel/kernel system image
.SH BUGS
Don't shoot me, but the default for
.B \-I
==== //depot/projects/ia64/games/fortune/datfiles/startrek#5 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.4 2003/07/13 03:49:43 kris Exp $
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.5 2003/08/25 20:08:16 ceri Exp $
A father doesn't destroy his children.
-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
stardate 3468.1.
@@ -490,7 +490,7 @@
deeply -- life in every form from fetus to developed being.
-- Hodin of Gideon, "The Mark of Gideon", stardate 5423.4
%
-... The prejudices people feel about each other disappear when then get
+... The prejudices people feel about each other disappear when they get
to know each other.
-- Kirk, "Elaan of Troyius", stardate 4372.5
%
==== //depot/projects/ia64/lib/libc/rpc/publickey.5#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/lib/libc/rpc/publickey.5,v 1.6 2001/01/17 18:26:21 ru Exp $
+.\" $FreeBSD: src/lib/libc/rpc/publickey.5,v 1.7 2003/08/26 15:52:47 eivind Exp $
.\" @(#)publickey.5 2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
.Dd October 19, 1987
.Dt PUBLICKEY 5
@@ -11,7 +11,7 @@
.Sh DESCRIPTION
.Pa /etc/publickey
is the public key database used for secure
-networking.
+RPC (Remote Procedure Calls).
Each entry in
the database consists of a network user
name (which may either refer to
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#65 (text+ko) ====
@@ -8,10 +8,8 @@
(i.e. Ethernet interfaces), list broad groups of devices
alphabetically as paragraphs sorted alphabetically (frequently
these groups will be arranged by manufacturer, i.e. 3Com
- Ethernet interfaces). In cases where a group of devices
- consists of multiple models (such as the 3C501, 3C503, etc.),
- list each specific model or set of closely-related models as
- a separate item in an itemized list, sorted alphabetically.
+ Ethernet interfaces).
+
Where applicable, a "Miscellaneous" section may follow all
other named sections.
@@ -31,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.174 2003/08/22 17:36:14 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.177 2003/08/25 04:31:26 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -779,77 +777,8 @@
</itemizedlist>
</para>
- <para arch="i386,pc98">Allied-Telesis AT1700 and RE2000 cards
- (&man.fe.4; driver)
- <itemizedlist>
- <listitem>
- <para>CONTEC C-NET(PC)C PCMCIA Ethernet</para>
- </listitem>
- <listitem>
- <para>Fujitsu MBH10303, MBH10302 Ethernet PCMCIA</para>
- </listitem>
- <listitem>
- <para>Fujitsu Towa LA501 Ethernet</para>
- </listitem>
- <listitem>
- <para>Fujitsu FMV-J182, FMV-J182A</para>
- </listitem>
- <listitem>
- <para>RATOC REX-5588, REX-9822, REX-4886, and REX-R280</para>
- </listitem>
- <listitem>
- <para>Eiger Labs EPX-10BT</para>
- </listitem>
- <listitem>
- <para>HITACHI HT-4840-11</para>
- </listitem>
- <listitem>
- <para>NextCom J Link NC5310</para>
- </listitem>
- <listitem>
- <para>TDK LAK-CD021, LAK-CD021A, LAK-CD021BX</para>
- </listitem>
- </itemizedlist>
- </para>
-
<para arch="i386,pc98">Alteon Networks PCI Gigabit Ethernet NICs based on the Tigon
- 1 and Tigon 2 chipsets (&man.ti.4; driver)
- <itemizedlist>
- <listitem>
- <para>3Com 3c985-SX (Tigon 1 and 2)</para>
- </listitem>
- <listitem>
- <para>Alteon AceNIC (Tigon 1 and 2)</para>
- </listitem>
- <listitem>
- <para>Alteon AceNIC 1000baseT (Tigon 2)</para>
- </listitem>
- <listitem>
- <para>Asante PCI 1000BASE-SX Gigabit Ethernet Adapter</para>
- </listitem>
- <listitem>
- <para>Asante GigaNIX1000T Gigabit Ethernet Adapter</para>
- </listitem>
- <listitem>
- <para>DEC/Compaq EtherWORKS 1000</para>
- </listitem>
- <listitem>
- <para>Farallon PN9000SX</para>
- </listitem>
- <listitem>
- <para>NEC Gigabit Ethernet</para>
- </listitem>
- <listitem>
- <para>Netgear GA620 (Tigon 2)</para>
- </listitem>
- <listitem>
- <para>Netgear GA620T (Tigon 2, 1000baseT)</para>
- </listitem>
- <listitem>
- <para>Silicon Graphics Gigabit Ethernet</para>
- </listitem>
- </itemizedlist>
- </para>
+ 1 and Tigon 2 chipsets (&man.ti.4; driver)</para>
<para arch="i386,pc98,alpha">AMD PCnet NICs (&man.lnc.4; and &man.pcn.4; drivers)
<itemizedlist>
@@ -1607,53 +1536,7 @@
<para arch="pc98">MELCO LGY-PCI-TXL (PCI) (&man.dc.4; driver)</para>
<para arch="i386,pc98">Fujitsu MB86960A/MB86965A based Fast Ethernet NICs
- (&man.fe.4; driver)
- <itemizedlist>
- <listitem arch="i386">
- <para>CONTEC C-NET(PC)C Ethernet</para>
- </listitem>
- <listitem arch="i386">
- <para>Eiger Labs EPX-10BT</para>
- </listitem>
- <listitem arch="i386">
- <para>Fujitsu FMV-J182, FMV-J182A, MBH10302, MBH10303
- Ethernet PCMCIA</para>
- </listitem>
- <listitem arch="i386">
- <para>Fujitsu Towa LA501 Ethernet</para>
- </listitem>
- <listitem arch="i386">
- <para>HITACHI HT-4840-11</para>
- </listitem>
- <listitem arch="i386">
- <para>NextCom J Link NC5310</para>
- </listitem>
- <listitem arch="i386">
- <para>RATOC REX-5588, REX-9822, REX-4886, REX-R280</para>
- </listitem>
- <listitem arch="i386">
- <para>TDK LAK-CD021, LAK-CD021A, LAK-CD021BX</para>
- </listitem>
- <listitem arch="pc98">
- <para>Allied Telesis RE1000, RE1000Plus, ME1500 (110pin)</para>
- </listitem>
- <listitem arch="pc98">
- <para>Contec C-NET(98)P2, C-NET(9N)E (110pin),
- C-NET(9N)C(ExtCard)</para>
- </listitem>
- <listitem arch="pc98">
- <para>Ungermann-Bass Access/PC N98C+(PC85152,PC85142),
- Access/NOTE N98 (PC86132) (110pin)</para>
- </listitem>
- <listitem arch="pc98">
- <para>TDK LAC-98012, LAC-98013, LAC-98025, LAC-9N011
- (110pin)</para>
- </listitem>
- <listitem arch="pc98">
- <para>Ratoc REX-9880/9881/9882/9883</para>
- </listitem>
- </itemizedlist>
- </para>
+ (&man.fe.4; driver)</para>
<para arch="i386,pc98,alpha,ia64,sparc64">Intel 82557-, 82258-, 82559-, 82550-
or 82562-based Fast Ethernet NICs (&man.fxp.4; driver)
@@ -1723,38 +1606,7 @@
</itemizedlist>
</para>
- <para arch="i386,pc98">3Com 3C5x9 Etherlink III NICs (&man.ep.4; driver)
- <itemizedlist>
- <listitem arch="i386">
- <para>3C509</para>
- </listitem>
- <listitem arch="i386">
- <para>3C529 MCA</para>
- </listitem>
- <listitem arch="i386">
- <para>3C579 EISA</para>
- </listitem>
- <listitem arch="i386">
- <para>3CXE589EC, 3CXE589ET PCMCIA</para>
- </listitem>
- <listitem arch="i386">
- <para>3C589/589B/589C/589D/589E/574TX/574B
- PC-card/PCMCIA</para>
- </listitem>
- <listitem arch="i386">
- <para>Megahertz 3CCFEM556BI, 3CXEM556, 3CCFEM556B</para>
- </listitem>
- <listitem arch="i386">
- <para>OfficeConnect 3CXSH572BT</para>
- </listitem>
- <listitem arch="i386">
- <para>Farallon EtherMac</para>
- </listitem>
- <listitem arch="pc98">
- <para>3Com 3C569, 3C569-TPO, 3C569B, 3C569B-COMBO</para>
- </listitem>
- </itemizedlist>
- </para>
+ <para arch="i386,pc98">3Com 3C5x9 Etherlink III NICs (&man.ep.4; driver)</para>
<para arch="i386">3Com 3C501 8-bit ISA Ethernet NIC
(&man.el.4; driver)</para>
==== //depot/projects/ia64/share/man/man4/man4.i386/ep.4#3 (text+ko) ====
@@ -27,7 +27,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/share/man/man4/man4.i386/ep.4,v 1.23 2003/08/21 15:40:05 simon Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/ep.4,v 1.24 2003/08/24 22:51:09 bmah Exp $
.\"
.Dd February 4, 1993
.Dt EP 4 i386
@@ -53,6 +53,8 @@
.It
3CXE589EC, 3CXE589ET PCMCIA
.It
+3C569, 3C569-TPO, 3C569B, 3C569B-COMBO
+.It
3C589/589B/589C/589D/589E/574TX/574B PC Card/PCMCIA
.It
Megahertz 3CCFEM556BI, 3CXEM556, 3CCFEM556B
==== //depot/projects/ia64/share/man/man4/man4.i386/fe.4#3 (text+ko) ====
@@ -21,7 +21,7 @@
.\" Contributed by M. Sekiguchi <seki at sysrap.cs.fujitsu.co.jp>.
.\" for fe driver.
.\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.24 2003/08/21 15:18:21 simon Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/fe.4,v 1.26 2003/08/24 22:39:18 bmah Exp $
.Dd March 3, 1996
.Dt FE 4 i386
.Os
@@ -45,23 +45,34 @@
.Pp
.Bl -bullet -compact
.It
+Allied Telesis RE1000, RE1000Plus, ME1500 (110-pin)
+.It
+CONTEC C-NET(98)P2, C-NET (9N)E (110-pin), C-NET(9N)C (ExtCard)
+.It
CONTEC C-NET(PC)C PCMCIA Ethernet
.It
+Eiger Labs EPX-10BT
+.It
+Fujitsu FMV-J182, FMV-J182A
+.It
Fujitsu MBH10303, MBH10302 Ethernet PCMCIA
.It
Fujitsu Towa LA501 Ethernet
.It
-Fujitsu FMV-J182, FMV-J182A
+HITACHI HT-4840-11
+.It
+NextCom J Link NC5310
.It
RATOC REX-5588, REX-9822, REX-4886, and REX-R280
.It
-Eiger Labs EPX-10BT
+RATOC REX-9880/9881/9882/9883
.It
-HITACHI HT-4840-11
+TDK LAC-98012, LAC-98013, LAC-98025, LAC-9N011 (110-pin)
.It
-NextCom J Link NC5310
+TDK LAK-CD021, LAK-CD021A, LAK-CD021BX
.It
-TDK LAK-CD021, LAK-CD021A, LAK-CD021BX
+Ungermann-Bass Access/PC N98C+(PC85152, PC85142), Access/NOTE
+N98(PC86132) (110-pin)
.El
.Pp
The driver provides automatic I/O port address configuration and
==== //depot/projects/ia64/share/man/man4/ti.4#6 (text+ko) ====
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ti.4,v 1.22 2003/06/28 23:53:37 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ti.4,v 1.25 2003/08/25 04:29:43 bmah Exp $
.\"
.Dd June 26, 2002
.Dt TI 4
@@ -69,32 +69,34 @@
.Pp
.Bl -bullet -compact -offset indent
.It
-The Alteon AceNIC V gigabit ethernet adapter (1000baseSX)
+3Com 3c985-SX Gigabit Ethernet adapter (Tigon 1)
.It
-The Alteon AceNIC V gigabit ethernet adapter (1000baseT)
+3Com 3c985B-SX Gigabit Ethernet adapter (Tigon 2)
.It
-The 3Com 3c985-SX gigabit ethernet adapter (Tigon 1)
+Alteon AceNIC V Gigabit Ethernet adapter (1000baseSX)
.It
-The 3Com 3c985B-SX gigabit ethernet adapter (Tigon 2)
+Alteon AceNIC V Gigabit Ethernet adapter (1000baseT)
.It
-The Netgear GA620 gigabit ethernet adapter (1000baseSX)
+Netgear GA620 Gigabit Ethernet adapter (1000baseSX)
.It
-The Netgear GA620T gigabit ethernet adapter (1000baseT)
+Netgear GA620T Gigabit Ethernet adapter (1000baseT)
.El
.Pp
The following should also be supported but have not yet been tested:
.Pp
.Bl -bullet -compact -offset indent
.It
-The Digital EtherWORKS 1000SX PCI Gigabit Adapter
+Asante GigaNIX1000T Gigabit Ethernet adapter
+.It
+Asante PCI 1000BASE-SX Gigabit Ethernet adapter
.It
-Silicon Graphics PCI gigabit ethernet adapter
+Digital EtherWORKS 1000SX PCI Gigabit adapter
.It
Farallon PN9000SX Gigabit Ethernet adapter
.It
-Asante PCI 1000BASE-SX Gigabit Ethernet Adapter
+NEC Gigabit Ethernet
.It
-Asante GigaNIX1000T Gigabit Ethernet Adapter
+Silicon Graphics PCI Gigabit Ethernet adapter
.El
.Pp
While the Tigon chipset supports 10, 100 and 1000Mbps speeds, support for
==== //depot/projects/ia64/share/man/man7/development.7#5 (text+ko) ====
@@ -2,7 +2,7 @@
.\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in
.\" the FreeBSD source tree.
.\"
-.\" $FreeBSD: src/share/man/man7/development.7,v 1.8 2003/08/22 17:12:55 njl Exp $
+.\" $FreeBSD: src/share/man/man7/development.7,v 1.9 2003/08/25 19:08:37 njl Exp $
.\"
.Dd December 21, 2002
.Dt DEVELOPMENT 7
@@ -380,6 +380,13 @@
.Fx
tree is based on CVS, the former is convenient.
.Pp
+First, you need to modify your cvsup environment to avoid it modifying
+the local changes you have committed to the repository.
+It is important to remove the "delete" keyword from your supfile and to
+add the CVSROOT subdirectory to your refuse file.
+For more information, see
+.Xr cvsup 1 .
+.Pp
The
.Fx
version of CVS examines a custom environmental variable,
@@ -400,6 +407,23 @@
new tag and begin making changes and committing them.
For more information on using cvs, see
.Xr cvs 1 .
+.Pp
+.Sy WARNING!
+The cvsup utility may blow away changes made on a local branch in
+some situations.
+This has been reported to occur when the master CVS repository is
+directly manipulated or an RCS file is changed.
+At this point, cvsup notices that the client and server have entirely
+different RCS files, so it does a full replace instead of trying to
+send just deltas.
+Ideally this situation should never arise, but in the real world it
+happens all the time.
+.Pp
+While this is the only scenario where the problem should crop up,
+there have been some suspicious-sounding reports of
+CVS_LOCAL_BRANCH_NUM lossage that can't be explained by this alone.
+Bottom line is, if you value your local branch then you
+should back it up before every update.
.Sh UPDATING VIA CVS
The advantage of using cvsup to maintain an updated copy of the CVS
repository instead of using it to maintain source trees directly is that you
==== //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -49,18 +49,21 @@
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
+#ifndef NO_SIO
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
static int comcnrate = CONSPEED;
+extern int comconsole;
+extern int siocnattach(int, int);
+extern int siogdbattach(int, int);
+#endif
+
+extern int sccnattach(void);
void api_up1000_init(void);
static void api_up1000_cons_init(void);
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-extern int sccnattach(void);
-
void
api_up1000_init()
{
@@ -75,38 +78,38 @@
platform.cons_init = api_up1000_cons_init;
}
-extern int comconsole;
-
static void
api_up1000_cons_init()
{
struct ctb *ctb;
irongate_init();
+
+#ifndef NO_SIO
#ifdef DDB
siogdbattach(0x2f8, 57600);
#endif
+#endif
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
- case 2:
+ case 2:
+#ifndef NO_SIO
/* serial console ... */
- /* XXX */
- {
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10))
- */
- DELAY(160000000 / comcnrate);
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
+ /*
+ * Delay to allow PROM putchars to complete.
+ * FIFO depth * character time,
+ * character time = (1000000 / (defaultrate / 10))
+ */
+ DELAY(160000000 / comcnrate);
+ comconsole = 0;
+ if (siocnattach(0x3f8, comcnrate))
+ panic("can't init serial console");
- boothowto |= RB_SERIAL;
- break;
- }
+ boothowto |= RB_SERIAL;
+#endif
+ break;
case 3:
/* display console ... */
==== //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#9 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -94,15 +94,21 @@
#include <dev/pci/pcivar.h>
+#ifndef NO_SIO
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
static int comcnrate = CONSPEED;
+extern int comconsole;
+extern int siocnattach(int, int);
+extern int siogdbattach(int, int);
+#endif
+extern int sccnattach(void);
+
void dec_1000a_init(int);
static void dec_1000a_cons_init(void);
-
static void dec_1000_intr_map(void *);
static void dec_1000_intr_disable(int);
static void dec_1000_intr_enable(int);
@@ -113,11 +119,6 @@
static void dec_1000a_intr_enable(int);
static void dec_1000a_intr_init(void);
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-extern int sccnattach(void);
-
-
static const struct alpha_variation_table dec_1000_variations[] = {
{ 0, "AlphaServer 1000" },
{ 0, NULL },
@@ -172,8 +173,6 @@
}
-/* XXX for forcing comconsole when srm serial console is used */
-extern int comconsole;
static void
dec_1000a_cons_init()
@@ -186,35 +185,36 @@
apecs_init();
}
+#ifndef NO_SIO
#ifdef DDB
siogdbattach(0x2f8, 57600);
#endif
+#endif
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
+#ifndef NO_SIO
/* serial console ... */
- /* XXX */
- {
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10)).
- */
- DELAY(160000000 / comcnrate);
+ /*
+ * Delay to allow PROM putchars to complete.
+ * FIFO depth * character time,
+ * character time = (1000000 / (defaultrate / 10)).
+ */
+ DELAY(160000000 / comcnrate);
- /*
- * Force a comconsole on com1 if the SRM has a serial
- * console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
+ /*
+ * Force a comconsole on com1 if the SRM has a serial
+ * console.
+ */
+ comconsole = 0;
+ if (siocnattach(0x3f8, comcnrate))
+ panic("can't init serial console");
- boothowto |= RB_SERIAL;
- break;
- }
+ boothowto |= RB_SERIAL;
+#endif
+ break;
case 3:
/* display console ... */
==== //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#10 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.17 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.18 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -54,21 +54,21 @@
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
+#ifndef NO_SIO
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
static int comcnrate = CONSPEED;
+extern int comconsole;
+extern int siocnattach(int, int);
+extern int siogdbattach(int, int);
+#endif
+extern int sccnattach(void);
+
void dec_2100_a50_init(void);
static void dec_2100_a50_cons_init(void);
static void dec_2100_a50_intr_map(void *);
-void sio_intr_establish(int);
-void sio_intr_disestablish(int);
-void sio_intr_setup(void);
-
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-extern int sccnattach(void);
const struct alpha_variation_table dec_2100_a50_variations[] = {
{ SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" },
@@ -103,9 +103,6 @@
platform.pci_intr_map = dec_2100_a50_intr_map;
}
-/* XXX for forcing comconsole when srm serial console is used */
-extern int comconsole;
-
static void
dec_2100_a50_cons_init()
{
@@ -113,32 +110,34 @@
apecs_init();
+#ifndef NO_SIO
#ifdef DDB
siogdbattach(0x2f8, 9600);
#endif
+#endif
+
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
+#ifndef NO_SIO
/* serial console ... */
- /* XXX */
- {
- /*
- * Delay to allow PROM putchars to complete.
- * FIFO depth * character time,
- * character time = (1000000 / (defaultrate / 10)).
- */
- DELAY(160000000 / comcnrate);
- /*
- * Force a comconsole on com1 if the SRM has a serial console.
- */
- comconsole = 0;
- if (siocnattach(0x3f8, comcnrate))
- panic("can't init serial console");
+ /*
+ * Delay to allow PROM putchars to complete.
+ * FIFO depth * character time,
+ * character time = (1000000 / (defaultrate / 10)).
+ */
+ DELAY(160000000 / comcnrate);
+ /*
+ * Force a comconsole on com1 if the SRM has a serial console.
+ */
+ comconsole = 0;
+ if (siocnattach(0x3f8, comcnrate))
+ panic("can't init serial console");
- boothowto |= RB_SERIAL;
- break;
- }
+ boothowto |= RB_SERIAL;
+#endif
+ break;
case 3:
/* display console ... */
==== //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
@@ -47,19 +47,22 @@
#include <alpha/pci/t2var.h>
#include <alpha/pci/t2reg.h>
+#ifndef NO_SIO
#ifndef CONSPEED
#define CONSPEED TTYDEF_SPEED
#endif
static int comcnrate = CONSPEED;
+extern int comconsole;
+extern int siocnattach(int, int);
+extern int siogdbattach(int, int);
+#endif
+
+extern int sccnattach(void);
void dec_2100_a500_init(int);
static void dec_2100_a500_cons_init(void);
static void dec_2100_a500_intr_init(void);
-extern int siocnattach(int, int);
-extern int siogdbattach(int, int);
-extern int sccnattach(void);
-
void
dec_2100_a500_init(int cputype)
{
@@ -91,8 +94,6 @@
t2_init();
}
-/* XXX for forcing comconsole when srm serial console is used */
-extern int comconsole;
static void
dec_2100_a500_cons_init()
@@ -100,15 +101,18 @@
struct ctb *ctb;
t2_init();
+#ifndef NO_SIO
#ifdef DDB
siogdbattach(0x2f8, 9600);
#endif
+#endif
+
ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case 2:
+#ifndef NO_SIO
/* serial console ... */
- /* XXX */
/*
* Delay to allow PROM putchars to complete.
* FIFO depth * character time,
@@ -123,6 +127,7 @@
panic("can't init serial console");
boothowto |= RB_SERIAL;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list