Date: Fri, 12 Sep 2003 15:39:25 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 37976 for review Message-ID: <200309122239.h8CMdPXa008660@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=37976 Change 37976 by marcel@marcel_nfs on 2003/09/12 15:38:37 IFC @37975 Affected files ... .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#11 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/ia64/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#122 integrate .. //depot/projects/ia64/release/i386/drivers.conf#22 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/ia64/share/examples/cvsup/gnats-supfile#3 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#5 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#6 integrate .. //depot/projects/ia64/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/ia64/share/man/man9/physio.9#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#43 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#23 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#20 integrate .. //depot/projects/ia64/sys/conf/NOTES#68 integrate .. //depot/projects/ia64/sys/conf/files#101 integrate .. //depot/projects/ia64/sys/conf/options#67 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.h#11 integrate .. //depot/projects/ia64/sys/dev/ips/ips.h#4 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#10 integrate .. //depot/projects/ia64/sys/dev/mii/rgephy.c#1 branch .. //depot/projects/ia64/sys/dev/mii/rgephyreg.h#1 branch .. //depot/projects/ia64/sys/dev/re/if_re.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#3 integrate .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#29 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#76 integrate .. //depot/projects/ia64/sys/isa/fd.c#21 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/ia64/sys/modules/mii/Makefile#7 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/ia64/sys/netipx/ipx_input.c#8 integrate .. //depot/projects/ia64/sys/netipx/spx_usrreq.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_node.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#40 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#20 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#21 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#47 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#45 integrate .. //depot/projects/ia64/sys/vm/pmap.h#21 integrate .. //depot/projects/ia64/usr.bin/Makefile#54 integrate .. //depot/projects/ia64/usr.bin/symorder/Makefile#2 delete .. //depot/projects/ia64/usr.bin/symorder/symorder.1#5 delete .. //depot/projects/ia64/usr.bin/symorder/symorder.c#4 delete .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#20 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#13 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/extern.h#1 branch .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#23 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/ptimes.c#1 branch .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#15 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#11 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.12 2003/09/03 15:44:34 deischen Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.13 2003/09/12 19:19:10 obrien Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -80,7 +80,7 @@ #ifdef FREEBSD_NATIVE #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ do { \ - builtin_define_std ("__FreeBSD_cc_version=500006"); \ + builtin_define_std ("__FreeBSD_cc_version=510002"); \ } while (0) #else #define FBSD_NATIVE_TARGET_OS_CPP_BUILTINS() \ ==== //depot/projects/ia64/etc/etc.sparc64/ttys#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.4 2003/01/27 04:42:16 jake Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.5 2003/09/11 00:14:17 jake Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -48,10 +48,10 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" vt100 on secure +ttyu1 "/usr/libexec/getty std.9600" vt100 on secure +ttyu2 "/usr/libexec/getty std.9600" vt100 off secure +ttyu3 "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/ia64/libexec/lukemftpd/nbsd2fbsd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.3 2003/01/06 04:42:20 obrien Exp $ */ +/* $FreeBSD: src/libexec/lukemftpd/nbsd2fbsd.h,v 1.4 2003/09/11 03:28:21 obrien Exp $ */ /* XXX: Depend on our system headers protecting against multiple includes. */ #include <paths.h> @@ -15,3 +15,10 @@ #endif long long strsuftollx(const char *, const char *, long long, long long, char *, size_t); + +/* + * IEEE Std 1003.1c-95, adopted in X/Open CAE Specification Issue 5 Version 2 + */ +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 +#define LOGIN_NAME_MAX MAXLOGNAME /* max login name length (incl. NUL) */ +#endif ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.180 2003/09/06 20:03:09 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.181 2003/09/11 16:03:46 bmah Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -1580,17 +1580,16 @@ <para arch="sparc64">Sun GEM (Gigabit Ethernet) and ERI (Fast Ethernet) NICs (&man.gem.4; driver)</para> - <para arch="i386,pc98">Myson Ethernet NICs (my driver) - <itemizedlist> - <listitem> - <para>Myson MTD80X Based Fast Ethernet Card</para> - </listitem> - <listitem> - <para>Myson MTD89X Based Gigabit Ethernet Card</para> - </listitem> - </itemizedlist> + <para arch="i386,pc98">Myson Ethernet NICs (&man.my.4; driver) </para> + <para arch="i386">Broadcom BCM4401 based Fast Ethernet adapters + (&man.bfe.4; driver)</para> + + <para arch="i386">RealTek RTL8139C+, RTL8169, RTL8169S and + RTL8110S based PCI Fast Ethernet and Gigabit Ethernet + controllers (&man.re.4; driver)</para> + </sect2> <sect2> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#122 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.620 2003/09/06 18:15:11 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.621 2003/09/11 16:00:51 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -211,6 +211,9 @@ support for 802.11a/b/g devices based on the AR5210, AR5211, and AR5212 chips.</para> + <para>The &man.bfe.4; driver has been added to support Broadcom + BCM4401 based Fast Ethernet adapters.</para> + <para>&man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs. &merged;</para> @@ -233,9 +236,9 @@ <para arch="i386,pc98,sparc64">The &man.patm.4; driver has been added to support IDT77252 based ATM interfaces.</para> - <para>The &man.rl.4; driver now has support for the RealTek - 8139C+ Fast Ethernet chip and the RealTek 8169 Gigabit - Ethernet chip. &merged;</para> + <para>The &man.re.4; driver has been added. It provides support + for the RealTek RTL8139C+, RTL8169, RTL8169S and RTL8110S PCI + Fast Ethernet and Gigabit Ethernet controllers.</para> <para>The suspend/resume support for the &man.wi.4; driver now works correctly when the device is configured down. ==== //depot/projects/ia64/release/i386/drivers.conf#22 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.29 2003/07/25 00:10:33 scottl Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.30 2003/09/12 08:20:47 kuriyama Exp $ # # drv: driver name in kernel config file @@ -39,6 +39,7 @@ #drv filename floppy type description aue if_aue 2 network "ADMtek USB ethernet adapter" bge if_bge 2 network "Broadcom BCM570xx Gigabit Ethernet" +bfe if_bfe 2 network "Broadcom BCM440x PCI ethernet card" cue if_cue 2 network "CATC USB ethernet adapter" dc if_dc 2 network "DEC/Intel 21143 (and clones) PCI fast ethernet card" ed if_ed 2 network "NE[12]000, SMC Ultra, 3c503, DS8390 ISA ethernet cards" @@ -49,6 +50,7 @@ lnc if_lnc 2 network "NE2100, NE32-VL Lance Ethernet cards" miibus miibus 2 network "MII bus support" pcn if_pcn 2 network "AMD Am79c79x PCI ethernet card" +re if_re 2 network "RealTek 8139C+/8169/8169S/8110S PCI ethernet card" rl if_rl 2 network "RealTek 8129/8139 PCI ethernet card" sf if_sf 2 network "Adaptec AIC-6915 PCI ethernet card" sis if_sis 2 network "SiS 900/SiS 7016 PCI ethernet card" ==== //depot/projects/ia64/share/examples/cvsup/cvs-supfile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.36 2003/03/04 19:02:27 peter Exp $ +# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.37 2003/09/12 09:09:49 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. @@ -118,6 +118,7 @@ #ports-databases #ports-deskutils #ports-devel +#ports-dns #ports-editors #ports-emulators #ports-finance @@ -142,6 +143,7 @@ #ports-news #ports-palm #ports-picobsd +#ports-polish #ports-portuguese #ports-print #ports-russian ==== //depot/projects/ia64/share/examples/cvsup/gnats-supfile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.4 2002/07/30 14:08:16 blackend Exp $ +# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.5 2003/09/12 19:02:34 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD GNATS bug report database. @@ -41,7 +41,7 @@ # prefix=/usr # This specifies where to place the requested files. A # setting of "/usr" will place all of the files requested -# in "/usr/ports" (e.g., "/usr/ports/devel", "/usr/ports/lang"). +# in "/usr/gnats". # The prefix directory must exist in order to run CVSup. # Defaults that apply to all the collections ==== //depot/projects/ia64/share/examples/cvsup/ports-supfile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.26 2002/12/09 01:02:42 lioux Exp $ +# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.27 2003/09/12 09:09:49 ceri Exp $ # # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. @@ -84,6 +84,7 @@ #ports-databases #ports-deskutils #ports-devel +#ports-dns #ports-editors #ports-emulators #ports-finance @@ -108,6 +109,7 @@ #ports-news #ports-palm #ports-picobsd +#ports-polish #ports-portuguese #ports-print #ports-russian ==== //depot/projects/ia64/share/examples/cvsup/refuse#5 (text+ko) ==== @@ -21,6 +21,7 @@ ports/japanese ports/korean ports/portuguese +ports/polish ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/examples/cvsup/refuse.README#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.8 2003/03/26 01:25:39 keramida Exp $ +$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.9 2003/09/12 09:09:49 ceri Exp $ This describes the "refuse" file found in this directory. The explanation cannot be put inside the file itself because: @@ -46,6 +46,7 @@ ports/hungarian ports/japanese ports/korean + ports/polish ports/portuguese ports/russian ports/ukrainian ==== //depot/projects/ia64/share/man/man4/ng_atm.4#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" Author: Hartmut Brandt <harti@freebsd.org> .\" -.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.1 2003/06/25 13:21:55 harti Exp $ +.\" $FreeBSD: src/share/man/man4/ng_atm.4,v 1.2 2003/09/11 13:45:29 naddy Exp $ .\" .\" ng_atm(4) man page .\" @@ -279,6 +279,7 @@ char name[NG_HOOKLEN + 1]; }; .Ed +.El .Sh MANAGEMENT MESSAGES If the .Dv manage ==== //depot/projects/ia64/share/man/man9/physio.9#4 (text+ko) ==== @@ -34,7 +34,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/man9/physio.9,v 1.13 2002/03/18 10:59:58 ru Exp $ +.\" $FreeBSD: src/share/man/man9/physio.9,v 1.14 2003/09/12 19:20:05 hmp Exp $ .\" .Dd June 15, 1996 .Dt PHYSIO 9 @@ -121,4 +121,4 @@ The .Nm call has been completely re-written for providing higher -I/O performance, and better paging performance. +I/O and paging performance. ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#43 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.137 2003/09/08 02:45:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -815,10 +815,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#23 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.435 2003/09/08 02:45:02 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.436 2003/09/12 07:07:48 alc Exp $"); /* * Manages physical address maps. @@ -753,10 +753,11 @@ * Routine: pmap_extract_and_hold * Function: * Atomically extract and hold the physical page - * with the given pmap and virtual address. + * with the given pmap and virtual address pair + * if that mapping permits the given protection. */ vm_page_t -pmap_extract_and_hold(pmap_t pmap, vm_offset_t va) +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { vm_paddr_t pa; vm_page_t m; ==== //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#20 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.82 2003/09/05 10:40:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); #include "opt_cd.h" @@ -152,7 +152,7 @@ int bufs_left; struct cam_periph *periph; dev_t dev; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clonetag; #endif int minimum_command_size; @@ -343,7 +343,7 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void cdclone(void *arg, char *name, int namelen, dev_t *dev) { @@ -535,7 +535,7 @@ } devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); #endif free(softc, M_DEVBUF); @@ -782,7 +782,7 @@ softc->dev = make_dev(&cd_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); softc->dev->si_drv1 = periph; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 softc->clonetag = EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); #endif ==== //depot/projects/ia64/sys/conf/NOTES#68 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1174 2003/09/07 19:19:49 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1175 2003/09/11 23:06:41 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1465,6 +1465,10 @@ # device uart +# Options for uart(4) +options UART_PPS_ON_CTS # Do time pulse capturing using CTS + # instead of DCD. + # The following hint should only be used for pure ISA devices. It is not # needed otherwise. Use of hints is strongly discouraged. hint.uart.0.at="isa" ==== //depot/projects/ia64/sys/conf/files#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.823 2003/09/09 18:17:23 wpaul Exp $ +# $FreeBSD: src/sys/conf/files,v 1.824 2003/09/11 03:53:46 wpaul Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -518,6 +518,7 @@ dev/mii/nsgphy.c optional miibus dev/mii/pnphy.c optional miibus dev/mii/pnaphy.c optional miibus +dev/mii/rgephy.c optional miibus dev/mii/rlphy.c optional miibus dev/mii/ruephy.c optional miibus dev/mii/tdkphy.c optional miibus ==== //depot/projects/ia64/sys/conf/options#67 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.413 2003/09/07 07:43:09 tjr Exp $ +# $FreeBSD: src/sys/conf/options,v 1.414 2003/09/11 23:06:41 marcel Exp $ # # On the handling of kernel options # @@ -538,6 +538,9 @@ BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h +# Options to support PPS +UART_PPS_ON_CTS opt_uart.h + # options for bus/device framework BUS_DEBUG opt_bus.h ==== //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.22 2003/08/15 02:18:15 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.23 2003/09/11 03:17:33 njl Exp $ */ #include "opt_acpi.h" @@ -296,9 +296,11 @@ return; switch (notify) { + case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_BATTERY_BST_CHANGE: timespecclear(&sc->bst_lastupdated); break; + case ACPI_NOTIFY_BUS_CHECK: case ACPI_BATTERY_BIF_CHANGE: timespecclear(&sc->bif_lastupdated); AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_get_bif, dev); @@ -331,6 +333,13 @@ return (ENXIO); handle = acpi_get_handle(dev); + + /* + * Install a system notify handler in addition to the device notify. + * Toshiba notebook uses this alternate notify for its battery. + */ + AcpiInstallNotifyHandler(handle, ACPI_SYSTEM_NOTIFY, + acpi_cmbat_notify_handler, dev); AcpiInstallNotifyHandler(handle, ACPI_DEVICE_NOTIFY, acpi_cmbat_notify_handler, dev); ==== //depot/projects/ia64/sys/dev/ata/atapi-cam.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.21 2003/08/28 03:56:04 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.22 2003/09/11 17:34:47 thomas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -277,7 +277,9 @@ strncpy(cpi->dev_name, cam_sim_name(sim), sizeof cpi->dev_name); cpi->unit_number = cam_sim_unit(sim); cpi->bus_id = cam_sim_bus(sim); - if (softc->ata_ch && ccb_h->target_id >= 0) { + cpi->base_transfer_speed = 3300; + + if (softc->ata_ch && ccb_h->target_id != CAM_TARGET_WILDCARD) { switch (softc->ata_ch->device[ccb_h->target_id].mode) { case ATA_PIO1: cpi->base_transfer_speed = 5200; @@ -305,7 +307,8 @@ case ATA_UDMA6: cpi->base_transfer_speed = 133000; break; - default: cpi->base_transfer_speed = 3300; + default: + break; } } ccb->ccb_h.status = CAM_REQ_CMP; ==== //depot/projects/ia64/sys/dev/ata/atapi-cd.c#29 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.142 2003/09/05 10:40:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.144 2003/09/11 19:27:24 phk Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -42,6 +42,7 @@ #include <sys/cdio.h> #include <sys/cdrio.h> #include <sys/dvdio.h> +#include <sys/disk.h> #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/ctype.h> @@ -242,7 +243,7 @@ free(entry, M_ACD); } destroy_dev(cdp->dev); -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 EVENTHANDLER_DEREGISTER(dev_clone, cdp->clone_evh); #endif devstat_remove_entry(cdp->stats); @@ -275,7 +276,7 @@ return cdp; } -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { @@ -304,7 +305,7 @@ dev->si_drv1 = cdp; cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); #endif acd_set_ioparm(cdp); @@ -1032,6 +1033,14 @@ error = EINVAL; break; + case DIOCGMEDIASIZE: + *(off_t *)addr = cdp->disk_size * cdp->block_size; + break; + + case DIOCGSECTORSIZE: + *(u_int *)addr = cdp->block_size; + break; + default: error = ENOTTY; } ==== //depot/projects/ia64/sys/dev/ata/atapi-cd.h#11 (text+ko) ==== @@ -25,7 +25,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/dev/ata/atapi-cd.h,v 1.37 2003/09/05 11:08:55 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.39 2003/09/11 19:27:24 phk Exp $ */ /* CDROM Table Of Contents */ @@ -318,11 +318,11 @@ struct acd_softc **driver; /* softc's of changer slots */ int slot; /* this instance slot number */ time_t timestamp; /* this instance timestamp */ - int disk_size; /* size of current media */ - int block_size; /* blocksize currently used */ + u_int disk_size; /* size of current media */ + u_int block_size; /* blocksize currently used */ struct devstat *stats; /* devstat entry */ dev_t dev; /* device place holders */ -#ifndef BURN_BRIDGES +#ifdef GONE_IN_5 eventhandler_tag clone_evh; #endif }; ==== //depot/projects/ia64/sys/dev/ips/ips.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.3 2003/08/22 06:00:27 imp Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.4 2003/09/11 23:30:28 ps Exp $ */ @@ -343,6 +343,7 @@ typedef struct ips_softc{ struct resource * iores; struct resource * irqres; + struct intr_config_hook ips_ich; int configured; int state; int iotype; ==== //depot/projects/ia64/sys/dev/ips/ips_pci.c#7 (text+ko) ==== @@ -27,11 +27,12 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.6 2003/09/02 17:30:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.7 2003/09/11 23:30:28 ps Exp $"); #include <dev/ips/ips.h> static int ips_pci_free(ips_softc_t *sc); +static void ips_intrhook(void *arg); static int ips_pci_probe(device_t dev) { @@ -132,15 +133,30 @@ printf("IPS can't alloc dma tag\n"); goto error; } - if(ips_adapter_init(sc)) + sc->ips_ich.ich_func = ips_intrhook; + sc->ips_ich.ich_arg = sc; + if (config_intrhook_establish(&sc->ips_ich) != 0) { + printf("IPS can't establish configuration hook\n"); goto error; - sc->configured = 1; + } return 0; error: ips_pci_free(sc); return (ENXIO); } +static void +ips_intrhook(void *arg) +{ + struct ips_softc *sc = (struct ips_softc *)arg; + + config_intrhook_disestablish(&sc->ips_ich); + if (ips_adapter_init(sc)) + ips_pci_free(sc); + else + sc->configured = 1; +} + static int ips_pci_free(ips_softc_t *sc) { if(sc->adapter_dmatag) ==== //depot/projects/ia64/sys/dev/mii/miidevs#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.25 2003/09/09 18:17:23 wpaul Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.26 2003/09/11 03:53:46 wpaul Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -91,6 +91,8 @@ /* Don't know what's going on here. */ oui xxDAVICOM 0x006040 Davicom Semiconductor +/* This is the OUI of the gigE PHY in the RealTek 8169S/8110S chips */ +oui xxREALTEK 0x000732 /* * List of known models. Grouped by oui. @@ -149,6 +151,7 @@ /* RealTek Semiconductor PHYs */ model REALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface +model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S media interface /* Seeq PHYs */ model xxSEEQ 80220 0x0003 Seeq 80220 10/100 media interface ==== //depot/projects/ia64/sys/dev/re/if_re.c#3 (text+ko) ==== @@ -106,7 +106,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.3 2003/09/10 15:14:46 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.6 2003/09/11 07:54:16 wpaul Exp $"); #include <sys/param.h> #include <sys/endian.h> @@ -393,6 +393,13 @@ sc = device_get_softc(dev); + /* Let the rgephy driver read the GMEDIASTAT register */ + + if (reg == RL_GMEDIASTAT) { + rval = CSR_READ_1(sc, RL_GMEDIASTAT); + return(rval); + } + CSR_WRITE_4(sc, RL_PHYAR, reg << 16); DELAY(1000); @@ -423,7 +430,7 @@ sc = device_get_softc(dev); CSR_WRITE_4(sc, RL_PHYAR, (reg << 16) | - (data | RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); + (data & RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); DELAY(1000); for (i = 0; i < RL_TIMEOUT; i++) { @@ -721,6 +728,9 @@ ifp->if_flags |= IFF_PROMISC; sc->rl_testmode = 1; re_init(sc); + re_stop(sc); + DELAY(100000); + re_init(sc); /* Put some data in the mbuf */ @@ -733,14 +743,17 @@ /* Queue the packet, start transmission */ IF_HANDOFF(&ifp->if_snd, m0, ifp); + CSR_WRITE_2(sc, RL_ISR, 0xFFFF); re_start(ifp); m0 = NULL; /* Wait for it to propagate through the chip */ + DELAY(100000); for (i = 0; i < RL_TIMEOUT; i++) { status = CSR_READ_2(sc, RL_ISR); - if (status & RL_ISR_RX_OK) + if ((status & (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) == + (RL_ISR_TIMEOUT_EXPIRED|RL_ISR_RX_OK)) break; DELAY(10); } @@ -1148,18 +1161,55 @@ /* Reset the adapter. */ re_reset(sc); - sc->rl_eecmd_read = RL_EECMD_READ_6BIT; - re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); - if (re_did != 0x8129) - sc->rl_eecmd_read = RL_EECMD_READ_8BIT; + + hw_rev = re_hwrevs; + hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; + while (hw_rev->rl_desc != NULL) { + if (hw_rev->rl_rev == hwrev) { + sc->rl_type = hw_rev->rl_type; + break; + } + hw_rev++; + } + + if (sc->rl_type == RL_8169) { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_GFRAGLEN; + + /* Force station address autoload from the EEPROM */ + + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_AUTOLOAD); + for (i = 0; i < RL_TIMEOUT; i++) { + if (!(CSR_READ_1(sc, RL_EECMD) & RL_EEMODE_AUTOLOAD)) + break; + DELAY(100); + } + if (i == RL_TIMEOUT) + printf ("re%d: eeprom autoload timed out\n", unit); + + for (i = 0; i < ETHER_ADDR_LEN; i++) + eaddr[i] = CSR_READ_1(sc, RL_IDR0 + i); + } else { + + /* Set RX length mask */ + + sc->rl_rxlenmask = RL_RDESC_STAT_FRAGLEN; + + sc->rl_eecmd_read = RL_EECMD_READ_6BIT; + re_read_eeprom(sc, (caddr_t)&re_did, 0, 1, 0); + if (re_did != 0x8129) + sc->rl_eecmd_read = RL_EECMD_READ_8BIT; - /* - * Get station address from the EEPROM. - */ - re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); - for (i = 0; i < 3; i++) { - eaddr[(i * 2) + 0] = as[i] & 0xff; - eaddr[(i * 2) + 1] = as[i] >> 8; + /* + * Get station address from the EEPROM. + */ + re_read_eeprom(sc, (caddr_t)as, RL_EE_EADDR, 3, 0); + for (i = 0; i < 3; i++) { + eaddr[(i * 2) + 0] = as[i] & 0xff; + eaddr[(i * 2) + 1] = as[i] >> 8; + } } /* @@ -1170,16 +1220,6 @@ sc->rl_unit = unit; bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); - hw_rev = re_hwrevs; - hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV; - while (hw_rev->rl_desc != NULL) { - if (hw_rev->rl_rev == hwrev) { - sc->rl_type = hw_rev->rl_type; - break; - } - hw_rev++; - } - /* * Allocate the parent bus DMA tag appropriate for PCI. */ @@ -1780,6 +1820,11 @@ RL_LOCK(sc); ifp = &sc->arpcom.ac_if; + if (!(ifp->if_flags & IFF_UP)) { + RL_UNLOCK(sc); + return; + } + #ifdef DEVICE_POLLING if (ifp->if_flags & IFF_POLLING) goto done; @@ -2056,9 +2101,14 @@ /* * Set the initial TX and RX configuration. */ - if (sc->rl_testmode) - CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG|RL_LOOPTEST_ON); - else + if (sc->rl_testmode) { + if (sc->rl_type == RL_8169) + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON); + else + CSR_WRITE_4(sc, RL_TXCFG, + RL_TXCFG_CONFIG|RL_LOOPTEST_ON_CPLUS); + } else CSR_WRITE_4(sc, RL_TXCFG, RL_TXCFG_CONFIG); CSR_WRITE_4(sc, RL_RXCFG, RL_RXCFG_CONFIG); ==== //depot/projects/ia64/sys/dev/uart/uart_bus.h#2 (text+ko) ==== @@ -23,12 +23,18 @@ * (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/dev/uart/uart_bus.h,v 1.1 2003/09/06 23:13:47 marcel Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.2 2003/09/11 23:06:42 marcel Exp $ */ #ifndef _DEV_UART_BUS_H_ #define _DEV_UART_BUS_H_ +#ifndef KLD_MODULE +#include "opt_uart.h" +#endif + +#include <sys/timepps.h> + /* Drain and flush targets. */ #define UART_DRAIN_RECEIVER 0x0001 #define UART_DRAIN_TRANSMITTER 0x0002 @@ -75,6 +81,14 @@ #define UART_SIGMASK_STATE 0x003f #define UART_SIGMASK_DELTA 0x3f00 +#ifdef UART_PPS_ON_CTS +#define UART_SIG_DPPS UART_SIG_DCTS +#define UART_SIG_PPS UART_SIG_CTS +#else +#define UART_SIG_DPPS UART_SIG_DDCD >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309122239.h8CMdPXa008660>