Date: Wed, 17 Dec 2008 13:23:49 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 154869 for review Message-ID: <200812171323.mBHDNnnL080170@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154869 Change 154869 by piso@piso_ferret on 2008/12/17 13:23:25 Try again to reduce diff against HEAD... Affected files ... .. //depot/projects/soc2005/libalias/bin/sh/parser.c#7 edit .. //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#4 edit .. //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#7 edit .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#4 edit .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#5 edit .. //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#5 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#15 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#5 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#8 edit .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#7 edit .. //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#8 edit .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#10 edit .. //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#6 edit .. //depot/projects/soc2005/libalias/share/sendmail/Makefile#4 edit .. //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#6 edit .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#6 edit .. //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#8 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#5 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#4 edit .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#7 edit .. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe_pccard.c#5 edit .. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#12 edit .. //depot/projects/soc2005/libalias/sys/powerpc/aim/trap.c#6 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#5 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#6 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest_run.sh#4 edit .. //depot/projects/soc2005/libalias/usr.bin/comm/comm.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/pkg_add.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/pkg_create.1#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/main.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/pkg_delete.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/main.c#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/pkg_info.1#7 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/pkg_updating.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/main.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/pkg_version.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/timed/timed/timed.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/tzsetup.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.c#6 edit Differences ... ==== //depot/projects/soc2005/libalias/bin/sh/parser.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1188,6 +1188,7 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int i; int linno; + int length; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1220,12 +1221,14 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { - p = out; + length = 0; do { STPUTC(c, out); c = pgetc(); + length++; } while (!is_eof(c) && is_in_name(c)); - if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + if (length == 6 && + strncmp(out - length, "LINENO", length) == 0) { /* Replace the variable name with the * current line number. */ linno = plinno; ==== //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.2 2008/05/27 17:46:32 emax Exp $ # The authentication_enable parameter controls if the device requires to # authenticate the remote device at connection setup. At connection setup, @@ -39,8 +39,7 @@ # The class parameter is used to indicate the capabilities of the device to # other devices. # -# For more details see -# https://www.bluetooth.org/foundry/assignnumb/document/baseband +# For more details see "Assigned Numbers - Bluetooth Baseband" document # # Possible value: # @@ -101,7 +100,7 @@ # The role_switch parameter controls whether the local device should perform # role switch. By default, if role switch is supported, the local device will # try to perform role switch and become Master on incoming connection. Some -# devices do not support role switch and thus incomming connections from such +# devices do not support role switch and thus incoming connections from such # devices will fail. If role switch is disabled then accepting device will # remain Slave. # ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.46 2008/05/31 18:07:16 remko Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -402,16 +402,6 @@ as root. This will install a collection of packages that is appropriate for running a "generic" server. % -You can get a good standard workstation install by using the -instant-workstation port/package. If you have ports installed, you can -install it by doing - - # cd /usr/ports/misc/instant-workstation - # make install && make clean - -as root. This will install a collection of packages that is convenient to -have on a workstation. -% You can install extra packages for FreeBSD by using the ports system. If you have installed it, you can download, compile, and install software by just typing ==== //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.1 2008/04/04 09:43:03 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.3 2008/05/30 14:47:40 dfr Exp $"); #include <fcntl.h> #include <stdarg.h> @@ -34,8 +34,10 @@ #include <sys/syscall.h> #include "libc_private.h" +__weak_reference(__fcntl_compat, fcntl); + int -fcntl(int fd, int cmd, ...) +__fcntl_compat(int fd, int cmd, ...) { va_list args; long arg; ==== //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.17 2008/05/30 14:47:41 dfr Exp $ */ #include <stdarg.h> #include <unistd.h> @@ -36,6 +36,8 @@ __weak_reference(__fcntl, fcntl); +extern int __fcntl_compat(int fd, int cmd, ...); + int _fcntl(int fd, int cmd,...) { @@ -124,7 +126,7 @@ break; default: /* Might want to make va_arg use a union */ - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); break; } ==== //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.24 2007/12/16 23:29:55 deischen Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.25 2008/05/30 14:47:42 dfr Exp $ */ #include "namespace.h" @@ -37,6 +37,7 @@ #include "thr_private.h" int __fcntl(int fd, int cmd,...); +extern int __fcntl_compat(int fd, int cmd,...); __weak_reference(__fcntl, fcntl); @@ -68,7 +69,7 @@ ret = __sys_fcntl(fd, cmd); break; default: - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.50 2008/04/16 03:19:11 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.51 2008/05/29 07:57:33 davidxu Exp $ */ #include "namespace.h" @@ -89,8 +89,7 @@ struct pthread_mutex_attr _pthread_mutexattr_default = { .m_type = PTHREAD_MUTEX_DEFAULT, .m_protocol = PTHREAD_PRIO_NONE, - .m_ceiling = 0, - .m_flags = 0 + .m_ceiling = 0 }; /* Default condition variable attributes: */ ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.6 2007/10/16 07:46:15 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.7 2008/05/30 00:02:59 davidxu Exp $ * */ @@ -38,11 +38,8 @@ #define ONCE_NEVER_DONE PTHREAD_NEEDS_INIT #define ONCE_DONE PTHREAD_DONE_INIT #define ONCE_IN_PROGRESS 0x02 -#define ONCE_MASK 0x03 +#define ONCE_WAIT 0x03 -static pthread_mutex_t _thr_once_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t _thr_once_cv = PTHREAD_COND_INITIALIZER; - /* * POSIX: * The pthread_once() function is not a cancellation point. However, @@ -55,47 +52,46 @@ { pthread_once_t *once_control = arg; - _pthread_mutex_lock(&_thr_once_lock); - once_control->state = ONCE_NEVER_DONE; - _pthread_mutex_unlock(&_thr_once_lock); - _pthread_cond_broadcast(&_thr_once_cv); + if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_NEVER_DONE)) + return; + atomic_store_rel_int(&once_control->state, ONCE_NEVER_DONE); + _thr_umtx_wake(&once_control->state, INT_MAX, 0); } int _pthread_once(pthread_once_t *once_control, void (*init_routine) (void)) { struct pthread *curthread; - int wakeup = 0; + int state; + + for (;;) { + state = once_control->state; + if (state == ONCE_DONE) + return (0); + if (state == ONCE_NEVER_DONE) { + if (atomic_cmpset_acq_int(&once_control->state, state, ONCE_IN_PROGRESS)) + break; + } else if (state == ONCE_IN_PROGRESS) { + if (atomic_cmpset_acq_int(&once_control->state, state, ONCE_WAIT)) + _thr_umtx_wait_uint(&once_control->state, ONCE_WAIT, NULL, 0); + } else if (state == ONCE_WAIT) { + _thr_umtx_wait_uint(&once_control->state, state, NULL, 0); + } else + return (EINVAL); + } - if (once_control->state == ONCE_DONE) + curthread = _get_curthread(); + THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); + init_routine(); + THR_CLEANUP_POP(curthread, 0); + if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_DONE)) return (0); - _pthread_mutex_lock(&_thr_once_lock); - while (*(volatile int *)&(once_control->state) == ONCE_IN_PROGRESS) - _pthread_cond_wait(&_thr_once_cv, &_thr_once_lock); - /* - * If previous thread was canceled, then the state still - * could be ONCE_NEVER_DONE, we need to check it again. - */ - if (*(volatile int *)&(once_control->state) == ONCE_NEVER_DONE) { - once_control->state = ONCE_IN_PROGRESS; - _pthread_mutex_unlock(&_thr_once_lock); - curthread = _get_curthread(); - THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); - init_routine(); - THR_CLEANUP_POP(curthread, 0); - _pthread_mutex_lock(&_thr_once_lock); - once_control->state = ONCE_DONE; - wakeup = 1; - } - _pthread_mutex_unlock(&_thr_once_lock); - if (wakeup) - _pthread_cond_broadcast(&_thr_once_cv); + atomic_store_rel_int(&once_control->state, ONCE_DONE); + _thr_umtx_wake(&once_control->state, INT_MAX, 0); return (0); } void _thr_once_init() { - _thr_once_lock = PTHREAD_MUTEX_INITIALIZER; - _thr_once_cv = PTHREAD_COND_INITIALIZER; } ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.17 2007/12/20 04:32:28 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.18 2008/05/30 14:47:42 dfr Exp $ */ /* @@ -132,6 +132,7 @@ int __close(int); int __connect(int, const struct sockaddr *, socklen_t); int __fcntl(int, int,...); +extern int __fcntl_compat(int, int,...); int __fsync(int); int __msync(void *, size_t, int); int __nanosleep(const struct timespec *, struct timespec *); @@ -252,7 +253,7 @@ ret = __sys_fcntl(fd, cmd); break; default: - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#7 (text+ko) ==== @@ -12,7 +12,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.40 2007/08/18 17:11:14 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.41 2008/05/31 13:45:35 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -23,6 +23,7 @@ <year>2005</year> <year>2006</year> <year>2007</year> + <year>2008</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> @@ -58,8 +59,8 @@ Intel Itanium Processor based computers (&arch.ia64;), NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;), and &ultrasparc; machines (&arch.sparc64;). Versions - for the &powerpc; (&arch.powerpc;), and &mips; (mips) - architectures are currently under + for the &arm; (&arch.arm;), &mips; (&arch.mips;), and + &powerpc; (&arch.powerpc;) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything from software development to games to Internet Service ==== //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#8 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- -*- sgml -*- - $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.32 2008/04/20 17:58:05 hrs Exp $ + $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.33 2008/05/31 13:45:35 hrs Exp $ OS Release Information --> @@ -54,6 +54,7 @@ <!ENTITY arch.arm "arm"> <!ENTITY arch.i386 "i386"> <!ENTITY arch.ia64 "ia64"> +<!ENTITY arch.mips "mips"> <!ENTITY arch.pc98 "pc98"> <!ENTITY arch.powerpc "powerpc"> <!ENTITY arch.sparc64 "sparc64"> ==== //depot/projects/soc2005/libalias/sbin/mount/mount.8#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.87 2008/03/12 02:09:22 tmclaugh Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.89 2008/06/03 09:43:28 ru Exp $ .\" .Dd March 11, 2008 .Dt MOUNT 8 @@ -522,6 +522,19 @@ The minimum permissions for the mount point for traversal across the mount point in both directions to be possible for all users is 0111 (execute for all). +.Pp +Use of the +.Nm +is preferred over the use of the file system specific +.Pa mount_ Ns Sy XXX +commands. +In particular, +.Xr mountd 8 +gets a +.Dv SIGHUP +signal (that causes an update of the export list) +only when the file system is mounted via +.Nm . .Sh HISTORY A .Nm ==== //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.3 2007/10/31 16:05:21 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.4 2008/05/27 17:46:32 emax Exp $ .\" -.Dd December 1, 2005 +.Dd May 27, 2008 .Dt BLUETOOTH.DEVICE.CONF 5 .Os .Sh NAME @@ -90,7 +90,8 @@ parameter is used to indicate the capabilities of the device to other devices. For more details see -.Pa https://www.bluetooth.org/foundry/\:assignnumb/document/\:baseband . +.Dq Assigned Numbers - Bluetooth Baseband +document. .It Va connectable .Pq Vt bool The ==== //depot/projects/soc2005/libalias/share/sendmail/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/share/sendmail/Makefile,v 1.10 2004/12/21 08:46:54 ru Exp $ +# $FreeBSD: src/share/sendmail/Makefile,v 1.11 2008/05/31 19:15:15 remko Exp $ # # Doing a make install builds /usr/share/sendmail/ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFDIR= cf -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print) +CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) +CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) DDIR= ${DESTDIR}/usr/share/sendmail ==== //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.72 2007/07/13 08:29:24 roberto Exp $ +# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.73 2008/05/27 13:19:06 philip Exp $ FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ @@ -6,6 +6,7 @@ br275.iso.kbd br275.iso.acc.kbd br275.cp850.kbd \ by.cp1131.kbd by.cp1251.kbd by.iso5.kbd \ ce.iso2.kbd \ + colemak.iso15.acc.kbd \ cs.latin2.qwertz.kbd \ cz.iso2.kbd \ danish.iso.kbd danish.cp865.kbd dutch.iso.acc.kbd \ ==== //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.29 2007/01/14 16:07:01 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.30 2008/06/03 17:50:13 rdivacky Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -82,8 +82,8 @@ 0, 0, linux_sysctl_osname, "A", "Linux kernel OS name"); -static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; -static int linux_use_linux26 = 0; +static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.6.16"; +static int linux_use_linux26 = 1; static int linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS) ==== //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.10 2006/03/11 15:39:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.11 2008/05/29 12:50:45 ed Exp $"); # define GPIB_DEBUG # undef GPIB_DEBUG @@ -277,7 +277,7 @@ struct cdev *dev; if (units == NULL) - units = new_unrhdr(0, minor2unit(MAXMINOR), NULL); + units = new_unrhdr(0, INT_MAX, NULL); u->unit = alloc_unr(units); mtx_init(&u->mutex, "gpib", NULL, MTX_DEF); u->cdev = make_dev(&gpib_l_cdevsw, u->unit, ==== //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#8 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.29 2007/11/22 02:44:59 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.30 2008/05/31 14:17:36 remko Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -211,32 +211,52 @@ DRIVER_MODULE(miibus, nve, miibus_driver, miibus_devclass, 0, 0); static struct nve_type nve_devs[] = { - {NVIDIA_VENDORID, NFORCE_MCPNET1_DEVICEID, - "NVIDIA nForce MCP Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET2_DEVICEID, - "NVIDIA nForce MCP2 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET3_DEVICEID, - "NVIDIA nForce MCP3 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET4_DEVICEID, - "NVIDIA nForce MCP4 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET5_DEVICEID, - "NVIDIA nForce MCP5 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET6_DEVICEID, - "NVIDIA nForce MCP6 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET7_DEVICEID, - "NVIDIA nForce MCP7 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET8_DEVICEID, - "NVIDIA nForce MCP8 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET9_DEVICEID, - "NVIDIA nForce MCP9 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET10_DEVICEID, - "NVIDIA nForce MCP10 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET11_DEVICEID, - "NVIDIA nForce MCP11 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET12_DEVICEID, - "NVIDIA nForce MCP12 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET13_DEVICEID, - "NVIDIA nForce MCP13 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_LAN, + "NVIDIA nForce MCP Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_LAN, + "NVIDIA nForce2 MCP2 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1, + "NVIDIA nForce2 400 MCP4 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2, + "NVIDIA nForce2 400 MCP5 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN1, + "NVIDIA nForce3 MCP3 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN, + "NVIDIA nForce3 250 MCP6 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN4, + "NVIDIA nForce3 MCP7 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN1, + "NVIDIA nForce4 CK804 MCP8 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN2, + "NVIDIA nForce4 CK804 MCP9 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN1, + "NVIDIA nForce MCP04 Networking Adapter"}, // MCP10 + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN2, + "NVIDIA nForce MCP04 Networking Adapter"}, // MCP11 + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN1, + "NVIDIA nForce 430 MCP12 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN2, + "NVIDIA nForce 430 MCP13 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN1, + "NVIDIA nForce MCP55 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN2, + "NVIDIA nForce MCP55 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN1, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN2, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN3, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN4, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN1, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN2, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN3, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN4, + "NVIDIA nForce MCP65 Networking Adapter"}, {0, 0, NULL} }; ==== //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#5 (text+ko) ==== @@ -25,29 +25,47 @@ * SUCH DAMAGE. * * $Id: if_nvreg.h,v 1.6 2004/08/12 14:00:05 q Exp $ - * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.8 2006/12/05 15:31:05 jhb Exp $ + * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.9 2008/05/31 14:17:36 remko Exp $ */ #ifndef _IF_NVEREG_H_ #define _IF_NVEREG_H_ -#ifndef NVIDIA_VENDORID -#define NVIDIA_VENDORID 0x10DE +#ifndef PCI_VENDOR_NVIDIA +#define PCI_VENDOR_NVIDIA 0x10DE #endif -#define NFORCE_MCPNET1_DEVICEID 0x01C3 -#define NFORCE_MCPNET2_DEVICEID 0x0066 -#define NFORCE_MCPNET3_DEVICEID 0x00D6 -#define NFORCE_MCPNET4_DEVICEID 0x0086 -#define NFORCE_MCPNET5_DEVICEID 0x008C -#define NFORCE_MCPNET6_DEVICEID 0x00E6 -#define NFORCE_MCPNET7_DEVICEID 0x00DF -#define NFORCE_MCPNET8_DEVICEID 0x0056 -#define NFORCE_MCPNET9_DEVICEID 0x0057 -#define NFORCE_MCPNET10_DEVICEID 0x0037 -#define NFORCE_MCPNET11_DEVICEID 0x0038 -#define NFORCE_MCPNET12_DEVICEID 0x0268 -#define NFORCE_MCPNET13_DEVICEID 0x0269 +#define PCI_PRODUCT_NVIDIA_NFORCE_LAN 0x01C3 +#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00D6 +#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 0x0086 +#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 0x008C +#define PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN 0x00E6 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00DF +#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 0x0056 +#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 0x0057 +#define PCI_PRODUCT_NVIDIA_MCP04_LAN1 0x0037 +#define PCI_PRODUCT_NVIDIA_MCP04_LAN2 0x0038 +#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 0x0268 +#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 0x0269 +#define PCI_PRODUCT_NVIDIA_MCP55_LAN1 0x0372 +#define PCI_PRODUCT_NVIDIA_MCP55_LAN2 0x0373 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN1 0x03e5 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN2 0x03e6 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee +#define PCI_PRODUCT_NVIDIA_MCP61_LAN4 0x03ef +#define PCI_PRODUCT_NVIDIA_MCP65_LAN1 0x0450 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN2 0x0451 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN3 0x0452 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN4 0x0453 + +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN +#define PCI_PRODUCT_NVIDIA_CK804_LAN1 PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 +#define PCI_PRODUCT_NVIDIA_CK804_LAN2 PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 +#define PCI_PRODUCT_NVIDIA_MCP51_LAN1 PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 +#define PCI_PRODUCT_NVIDIA_MCP51_LAN2 PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 #define NV_RID 0x10 ==== //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.7 2005/01/06 01:43:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.8 2008/05/30 21:48:05 jhb Exp $"); /* * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda. @@ -56,15 +56,6 @@ #include <net/if_arp.h> #include <net/if_media.h> -#ifdef INET -#include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> -#include <netinet/if_inarp.h> -#endif - - #include <sys/bus.h> #include <machine/bus.h> @@ -73,7 +64,7 @@ #include <dev/snc/if_sncreg.h> #include <dev/snc/dp83932subr.h> -integrate u_int16_t snc_nec16_select_bank +static __inline u_int16_t snc_nec16_select_bank (struct snc_softc *, u_int32_t, u_int32_t); /* @@ -131,27 +122,27 @@ p = SOALIGN(sc, p); - if ((p - pp) > NBPG) { + if ((p - pp) > PAGE_SIZE) { device_printf (sc->sc_dev, "sizeof RRA (%ld) + CDA (%ld) +" - "TDA (%ld) > NBPG (%d). Punt!\n", - (ulong)sc->v_cda - (ulong)sc->v_rra[0], - (ulong)sc->mtda[0].mtd_vtxp - (ulong)sc->v_cda, - (ulong)p - (ulong)sc->mtda[0].mtd_vtxp, - NBPG); + "TDA (%ld) > PAGE_SIZE (%d). Punt!\n", + (u_long)sc->v_cda - (u_long)sc->v_rra[0], + (u_long)sc->mtda[0].mtd_vtxp - (u_long)sc->v_cda, + (u_long)p - (u_long)sc->mtda[0].mtd_vtxp, + PAGE_SIZE); return(1); } - p = pp + NBPG; + p = pp + PAGE_SIZE; pp = p; - sc->sc_nrda = NBPG / RXPKT_SIZE(sc); + sc->sc_nrda = PAGE_SIZE / RXPKT_SIZE(sc); sc->v_rda = SONIC_GETDMA(p); - p = pp + NBPG; + p = pp + PAGE_SIZE; for (i = 0; i < NRBA; i++) { sc->rbuf[i] = p; - p += NBPG; + p += PAGE_SIZE; } pp = p; @@ -161,10 +152,10 @@ mtdp->mtd_vbuf = SONIC_GETDMA(p); offset += TXBSIZE; - if (offset < NBPG) { + if (offset < PAGE_SIZE) { p += TXBSIZE; } else { - p = pp + NBPG; + p = pp + PAGE_SIZE; pp = p; offset = TXBSIZE; } @@ -396,7 +387,7 @@ /* select SONIC register SNCR_CR */ bus_space_write_1(iot, ioh, SNEC_ADDR, SNCR_CR); bus_space_write_2(iot, ioh, SNEC_CTRL, CR_RXDIS | CR_STP | CR_RST); - delay(400); + DELAY(400); cr = bus_space_read_2(iot, ioh, SNEC_CTRL); if (cr != (CR_RXDIS | CR_STP | CR_RST)) { @@ -535,7 +526,7 @@ * select memory bank and map * where exists specified (internal buffer memory) offset. */ -integrate u_int16_t +static __inline u_int16_t snc_nec16_select_bank(sc, base, offset) struct snc_softc *sc; u_int32_t base; @@ -757,61 +748,61 @@ bus_space_write_1(iot, ioh, SNEC_ADDR, SNECR_EEP); bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Start EEPROM access. */ bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Pass the iteration count to the chip. */ for (bit = 0x20; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | ((n & bit) ? SNECR_EEP_DI : 0x00)); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | ((n & bit) ? SNECR_EEP_DI : 0x00)); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); } bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); (void) bus_space_read_1(iot, ioh, SNEC_CTRLB); /* ACK */ - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Read a byte. */ val = 0; for (bit = 0x80; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); @@ -825,7 +816,7 @@ for (bit = 0x80; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); @@ -835,7 +826,7 @@ *data++ = val; bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); } #ifdef SNCDEBUG @@ -871,7 +862,7 @@ for (n = 0; n < SNC_NREGS; n++) { /* select required SONIC register */ bus_space_write_1(iot, ioh, SNEC_ADDR, n); - delay(10); + DELAY(10); val = bus_space_read_2(iot, ioh, SNEC_CTRL); if ((n % 0x10) == 0) printf("\n%04x ", val); @@ -884,7 +875,7 @@ for (n = SNECR_MEMBS; n <= SNECR_IDENT; n += 2) { /* select required SONIC register */ bus_space_write_1(iot, ioh, SNEC_ADDR, n); - delay(10); + DELAY(10); val = (u_int16_t) bus_space_read_1(iot, ioh, SNEC_CTRLB); printf("%04x ", val); } ==== //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.2 2005/01/06 01:43:15 imp Exp $ */ +/* $FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.3 2008/05/30 21:48:05 jhb Exp $ */ /* $NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -57,7 +57,7 @@ #define SNEC_NREGS 6 /* bank memory size */ -#define SNEC_NMEMS (NBPG * 2) +#define SNEC_NMEMS (PAGE_SIZE * 2) /* how many bank */ #define SNEC_NBANK 0x10 /* internal buffer size */ ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.28 2008/03/12 19:09:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.29 2008/05/30 01:57:13 benno Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -258,7 +258,12 @@ ns8250_param(bas, baudrate, databits, stopbits, parity); /* Disable all interrupt sources. */ - ier = uart_getreg(bas, REG_IER) & 0xf0; + /* + * We use 0xe0 instead of 0xf0 as the mask because the XScale PXA + * UARTs split the receive time-out interrupt bit out separately as + * 0x10. This gets handled by ier_mask and ier_rxbits below. + */ + ier = uart_getreg(bas, REG_IER) & 0xe0; uart_setreg(bas, REG_IER, ier); uart_barrier(bas); @@ -332,6 +337,9 @@ uint8_t fcr; uint8_t ier; uint8_t mcr; + + uint8_t ier_mask; + uint8_t ier_rxbits; }; static int ns8250_bus_attach(struct uart_softc *); @@ -400,6 +408,19 @@ ns8250->fcr |= FCR_RX_MEDH; } else ns8250->fcr |= FCR_RX_MEDH; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812171323.mBHDNnnL080170>