Date: Sat, 6 Sep 2003 16:37:15 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 37693 for review Message-ID: <200309062337.h86NbF4U083312@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=37693 Change 37693 by marcel@marcel_nfs on 2003/09/06 16:36:59 IFC @37691 Affected files ... .. //depot/projects/ia64/bin/sh/arith_lex.l#6 integrate .. //depot/projects/ia64/include/pthread.h#7 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#121 integrate .. //depot/projects/ia64/share/man/man4/Makefile#57 integrate .. //depot/projects/ia64/share/man/man4/isp.4#4 integrate .. //depot/projects/ia64/share/man/man4/stg.4#1 branch .. //depot/projects/ia64/share/man/man4/worm.4#3 integrate .. //depot/projects/ia64/sys/conf/files#97 integrate .. //depot/projects/ia64/sys/conf/files.alpha#24 integrate .. //depot/projects/ia64/sys/conf/files.amd64#11 integrate .. //depot/projects/ia64/sys/conf/files.i386#46 integrate .. //depot/projects/ia64/sys/conf/files.ia64#46 integrate .. //depot/projects/ia64/sys/conf/files.pc98#37 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#34 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#26 integrate .. //depot/projects/ia64/sys/conf/ldscript.ia64#9 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#20 integrate .. //depot/projects/ia64/sys/dev/puc/puc_ebus.c#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/puc/puc_sbus.c#1 branch .. //depot/projects/ia64/sys/dev/puc/pucdata.c#19 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#11 integrate .. //depot/projects/ia64/sys/dev/smbus/smbus.c#5 integrate .. //depot/projects/ia64/sys/dev/uart/uart.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_acpi.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_ebus.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_isa.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_pci.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_bus_puc.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_core.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_alpha.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_amd64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_i386.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_ia64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_sab82532.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.c#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_dev_z8530.h#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_if.m#1 branch .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#1 branch .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#39 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#40 integrate .. //depot/projects/ia64/sys/modules/Makefile#61 integrate .. //depot/projects/ia64/sys/modules/uart/Makefile#1 branch .. //depot/projects/ia64/sys/netinet/ip_mroute.c#24 integrate .. //depot/projects/ia64/sys/pci/amdpm.c#10 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#6 integrate .. //depot/projects/ia64/usr.bin/ranlib/Makefile#2 delete .. //depot/projects/ia64/usr.bin/ranlib/build.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/extern.h#2 delete .. //depot/projects/ia64/usr.bin/ranlib/misc.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/pathnames.h#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.1#3 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.1aout#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.5#2 delete .. //depot/projects/ia64/usr.bin/ranlib/ranlib.c#4 delete .. //depot/projects/ia64/usr.bin/ranlib/touch.c#4 delete .. //depot/projects/ia64/usr.bin/tip/tip/tip.1#8 integrate Differences ... ==== //depot/projects/ia64/bin/sh/arith_lex.l#6 (text+ko) ==== @@ -42,7 +42,9 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.20 2003/09/04 18:28:42 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.21 2003/09/06 16:33:55 tjr Exp $"); + +#include <string.h> #include "shell.h" #include "y.tab.h" ==== //depot/projects/ia64/include/pthread.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.29 2003/09/04 14:06:42 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.30 2003/09/06 00:07:51 davidxu Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -258,6 +258,10 @@ int pthread_rwlock_init(pthread_rwlock_t *, const pthread_rwlockattr_t *); int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_timedrdlock(pthread_rwlock_t *, + const struct timespec *); +int pthread_rwlock_timedrwlock(pthread_rwlock_t *, + const struct timespec *); int pthread_rwlock_tryrdlock(pthread_rwlock_t *); int pthread_rwlock_trywrlock(pthread_rwlock_t *); int pthread_rwlock_unlock(pthread_rwlock_t *); ==== //depot/projects/ia64/lib/libpthread/pthread.map#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/pthread.map,v 1.4 2003/09/04 14:06:42 davidxu Exp $ +# $FreeBSD: src/lib/libpthread/pthread.map,v 1.5 2003/09/06 00:07:51 davidxu Exp $ LIBTHREAD_1_0 { global: ___creat; @@ -108,6 +108,8 @@ _pthread_rwlock_destroy; _pthread_rwlock_init; _pthread_rwlock_rdlock; + _pthread_rwlock_timedrdlock; + _pthread_rwlock_timedwrlock; _pthread_rwlock_tryrdlock; _pthread_rwlock_trywrlock; _pthread_rwlock_unlock; @@ -249,6 +251,8 @@ pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; + pthread_rwlock_timedrdlock; + pthread_rwlock_timedwrlock; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; ==== //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.12 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_rwlock.c,v 1.13 2003/09/06 00:07:52 davidxu Exp $ */ #include <errno.h> @@ -41,10 +41,12 @@ __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); __weak_reference(_pthread_rwlock_init, pthread_rwlock_init); __weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); +__weak_reference(_pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock); __weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock); __weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock); __weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock); __weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock); +__weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); /* * Prototypes @@ -137,8 +139,8 @@ return (ret); } -int -_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +static int +rwlock_rdlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime) { pthread_rwlock_t prwlock; int ret; @@ -162,8 +164,12 @@ /* give writers priority over readers */ while (prwlock->blocked_writers || prwlock->state < 0) { - ret = _thr_cond_wait(&prwlock->read_signal, &prwlock->lock); - + if (abstime) + ret = _pthread_cond_timedwait(&prwlock->read_signal, + &prwlock->lock, abstime); + else + ret = _thr_cond_wait(&prwlock->read_signal, + &prwlock->lock); if (ret != 0) { /* can't do a whole lot if this fails */ _thr_mutex_unlock(&prwlock->lock); @@ -188,9 +194,22 @@ return (ret); } +int +_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +{ + return rwlock_rdlock_common (rwlock, NULL); +} + __strong_reference(_pthread_rwlock_rdlock, _thr_rwlock_rdlock); int +_pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) +{ + return rwlock_rdlock_common(rwlock, abstime); +} + +int _pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) { pthread_rwlock_t prwlock; @@ -301,8 +320,8 @@ __strong_reference(_pthread_rwlock_unlock, _thr_rwlock_unlock); -int -_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +static int +rwlock_wrlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime) { pthread_rwlock_t prwlock; int ret; @@ -327,8 +346,12 @@ while (prwlock->state != 0) { ++prwlock->blocked_writers; - ret = _thr_cond_wait(&prwlock->write_signal, &prwlock->lock); - + if (abstime != NULL) + ret = _pthread_cond_timedwait(&prwlock->write_signal, + &prwlock->lock, abstime); + else + ret = _thr_cond_wait(&prwlock->write_signal, + &prwlock->lock); if (ret != 0) { --prwlock->blocked_writers; _thr_mutex_unlock(&prwlock->lock); @@ -347,4 +370,16 @@ return (ret); } +int +_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +{ + return rwlock_wrlock_common (rwlock, NULL); +} __strong_reference(_pthread_rwlock_wrlock, _thr_rwlock_wrlock); + +int +_pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) +{ + return rwlock_wrlock_common (rwlock, abstime); +} ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#66 (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.177 2003/08/25 04:31:26 bmah Exp $</pubdate> + <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> </sect1info> <title>Supported Devices</title> @@ -404,19 +404,6 @@ </para> <para arch="i386">3ware Escalade ATA RAID controllers (&man.twe.4; driver) - <itemizedlist> - <listitem arch="i386"> - <para>5000 series</para> - </listitem> - - <listitem arch="i386"> - <para>6000 series</para> - </listitem> - - <listitem arch="i386"> - <para>7000 series</para> - </listitem> - </itemizedlist> </para> <para arch="i386,pc98,alpha,sparc64">LSI/SymBios (formerly NCR) 53C810, 53C810a, 53C815, 53C825, @@ -490,73 +477,10 @@ </para> <para arch="i386,pc98">TMC 18C30, 18C50 and 36C70 (AIC-6820) based ISA/PC-Card SCSI host - adapters (stg driver) - <itemizedlist> - <listitem> - <para>Adaptec 2920/A</para> - </listitem> - <listitem> - <para>Future Domain SCSI2GO</para> - </listitem> - <listitem> - <para>Future Domain TMC-18XX/3260</para> - </listitem> - <listitem> - <para>IBM SCSI PCMCIA Card</para> - </listitem> - <listitem> - <para>ICM PSC-2401 SCSI</para> - </listitem> - <listitem> - <para>MELCO IFC-SC</para> - </listitem> - <listitem> - <para>RATOC REX-5536, REX-5536AM, REX-5536M, - REX-9836A</para> - </listitem> - </itemizedlist> + adapters (&man.stg.4; driver) </para> <para arch="i386,pc98,alpha,ia64,sparc64">Qlogic controllers and variants (&man.isp.4; driver) - <itemizedlist> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1020, 1040 SCSI and Ultra SCSI host - adapters</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1240 dual Ultra SCSI controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 1080 Ultra2 LVD and 1280 Dual Ultra2 LVD - controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 12160 Ultra3 LVD controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 2100 and Qlogic 2200 Fibre Channel SCSI - controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Qlogic 2300 and Qlogic 2312 2-Gigabit Fibre Channel SCSI - controllers</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Performance Technology SBS440 ISP1000 variants</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Performance Technology SBS450 ISP1040 variants</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Performance Technology SBS470 ISP2100 variants</para> - </listitem> - <listitem arch="i386,alpha,ia64,sparc64"> - <para>Antares Microsystems P-0033 ISP2100 variants</para> - </listitem> - <listitem arch="pc98"> - <para>Qlogic SCSI interface</para> - </listitem> - </itemizedlist> </para> <para arch="i386">DTC 3290 EISA SCSI controller in 1542 emulation mode.</para> @@ -1269,34 +1193,7 @@ </itemizedlist> </para> - <para arch="i386,pc98,alpha">Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) - <itemizedlist> - <listitem> - <para>Compaq Netelligent 10, 10/100, 10/100 - Dual-Port</para> - </listitem> - <listitem arch="i386"> - <para>Compaq Netelligent 10/100 Proliant</para> - </listitem> - <listitem> - <para>Compaq Netelligent 10/100 TX Embedded UTP, 10 T PCI - UTP/Coax, 10/100 TX UTP</para> - </listitem> - <listitem> - <para>Compaq NetFlex 3P, 3P Integrated, 3P w/BNC</para> - </listitem> - <listitem> - <para>Olicom OC-2135/2138, OC-2325, OC-2326 10/100 TX UTP</para> - </listitem> - <listitem> - <para>Racore 8165 10/100baseTX</para> - </listitem> - <listitem> - <para>Racore 8148 10baseT/100baseTX/100baseFX - multi-personality</para> - </listitem> - </itemizedlist> - </para> + <para arch="i386,pc98,alpha">Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver)</para> <para arch="i386,pc98,alpha,sparc64">ADMtek Inc. AL981-based PCI Fast Ethernet NICs (&man.dc.4; driver)</para> @@ -1310,143 +1207,19 @@ </itemizedlist> </para> - <para arch="i386,pc98">ADMtek Inc. AN986-based USB Ethernet NICs (&man.aue.4; driver) - <itemizedlist> - <listitem> - <para>Abocom UFE1000, DSB650TX_NA</para> - </listitem> - <listitem> - <para>Accton USB320-EC, SpeedStream</para> - </listitem> - <listitem> - <para>ADMtek AN986, AN8511</para> - </listitem> - <listitem> - <para>Billionton USB100, USB100LP, USB100EL, USBE100</para> - </listitem> - <listitem> - <para>Corega Ether FEther USB-T, FEther USB-TX, FEther USB-TXS</para> - </listitem> - <listitem> - <para>D-Link DSB-650, DSB-650TX, DSB-650TX-PNA</para> - </listitem> - <listitem> - <para>Elecom LD-USBL/TX</para> - </listitem> - <listitem> - <para>Elsa Microlink USB2Ethernet</para> - </listitem> - <listitem> - <para>I-O Data USB ETTX</para> - </listitem> - <listitem> - <para>Kingston KNU101TX</para> - </listitem> - <listitem> - <para>LinkSys USB10T, USB10TA, USB10TX, USB100TX, USB100H1</para> - </listitem> - <listitem> - <para>MELCO LUA-TX, LUA2-TX</para> - </listitem> - <listitem> - <para>Planex UE-200TX</para> - </listitem> - <listitem> - <para>Siemens Speedstream</para> - </listitem> - <listitem> - <para>SmartBridges smartNIC</para> - </listitem> - <listitem> - <para>SMC 2202USB</para> - </listitem> - <listitem> - <para>SOHOware NUB100</para> - </listitem> - </itemizedlist> - </para> + <para arch="i386,pc98">ADMtek Inc. AN986-based USB Ethernet NICs (&man.aue.4; driver)</para> <para arch="i386,pc98">CATC USB-EL1210A-based USB Ethernet NICs (&man.cue.4; driver)</para> <para arch="i386,pc98">Kawasaki LSI KU5KUSB101B-based USB Ethernet NICs - (&man.kue.4; driver) - <itemizedlist> - <listitem> - <para>3Com 3c19250</para> - </listitem> - <listitem> - <para>AOX USB101</para> - </listitem> - <listitem> - <para>Abocom URE 450</para> - </listitem> - <listitem> - <para>ADS Technologies USB-10BT</para> - </listitem> - <listitem> - <para>ATen UC10T</para> - </listitem> - <listitem> - <para>Corega USB-T</para> - </listitem> - <listitem> - <para>D-Link DSB-650C</para> - </listitem> - <listitem> - <para>Entrega NET-USB-E45</para> - </listitem> - <listitem> - <para>I/O Data USB ETT</para> - </listitem> - <listitem> - <para>Kawasaki DU-H3E</para> - </listitem> - <listitem> - <para>LinkSys USB10T</para> - </listitem> - <listitem> - <para>Netgear EA101</para> - </listitem> - <listitem> - <para>Peracom USB Ethernet Adapter</para> - </listitem> - <listitem> - <para>SMC 2102USB, 2104USB</para> - </listitem> - </itemizedlist> - </para> + (&man.kue.4; driver)</para> <para arch="i386,pc98">ASIX Electronics AX88172-based USB Ethernet NICs - (&man.axe.4; driver) + (&man.axe.4; driver)</para> - <itemizedlist> - <listitem> - <para>D-Link DUBE100</para> - </listitem> - <listitem> - <para>Linksys USB200M</para> - </listitem> - <listitem> - <para>Netgear FA120</para> - </listitem> - </itemizedlist> - - </para> - <para arch="i386,pc98">RealTek RTL8150-based USB Ethernet NICs - (&man.rue.4; driver) + (&man.rue.4; driver)</para> - <itemizedlist> - <listitem> - <para>GREEN HOUSE GH-USB100B</para> - </listitem> - <listitem> - <para>MELCO LUA-KTX</para> - </listitem> - </itemizedlist> - - </para> - <para arch="i386,pc98,alpha,sparc64">ASIX Electronics AX88140A PCI NICs (&man.dc.4; driver) <itemizedlist> <listitem> @@ -1647,17 +1420,6 @@ </para> <para arch="i386,pc98">3Com 3C59X series NICs (&man.vx.4; driver) - <itemizedlist> - <listitem> - <para>3C590 Etherlink III (PCI)</para> - </listitem> - <listitem> - <para>3C595 Fast Etherlink III (PCI)</para> - </listitem> - <listitem arch="i386"> - <para>3C592/3C597 (EISA)</para> - </listitem> - </itemizedlist> </para> <para arch="i386">Crystal Semiconductor CS89x0-based NICs ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#121 (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.619 2003/08/23 05:42:03 nyan Exp $</pubdate> + <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> <copyright> <year>2000</year> @@ -275,6 +275,9 @@ It emulates a HARP physical interface, and allows one to run the HARP ATM stack without real hardware.</para> + <para>Kernel support has been added for Protocol Independent + Multicast routing. &merged;</para> + <para>To reduce information leakage, IPv4 packets no longer have a <varname>ip_id</varname> field set unless fragmentation is being done.</para> @@ -444,6 +447,9 @@ <para>The <application>ACPI-CA</application> code has been updated from the 20030228 snapshot to the 20030619 snapshot.</para> + <para><application>amd</application> has been updated from 6.0.7 + to 6.0.9.</para> + <para><application>awk</application> from Bell Labs has been updated from a 14 March 2003 snapshot to a 29 July 2003 snapshot.</para> @@ -463,6 +469,16 @@ </note> </para> + <para><application>GNU Readline</application> has been updated + from 4.2 to 4.3.</para> + + <para><application>GNU Sort</application> has been updated from + the version in textutils 2.0.21 to the version in textutils + 2.1.</para> + + <para>The <application>ISC DHCP</application> client has been + updated from 3.0.1rc11 to 3.0.1rc12.</para> + <para><application>lukemftp</application> has been updated from 1.6beta2 to a 30 June 2003 snapshot from NetBSD.</para> ==== //depot/projects/ia64/share/man/man4/Makefile#57 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.219 2003/08/21 16:53:06 rwatson Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.220 2003/09/06 17:31:50 bmah Exp $ MAN= aac.4 \ acpi.4 \ @@ -229,6 +229,7 @@ st.4 \ ste.4 \ stf.4 \ + stg.4 \ sym.4 \ syncache.4 \ syncer.4 \ ==== //depot/projects/ia64/share/man/man4/isp.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/isp.4,v 1.15 2003/04/20 22:10:13 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/isp.4,v 1.16 2003/09/06 17:47:25 bmah Exp $ .\" $NetBSD: isp.4,v 1.5 1999/12/18 18:33:05 mjacob Exp $ .\" .\" Copyright (c) 1998, 1999, 2001 @@ -92,6 +92,10 @@ .It Qlogic 1240 Qlogic 1240 Dual Bus Ultra Wide and Differential Ultra Wide PCI cards. +.It Qlogic 1020 +Qlogic 1020 SCSI cards. +.It Qlogic 1040 +Qlogic 1040 Ultra SCSI cards. .It Qlogic 1080 Qlogic 1280 LVD Ultra2 Wide PCI cards. .It Qlogic 1280 ==== //depot/projects/ia64/share/man/man4/worm.4#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/worm.4,v 1.26 2002/12/24 13:41:46 ru Exp $ +.\" $FreeBSD: src/share/man/man4/worm.4,v 1.27 2003/09/06 17:46:16 hmp Exp $ .\" " .Dd October 15, 1998 .Dt WORM 4 @@ -57,16 +57,17 @@ .Fx 3.0 by a CAM-compliant .Tn SCSI -layer. The new +layer. +The new .Tn SCSI layer doesn't include a .Nm -driver, and isn't likely to include one in the future. Future in-kernel +driver, and isn't likely to include one in the future. +Future in-kernel support for CD-R/CD-RW/DVD drives will likely be implemented through the .Xr cd 4 -driver. Users who wish -to write CDs on a WORM, CD-R, or CD-RW drive -should use +driver. +Users who wish to write CDs on a WORM, CD-R, or CD-RW drive should use .Nm cdrtools , which is in the .Fx @@ -75,8 +76,8 @@ The .Xr cd 4 driver provides read-only access to CD, CD-R, and CD-RW drives, as well as -WORM drives that support the CDROM command set. Therefore, users wishing -to mount CDs in a WORM drive should use the +WORM drives that support the CDROM command set. +Therefore, users wishing to mount CDs in a WORM drive should use the .Xr cd 4 driver instead. .Sh SEE ALSO @@ -93,8 +94,8 @@ .Nm driver has been written by .An Peter Dufault -in May, 1995. The driver has -then been improved and made actually usable at all by +in May, 1995. +The driver has then been improved and made actually usable at all by .An J\(:org Wunsch in January, 1996. .Sh HISTORY ==== //depot/projects/ia64/sys/conf/files#97 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.817 2003/08/29 04:02:18 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -587,8 +587,10 @@ dev/pst/pst-iop.c optional pst dev/pst/pst-raid.c optional pst dev/puc/puc.c optional puc +dev/puc/puc_ebus.c optional puc ebus dev/puc/puc_pci.c optional puc pci dev/puc/puc_pccard.c optional puc pccard +dev/puc/puc_sbus.c optional puc sbus dev/puc/pucdata.c optional puc pci dev/raidframe/rf_acctrace.c optional raidframe dev/raidframe/rf_alloclist.c optional raidframe @@ -779,6 +781,18 @@ dev/twe/twe_freebsd.c optional twe dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp +dev/uart/uart_if.m optional uart +dev/uart/uart_bus_acpi.c optional uart acpi +dev/uart/uart_bus_ebus.c optional uart ebus +dev/uart/uart_bus_isa.c optional uart isa +dev/uart/uart_bus_pci.c optional uart cardbus +dev/uart/uart_bus_pci.c optional uart pci +dev/uart/uart_bus_puc.c optional uart puc +dev/uart/uart_core.c optional uart +dev/uart/uart_dev_ns8250.c optional uart +dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_dev_z8530.c optional uart +dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support ==== //depot/projects/ia64/sys/conf/files.alpha#24 (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.alpha,v 1.105 2003/08/04 02:39:14 imp Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.106 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -192,6 +192,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_alpha.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd ==== //depot/projects/ia64/sys/conf/files.amd64#11 (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.amd64,v 1.22 2003/08/23 00:59:26 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.23 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -42,6 +42,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_amd64.c optional uart isa/atkbd_isa.c optional atkbd amd64/acpica/OsdEnvironment.c optional acpi ==== //depot/projects/ia64/sys/conf/files.i386#46 (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.453 2003/08/31 16:20:34 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.454 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -153,6 +153,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard ==== //depot/projects/ia64/sys/conf/files.ia64#46 (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.ia64,v 1.57 2003/08/23 02:33:36 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.58 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,6 +69,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_ia64.c optional uart dev/vga/vga.c optional vga dev/vga/vga_isa.c optional vga isa dev/vga/vga_pci.c optional vga pci ==== //depot/projects/ia64/sys/conf/files.pc98#37 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.277 2003/08/25 07:52:10 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -131,6 +131,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard ==== //depot/projects/ia64/sys/conf/files.sparc64#34 (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.45 2003/08/24 01:54:06 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.46 2003/09/06 23:23:25 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,6 +32,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_sparc64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard ==== //depot/projects/ia64/sys/conf/kmod.mk#26 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.140 2003/08/22 15:41:44 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.141 2003/09/06 23:23:25 marcel Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -257,7 +257,7 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m \ - opencrypto/crypto_if.m pc98/pc98/canbus_if.m + opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m .for _srcsrc in ${MFILES} .for _ext in c h ==== //depot/projects/ia64/sys/conf/ldscript.ia64#9 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.9 2003/05/16 06:03:45 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) SEARCH_DIR(/usr/lib); -kernel_text = 0xe000000000500000; +kernel_text = 0xe000000004000000; SECTIONS { /* Read-only sections, merged into text segment: */ ==== //depot/projects/ia64/sys/dev/puc/puc.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * Copyright (c) 1996, 1998, 1999 @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.25 2003/08/24 17:54:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.26 2003/09/06 21:48:49 marcel Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, @@ -105,7 +105,9 @@ struct puc_device { struct resource_list resources; - u_int serialfreq; + u_int serialfreq; + u_int subtype; + int regshft; }; static void puc_intr(void *arg); @@ -139,18 +141,18 @@ u_char t1, t2; int i; - switch (sc->sc_desc->ilr_type) { + switch (sc->sc_desc.ilr_type) { case PUC_ILR_TYPE_DIGI: sc->ilr_st = rman_get_bustag(res); sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2 && sc->sc_desc->ilr_offset[i] != 0; i++) { + for (i = 0; i < 2 && sc->sc_desc.ilr_offset[i] != 0; i++) { t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); t1 = ~t1; bus_space_write_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i], t1); + sc->sc_desc.ilr_offset[i], t1); t2 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, - sc->sc_desc->ilr_offset[i]); + sc->sc_desc.ilr_offset[i]); if (t2 == t1) return (0); } @@ -166,22 +168,23 @@ puc_attach(device_t dev, const struct puc_device_description *desc) { char *typestr; - int bidx, childunit, i, irq_setup, rid, type; + int bidx, childunit, i, irq_setup, ressz, rid, type; struct puc_softc *sc; struct puc_device *pdev; struct resource *res; struct resource_list_entry *rle; + if (desc == NULL) + return (ENXIO); + sc = (struct puc_softc *)device_get_softc(dev); bzero(sc, sizeof(*sc)); - sc->sc_desc = desc; - if (sc->sc_desc == NULL) - return (ENXIO); + sc->sc_desc = *desc; #ifdef PUC_DEBUG bootverbose = 1; - printf("puc: name: %s\n", sc->sc_desc->name); + printf("puc: name: %s\n", sc->sc_desc.name); #endif rid = 0; res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, @@ -208,27 +211,34 @@ rid = 0; for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { - if (i > 0 && rid == sc->sc_desc->ports[i].bar) + if (i > 0 && rid == sc->sc_desc.ports[i].bar) sc->barmuxed = 1; - rid = sc->sc_desc->ports[i].bar; + rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); if (sc->sc_bar_mappings[bidx].res != NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309062337.h86NbF4U083312>