PERFORCE change 147223 for review
Ed Schouten
ed at FreeBSD.org
Tue Aug 12 10:19:53 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147223
Change 147223 by ed at ed_dull on 2008/08/12 10:19:29
IFC.
Affected files ...
.. //depot/projects/mpsafetty/contrib/gcc/common.opt#2 integrate
.. //depot/projects/mpsafetty/contrib/gcc/config/i386/freebsd.h#2 integrate
.. //depot/projects/mpsafetty/contrib/gcc/doc/invoke.texi#2 integrate
.. //depot/projects/mpsafetty/etc/periodic/security/550.ipfwlimit#2 integrate
.. //depot/projects/mpsafetty/games/random/random.c#4 integrate
.. //depot/projects/mpsafetty/games/random/randomize_fd.c#4 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_tar_large.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_ustar_filenames.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/Makefile#5 integrate
.. //depot/projects/mpsafetty/share/man/man4/man4.i386/glxsb.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/miibus.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/upgt.4#1 branch
.. //depot/projects/mpsafetty/sys/amd64/amd64/db_disasm.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/mpsafetty/sys/conf/files#11 integrate
.. //depot/projects/mpsafetty/sys/dev/aha/aha.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_lro.c#2 delete
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb_hash.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/iicbus/ds1339.c#3 delete
.. //depot/projects/mpsafetty/sys/dev/iicbus/ds133x.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/if_upgt.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb/if_upgtvar.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/db_disasm.c#2 integrate
.. //depot/projects/mpsafetty/sys/modules/Makefile#9 integrate
.. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/mpsafetty/sys/modules/upgt/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/net/if_enc.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_enc.h#1 branch
.. //depot/projects/mpsafetty/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit.c#4 integrate
.. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn_dev.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/gnttab.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/gnttab.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/COPYING#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/acm.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/acm_ops.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-ia64.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-powerpc.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-x86_32.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/arch-x86_64.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/callback.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/dom0_ops.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/domctl.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/elfnote.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/elfstructs.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/event_channel.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/features.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/foreign/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkchecker.py#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkheader.py#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/foreign/reference.size#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/foreign/structs.py#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/grant_table.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/e820.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/hvm_info_table.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/hvm_op.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/ioreq.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/params.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/save.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/hvm/vmx_assist.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/blkif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/console.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/fbif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/kbdif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/netif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/pciif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/protocols.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/ring.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/tpmif.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/xenbus.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/io/xs_wire.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/kexec.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/libelf.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/memory.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/nmi.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/physdev.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/platform.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/sched.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/sysctl.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/trace.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/vcpu.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/version.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/xen-compat.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/xen.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/xencomm.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/interface/xenoprof.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/init.txt#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_client.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_comms.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_comms.h#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_dev.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe_backend.c#1 branch
.. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_xs.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/devices.c#2 integrate
Differences ...
==== //depot/projects/mpsafetty/contrib/gcc/common.opt#2 (text+ko) ====
@@ -578,7 +578,7 @@
Does nothing. Preserved for backward compatibility.
fmath-errno
-Common Report Var(flag_errno_math) Init(1)
+Common Report Var(flag_errno_math) Init(0)
Set errno after built-in math functions
fmem-report
==== //depot/projects/mpsafetty/contrib/gcc/config/i386/freebsd.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.76 2008/08/10 19:02:57 das Exp $ */
#undef CC1_SPEC
#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -86,11 +86,6 @@
#define TARGET_ELF 1
-/* This goes away when the math emulator is fixed. */
-#undef TARGET_SUBTARGET_DEFAULT
-#define TARGET_SUBTARGET_DEFAULT \
- (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
-
/* Don't default to pcc-struct-return, we want to retain compatibility with
older gcc versions AND pcc-struct-return is nonreentrant.
(even though the SVR4 ABI for the i386 says that records and unions are
==== //depot/projects/mpsafetty/contrib/gcc/doc/invoke.texi#2 (text+ko) ====
@@ -5677,7 +5677,8 @@
The default is @option{-fmath-errno}.
-On Darwin systems, the math library never sets @code{errno}. There is therefore
+On Darwin and FreeBSD systems, the math library never sets @code{errno}.
+There is therefore
no reason for the compiler to consider the possibility that it might,
and @option{-fno-math-errno} is the default.
@@ -9507,7 +9508,7 @@
@opindex mno-fancy-math-387
Some 387 emulators do not support the @code{sin}, @code{cos} and
@code{sqrt} instructions for the 387. Specify this option to avoid
-generating those instructions. This option is the default on FreeBSD,
+generating those instructions. This option is the default on
OpenBSD and NetBSD at . This option is overridden when @option{-march}
indicates that the target cpu will always have an FPU and so the
instruction will not need emulation. As of revision 2.6.1, these
==== //depot/projects/mpsafetty/etc/periodic/security/550.ipfwlimit#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.10 2005/09/11 14:29:58 maxim Exp $
+# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.11 2008/08/10 18:11:24 antoine Exp $
#
# Show ipfw rules which have reached the log limit
@@ -42,19 +42,16 @@
case "$daily_status_security_ipfwlimit_enable" in
[Yy][Ee][Ss])
- IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null`
- if [ $? -ne 0 ]; then
+ IPFW_VERBOSE=`sysctl -n net.inet.ip.fw.verbose 2> /dev/null`
+ if [ $? -ne 0 ] || [ "$IPFW_VERBOSE" -eq 0 ]; then
exit 0
fi
TMP=`mktemp -t security`
ipfw -a list | grep " log " | \
grep '^[[:digit:]]\+[[:space:]]\+[[:digit:]]\+' | \
- awk -v limit="$IPFW_LOG_LIMIT" \
+ awk \
'{if ($6 == "logamount") {
if ($2 > $7)
- {print $0}
- } else {
- if ($2 > limit)
{print $0}}
}' > ${TMP}
==== //depot/projects/mpsafetty/games/random/random.c#4 (text+ko) ====
@@ -46,7 +46,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/games/random/random.c,v 1.23 2008/08/10 11:31:56 ache Exp $");
+__FBSDID("$FreeBSD: src/games/random/random.c,v 1.24 2008/08/11 23:24:42 ache Exp $");
#include <sys/types.h>
@@ -180,7 +180,8 @@
err(2, "stdout");
/* Now see if the next line is to be printed. */
- selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0;
+ selected = (int)(denom * random() /
+ RANDOM_MAX_PLUS1) == 0;
}
}
if (ferror(stdin))
==== //depot/projects/mpsafetty/games/random/randomize_fd.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.6 2008/08/10 11:31:56 ache Exp $");
+__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.7 2008/08/11 23:24:42 ache Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,10 +48,13 @@
{
struct rand_node *n;
- n = (struct rand_node *)calloc(1, sizeof(struct rand_node));
+ n = (struct rand_node *)malloc(sizeof(struct rand_node));
if (n == NULL)
- err(1, "calloc");
+ err(1, "malloc");
+ n->len = 0;
+ n->cp = NULL;
+ n->next = NULL;
return(n);
}
@@ -212,8 +215,10 @@
if (n->cp == NULL)
break;
- if ((int)(denom * random() / RANDOM_MAX_PLUS1) == 0) {
- ret = printf("%.*s", (int)n->len - 1, n->cp);
+ if ((int)(denom * random() /
+ RANDOM_MAX_PLUS1) == 0) {
+ ret = printf("%.*s",
+ (int)n->len - 1, n->cp);
if (ret < 0)
err(1, "printf");
}
==== //depot/projects/mpsafetty/lib/libarchive/test/test_compat_tar_hardlink.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
/*
* Background: There are two written standards for the tar file format.
@@ -93,7 +93,11 @@
assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);
assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_read_finish(a);
+#else
assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
+#endif
}
DEFINE_TEST(test_compat_tar_hardlink)
==== //depot/projects/mpsafetty/lib/libarchive/test/test_pax_filename_encoding.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
#include <locale.h>
@@ -149,7 +149,11 @@
archive_entry_free(entry);
assertEqualInt(0, archive_write_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_write_finish(a);
+#else
assertEqualInt(0, archive_write_finish(a));
+#endif
/*
* Now read the entries back.
@@ -175,7 +179,11 @@
assertEqualString(longname, archive_entry_pathname(entry));
assertEqualInt(0, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_read_finish(a);
+#else
assertEqualInt(0, archive_read_finish(a));
+#endif
}
/*
@@ -249,7 +257,11 @@
archive_entry_free(entry);
assertEqualInt(0, archive_write_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_write_finish(a);
+#else
assertEqualInt(0, archive_write_finish(a));
+#endif
/*
* Now read the entries back.
@@ -293,5 +305,9 @@
assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry));
assertEqualInt(0, archive_read_close(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_read_finish(a);
+#else
assertEqualInt(0, archive_read_finish(a));
+#endif
}
==== //depot/projects/mpsafetty/lib/libarchive/test/test_tar_large.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.3 2008/08/10 21:14:26 kientzle Exp $");
#include <errno.h>
#include <stdlib.h>
@@ -179,7 +179,6 @@
#else
static off_t
memory_read_skip(struct archive *a, void *_private, off_t skip)
-#endif
{
struct memdata *private = _private;
@@ -198,6 +197,7 @@
}
return (skip);
}
+#endif
DEFINE_TEST(test_tar_large)
{
==== //depot/projects/mpsafetty/lib/libarchive/test/test_ustar_filenames.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $");
/*
* Exercise various lengths of filenames in ustar archives.
@@ -111,7 +111,11 @@
/* Close out the archive. */
assertA(0 == archive_write_close(a));
- assertA(0 == archive_write_finish(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_write_finish(a);
+#else
+ assertEqualInt(0, archive_write_finish(a));
+#endif
/*
* Now, read the data back.
@@ -153,7 +157,11 @@
failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen);
assertEqualInt(1, archive_read_next_header(a, &ae));
assert(0 == archive_read_close(a));
- assert(0 == archive_read_finish(a));
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_read_finish(a);
+#else
+ assertEqualInt(0, archive_read_finish(a));
+#endif
}
DEFINE_TEST(test_ustar_filenames)
==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_hardlink.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
#define UMASK 022
@@ -131,7 +131,11 @@
assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
archive_entry_free(ae);
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_write_finish(ad);
+#else
assertEqualInt(0, archive_write_finish(ad));
+#endif
/* Test the entries on disk. */
assert(0 == stat("link1a", &st));
==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_tar_ustar.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $");
static int
is_null(const char *p, size_t l)
@@ -188,7 +188,11 @@
assertEqualIntA(a, 0, archive_write_header(a, entry));
archive_entry_free(entry);
+#if ARCHIVE_VERSION_NUMBER < 2000000
+ archive_write_finish(a);
+#else
assert(0 == archive_write_finish(a));
+#endif
/*
* Verify the archive format.
==== //depot/projects/mpsafetty/share/man/man4/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.423 2008/08/08 16:26:53 stas Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.424 2008/08/11 04:48:34 weongyo Exp $
MAN= aac.4 \
acpi.4 \
@@ -396,6 +396,7 @@
umodem.4 \
ums.4 \
unix.4 \
+ upgt.4 \
uplcom.4 \
ural.4 \
urio.4 \
==== //depot/projects/mpsafetty/share/man/man4/man4.i386/glxsb.4#2 (text+ko) ====
@@ -14,7 +14,7 @@
.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.2 2008/08/09 15:09:51 philip Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.3 2008/08/11 08:42:31 brueffer Exp $
.\"
.Dd June 8, 2008
.Dt GLXSB 4 i386
@@ -37,7 +37,6 @@
.Bd -literal -offset indent
glxsb_load="YES"
.Ed
-.Pp
.Sh DESCRIPTION
The
.Nm
@@ -54,7 +53,7 @@
.Nm
also supports acceleration of AES-128-CBC operations for
.Xr crypto 4 .
-It also register itself to accelerate other HMAC algorithms, although
+It also registers itself to accelerate other HMAC algorithms, although
there is no hardware acceleration for those algorithms.
This is only needed so
.Nm
@@ -64,9 +63,10 @@
The
.Xr crypto 9
framework will fail to open the crypto session on the device if the AES
-key's length is != 128 bits. This prevents the use of the
+key's length is != 128 bits.
+This prevents the use of the
.Nm
-device driver with AES key's length != 128 bits.
+device driver with AES keys of length != 128 bits.
.Sh SEE ALSO
.Xr crypto 4 ,
.Xr intro 4 ,
@@ -81,7 +81,7 @@
.Ox 4.1 .
The
.Nm
-device driver was imported to
+device driver was imported into
.Fx 8.0 .
.Sh AUTHORS
.An -nosplit
==== //depot/projects/mpsafetty/share/man/man4/miibus.4#2 (text+ko) ====
@@ -6,9 +6,9 @@
.\" Originally this file looked much like the NetBSD mii(4) manual page, but
.\" I doubt you would ever notice due to large differences.
.\"
-.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.23 2008/05/27 02:07:30 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.24 2008/08/12 01:17:34 kevlo Exp $
.\"
-.Dd May 27, 2008
+.Dd June 20, 2008
.Dt MIIBUS 4
.Os
.Sh NAME
@@ -61,6 +61,8 @@
DEC/Intel 21143 and various workalikes
.It Xr ed 4
NE[12]000, SMC Ultra, 3c503, DS8390 cards
+.It Xr et 4
+Agere ET1310 Gigabit Ethernet
.It Xr fxp 4
Intel EtherExpress PRO/100B
.It Xr gem 4
@@ -131,6 +133,7 @@
.Xr bge 4 ,
.Xr dc 4 ,
.Xr ed 4 ,
+.Xr et 4 ,
.Xr fxp 4 ,
.Xr gem 4 ,
.Xr hme 4 ,
==== //depot/projects/mpsafetty/sys/amd64/amd64/db_disasm.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $");
/*
* Instruction disassembler.
@@ -164,15 +164,37 @@
""
};
+static const char * const db_Grp15[] = {
+ "fxsave",
+ "fxrstor",
+ "ldmxcsr",
+ "stmxcsr",
+ "",
+ "",
+ "",
+ "clflush"
+};
+
+static const char * const db_Grp15b[] = {
+ "",
+ "",
+ "",
+ "",
+ "",
+ "lfence",
+ "mfence",
+ "sfence"
+};
+
static const struct inst db_inst_0f0x[] = {
/*00*/ { "", TRUE, NONE, op1(Ew), db_Grp6 },
/*01*/ { "", TRUE, NONE, op1(Ew), db_Grp7 },
/*02*/ { "lar", TRUE, LONG, op2(E,R), 0 },
/*03*/ { "lsl", TRUE, LONG, op2(E,R), 0 },
/*04*/ { "", FALSE, NONE, 0, 0 },
-/*05*/ { "", FALSE, NONE, 0, 0 },
+/*05*/ { "syscall",FALSE,NONE, 0, 0 },
/*06*/ { "clts", FALSE, NONE, 0, 0 },
-/*07*/ { "", FALSE, NONE, 0, 0 },
+/*07*/ { "sysret",FALSE, NONE, 0, 0 },
/*08*/ { "invd", FALSE, NONE, 0, 0 },
/*09*/ { "wbinvd",FALSE, NONE, 0, 0 },
@@ -209,10 +231,10 @@
/*31*/ { "rdtsc", FALSE, NONE, 0, 0 },
/*32*/ { "rdmsr", FALSE, NONE, 0, 0 },
/*33*/ { "rdpmc", FALSE, NONE, 0, 0 },
-/*34*/ { "", FALSE, NONE, 0, 0 },
-/*35*/ { "", FALSE, NONE, 0, 0 },
+/*34*/ { "sysenter",FALSE,NONE, 0, 0 },
+/*35*/ { "sysexit",FALSE,NONE, 0, 0 },
/*36*/ { "", FALSE, NONE, 0, 0 },
-/*37*/ { "", FALSE, NONE, 0, 0 },
+/*37*/ { "getsec",FALSE, NONE, 0, 0 },
/*38*/ { "", FALSE, NONE, 0, 0 },
/*39*/ { "", FALSE, NONE, 0, 0 },
@@ -300,8 +322,8 @@
/*ab*/ { "bts", TRUE, LONG, op2(R,E), 0 },
/*ac*/ { "shrd", TRUE, LONG, op3(Ib,R,E), 0 },
/*ad*/ { "shrd", TRUE, LONG, op3(CL,R,E), 0 },
-/*a6*/ { "", FALSE, NONE, 0, 0 },
-/*a7*/ { "imul", TRUE, LONG, op2(E,R), 0 },
+/*ae*/ { "", TRUE, LONG, op1(E), db_Grp15 },
+/*af*/ { "imul", TRUE, LONG, op2(E,R), 0 },
};
static const struct inst db_inst_0fbx[] = {
@@ -1123,6 +1145,7 @@
boolean_t first;
int displ;
int prefix;
+ int rep;
int imm;
int imm2;
long imm64;
@@ -1137,6 +1160,7 @@
/*
* Get prefixes
*/
+ rep = FALSE;
prefix = TRUE;
do {
switch (inst) {
@@ -1171,7 +1195,7 @@
db_printf("repne ");
break;
case 0xf3:
- db_printf("repe "); /* XXX repe VS rep */
+ rep = TRUE;
break;
default:
prefix = FALSE;
@@ -1184,6 +1208,14 @@
if (prefix) {
get_value_inc(inst, loc, 1, FALSE);
}
+ if (rep == TRUE) {
+ if (inst == 0x90) {
+ db_printf("pause\n");
+ return (loc);
+ }
+ db_printf("repe "); /* XXX repe VS rep */
+ rep = FALSE;
+ }
} while (prefix);
if (inst >= 0xd8 && inst <= 0xdf) {
@@ -1216,7 +1248,8 @@
if (ip->i_extra == db_Grp1 || ip->i_extra == db_Grp2 ||
ip->i_extra == db_Grp6 || ip->i_extra == db_Grp7 ||
- ip->i_extra == db_Grp8 || ip->i_extra == db_Grp9) {
+ ip->i_extra == db_Grp8 || ip->i_extra == db_Grp9 ||
+ ip->i_extra == db_Grp15) {
i_name = ((const char * const *)ip->i_extra)[f_reg(rex, regmodrm)];
}
else if (ip->i_extra == db_Grp3) {
@@ -1233,6 +1266,32 @@
i_size = ip->i_size;
}
+ /* Special cases that don't fit well in the tables. */
+ if (ip->i_extra == db_Grp7 && f_mod(rex, regmodrm) == 3) {
+ switch (regmodrm) {
+ case 0xc8:
+ i_name = "monitor";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xc9:
+ i_name = "mwait";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ case 0xf8:
+ i_name = "swapgs";
+ i_size = NONE;
+ i_mode = 0;
+ break;
+ }
+ }
+ if (ip->i_extra == db_Grp15 && f_mod(rex, regmodrm) == 3) {
+ i_name = db_Grp15b[f_reg(rex, regmodrm)];
+ i_size = NONE;
+ i_mode = 0;
+ }
+
if (i_size == SDEP) {
if (size == WORD)
db_printf("%s", i_name);
==== //depot/projects/mpsafetty/sys/boot/forth/loader.conf#4 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.130 2008/08/04 16:13:42 rpaulo Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.131 2008/08/11 04:54:43 weongyo Exp $
##############################################################
### Basic configuration options ############################
@@ -272,6 +272,7 @@
if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990)
if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet
if_udav_load="NO" # Davicom DM9601 USB Ethernet
+if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless
if_ural_load="NO" # Ralink Technology USB wireless
if_vr_load="NO" # VIA Rhine I and Rhine II
if_vx_load="NO" # 3Com 3C590 family
==== //depot/projects/mpsafetty/sys/conf/files#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1323 2008/08/10 10:00:14 imp Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1325 2008/08/12 00:27:32 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -515,7 +515,6 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
dev/cxgb/cxgb_offload.c optional cxgb pci
-dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/cxgb_multiq.c optional cxgb pci
dev/cxgb/common/cxgb_mc5.c optional cxgb pci
@@ -697,7 +696,7 @@
dev/ieee488/tnt4882.c optional tnt4882
dev/ieee488/upd7210.c optional pcii | tnt4882
dev/iicbus/ad7418.c optional ad7418
-dev/iicbus/ds1339.c optional ds1339
+dev/iicbus/ds133x.c optional ds133x
dev/iicbus/ds1672.c optional ds1672
dev/iicbus/icee.c optional icee
dev/iicbus/if_ic.c optional ic
==== //depot/projects/mpsafetty/sys/dev/aha/aha.c#2 (text+ko) ====
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.64 2007/06/17 05:55:46 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aha/aha.c,v 1.65 2008/08/10 15:10:39 keramida Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -121,7 +121,7 @@
#define aha_a24tou(s3) \
(((s3)[0] << 16) | ((s3)[1] << 8) | (s3)[2])
-/* CCB Mangement functions */
+/* CCB Management functions */
static __inline uint32_t ahaccbvtop(struct aha_softc *aha,
struct aha_ccb *accb);
static __inline struct aha_ccb* ahaccbptov(struct aha_softc *aha,
==== //depot/projects/mpsafetty/sys/dev/bfe/if_bfe.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.48 2008/07/29 09:02:00 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.50 2008/08/11 01:49:46 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,15 +171,13 @@
bfe_probe(device_t dev)
{
struct bfe_type *t;
- uint16_t vendor, devid;
t = bfe_devs;
- vendor = pci_get_vendor(dev);
- devid = pci_get_device(dev);
while (t->bfe_name != NULL) {
- if (vendor == t->bfe_vid && devid == t->bfe_did) {
- device_set_desc_copy(dev, t->bfe_name);
+ if (pci_get_vendor(dev) == t->bfe_vid &&
+ pci_get_device(dev) == t->bfe_did) {
+ device_set_desc(dev, t->bfe_name);
return (BUS_PROBE_DEFAULT);
}
t++;
==== //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.6 2008/07/18 06:12:31 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.7 2008/08/11 23:01:34 kmacy Exp $");
#ifdef CONFIG_DEFINED
#include <cxgb_include.h>
@@ -40,6 +40,13 @@
#define msleep t3_os_sleep
enum {
+ PMD_RSD = 10, /* PMA/PMD receive signal detect register */
+ PCS_STAT1_X = 24, /* 10GBASE-X PCS status 1 register */
+ PCS_STAT1_R = 32, /* 10GBASE-R PCS status 1 register */
+ XS_LN_STAT = 24 /* XS lane status register */
+};
+
+enum {
AEL100X_TX_DISABLE = 9,
AEL100X_TX_CONFIG1 = 0xc002,
AEL1002_PWR_DOWN_HI = 0xc011,
@@ -47,8 +54,20 @@
AEL1002_XFI_EQL = 0xc015,
AEL1002_LB_EN = 0xc017,
AEL_OPT_SETTINGS = 0xc017,
+ AEL_I2C_CTRL = 0xc30a,
+ AEL_I2C_DATA = 0xc30b,
+ AEL_I2C_STAT = 0xc30c,
+ AEL2005_GPIO_CTRL = 0xc214,
+ AEL2005_GPIO_STAT = 0xc215,
};
+enum { edc_none, edc_sr, edc_twinax };
+
+/* PHY module I2C device address */
+#define MODULE_DEV_ADDR 0xa0
+
+#define AEL2005_MODDET_IRQ 4
+
struct reg_val {
unsigned short mmd_addr;
unsigned short reg_addr;
@@ -112,23 +131,23 @@
return 0;
}
-static int ael100x_get_link_status(struct cphy *phy, int *link_ok,
- int *speed, int *duplex, int *fc)
+/*
+ * Get link status for a 10GBASE-R device.
+ */
+static int get_link_status_r(struct cphy *phy, int *link_ok, int *speed,
+ int *duplex, int *fc)
{
if (link_ok) {
- unsigned int status;
- int err = mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMSR, &status);
+ unsigned int stat0, stat1, stat2;
+ int err = mdio_read(phy, MDIO_DEV_PMA_PMD, PMD_RSD, &stat0);
- /*
- * BMSR_LSTATUS is latch-low, so if it is 0 we need to read it
- * once more to get the current link state.
- */
- if (!err && !(status & BMSR_LSTATUS))
- err = mdio_read(phy, MDIO_DEV_PMA_PMD, MII_BMSR,
- &status);
+ if (!err)
+ err = mdio_read(phy, MDIO_DEV_PCS, PCS_STAT1_R, &stat1);
+ if (!err)
+ err = mdio_read(phy, MDIO_DEV_XGXS, XS_LN_STAT, &stat2);
if (err)
return err;
- *link_ok = !!(status & BMSR_LSTATUS);
+ *link_ok = (stat0 & stat1 & (stat2 >> 12)) & 1;
}
if (speed)
*speed = SPEED_10000;
@@ -149,7 +168,7 @@
NULL,
NULL,
NULL,
- ael100x_get_link_status,
+ get_link_status_r,
ael1002_power_down,
};
#else
@@ -159,7 +178,7 @@
.intr_disable = ael1002_intr_noop,
.intr_clear = ael1002_intr_noop,
.intr_handler = ael1002_intr_noop,
- .get_link_status = ael100x_get_link_status,
+ .get_link_status = get_link_status_r,
.power_down = ael1002_power_down,
};
#endif
@@ -197,7 +216,7 @@
NULL,
NULL,
NULL,
- ael100x_get_link_status,
+ get_link_status_r,
ael1006_power_down,
};
#else
@@ -207,7 +226,7 @@
.intr_disable = t3_phy_lasi_intr_disable,
.intr_clear = t3_phy_lasi_intr_clear,
.intr_handler = t3_phy_lasi_intr_handler,
- .get_link_status = ael100x_get_link_status,
+ .get_link_status = get_link_status_r,
.power_down = ael1006_power_down,
};
#endif
@@ -224,6 +243,12 @@
static int ael2005_setup_sr_edc(struct cphy *phy)
{
+ static struct reg_val regs[] = {
+ { MDIO_DEV_PMA_PMD, 0xc003, 0xffff, 0x181 },
+ { MDIO_DEV_PMA_PMD, 0xc010, 0xffff, 0x448a },
+ { MDIO_DEV_PMA_PMD, 0xc04a, 0xffff, 0x5200 },
+ { 0, 0, 0, 0 }
+ };
static u16 sr_edc[] = {
0xcc00, 0x2ff4,
0xcc01, 0x3cd4,
@@ -499,12 +524,510 @@
};
int i, err;
- for (err = i = 0; i < ARRAY_SIZE(sr_edc) && !err; i += 2)
+ err = set_phy_regs(phy, regs);
+ if (err)
+ return err;
+
+ msleep(50);
+
+ for (i = 0; i < ARRAY_SIZE(sr_edc) && !err; i += 2)
err = mdio_write(phy, MDIO_DEV_PMA_PMD, sr_edc[i],
sr_edc[i + 1]);
+ if (!err)
+ phy->priv = edc_sr;
+ return err;
+}
+
+static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype)
+{
+ static struct reg_val regs[] = {
+ { MDIO_DEV_PMA_PMD, 0xc04a, 0xffff, 0x5a00 },
+ { 0, 0, 0, 0 }
+ };
+ static struct reg_val preemphasis[] = {
+ { MDIO_DEV_PMA_PMD, 0xc014, 0xffff, 0xfe16 },
+ { MDIO_DEV_PMA_PMD, 0xc015, 0xffff, 0xa000 },
+ { 0, 0, 0, 0 }
+ };
+ static u16 twinax_edc[] = {
+ 0xcc00, 0x4009,
+ 0xcc01, 0x27ff,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list