svn commit: r193409 - in projects/acpica_20090521: . etc/defaults
etc/periodic/daily etc/rc.d lib/bind lib/libusb lib/msun/src
sbin/fsck_ffs sbin/mksnap_ffs share/examples/kld/dyn_sysctl
share/exam...
Jung-uk Kim
jkim at FreeBSD.org
Wed Jun 3 22:54:30 UTC 2009
Author: jkim
Date: Wed Jun 3 22:54:27 2009
New Revision: 193409
URL: http://svn.freebsd.org/changeset/base/193409
Log:
Resync with head.
Added:
projects/acpica_20090521/etc/rc.d/nfscbd
- copied unchanged from r193408, head/etc/rc.d/nfscbd
projects/acpica_20090521/etc/rc.d/nfsuserd
- copied unchanged from r193408, head/etc/rc.d/nfsuserd
projects/acpica_20090521/tools/build/options/WITH_BIND_IDN
- copied unchanged from r193408, head/tools/build/options/WITH_BIND_IDN
projects/acpica_20090521/tools/build/options/WITH_BIND_LARGE_FILE
- copied unchanged from r193408, head/tools/build/options/WITH_BIND_LARGE_FILE
projects/acpica_20090521/tools/build/options/WITH_BIND_SIGCHASE
- copied unchanged from r193408, head/tools/build/options/WITH_BIND_SIGCHASE
projects/acpica_20090521/tools/build/options/WITH_BIND_XML
- copied unchanged from r193408, head/tools/build/options/WITH_BIND_XML
projects/acpica_20090521/usr.bin/ee/nls/hu_HU.ISO8859-2/
- copied from r193408, head/usr.bin/ee/nls/hu_HU.ISO8859-2/
Replaced:
projects/acpica_20090521/tools/build/options/WITH_BIND_LIBS
- copied unchanged from r193408, head/tools/build/options/WITH_BIND_LIBS
Deleted:
projects/acpica_20090521/sys/amd64/conf/MAC
projects/acpica_20090521/sys/gnu/fs/ext2fs/sparc64-bitops.h
projects/acpica_20090521/sys/i386/conf/MAC
projects/acpica_20090521/sys/ia64/conf/MAC
projects/acpica_20090521/sys/pc98/conf/MAC
projects/acpica_20090521/sys/powerpc/conf/MAC
projects/acpica_20090521/sys/sparc64/conf/MAC
projects/acpica_20090521/sys/sun4v/conf/MAC
projects/acpica_20090521/usr.bin/window/
Modified:
projects/acpica_20090521/ (props changed)
projects/acpica_20090521/ObsoleteFiles.inc
projects/acpica_20090521/UPDATING
projects/acpica_20090521/etc/defaults/rc.conf
projects/acpica_20090521/etc/periodic/daily/100.clean-disks
projects/acpica_20090521/etc/rc.d/Makefile
projects/acpica_20090521/etc/rc.d/mountd
projects/acpica_20090521/etc/rc.d/nfsd
projects/acpica_20090521/lib/bind/config.mk
projects/acpica_20090521/lib/libusb/ (props changed)
projects/acpica_20090521/lib/libusb/libusb.3 (contents, props changed)
projects/acpica_20090521/lib/libusb/libusb20.c
projects/acpica_20090521/lib/libusb/libusb20.h
projects/acpica_20090521/lib/msun/src/e_rem_pio2.c
projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c
projects/acpica_20090521/lib/msun/src/k_cosf.c
projects/acpica_20090521/lib/msun/src/k_sinf.c
projects/acpica_20090521/lib/msun/src/k_tanf.c
projects/acpica_20090521/lib/msun/src/math_private.h
projects/acpica_20090521/sbin/fsck_ffs/fsck.h
projects/acpica_20090521/sbin/fsck_ffs/gjournal.c
projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c
projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c
projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c
projects/acpica_20090521/share/man/man4/msk.4
projects/acpica_20090521/share/man/man5/src.conf.5
projects/acpica_20090521/share/mk/bsd.own.mk
projects/acpica_20090521/sys/amd64/conf/GENERIC
projects/acpica_20090521/sys/boot/uboot/lib/disk.c
projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile
projects/acpica_20090521/sys/dev/ata/ata-all.h
projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c
projects/acpica_20090521/sys/dev/ath/if_ath.c
projects/acpica_20090521/sys/dev/bwi/if_bwi.c
projects/acpica_20090521/sys/dev/if_ndis/if_ndis.c
projects/acpica_20090521/sys/dev/iir/iir.c
projects/acpica_20090521/sys/dev/iir/iir_ctrl.c
projects/acpica_20090521/sys/dev/ksyms/ksyms.c
projects/acpica_20090521/sys/dev/mii/e1000phy.c
projects/acpica_20090521/sys/dev/mii/e1000phyreg.h
projects/acpica_20090521/sys/dev/msk/if_msk.c
projects/acpica_20090521/sys/dev/msk/if_mskreg.h
projects/acpica_20090521/sys/dev/mxge/if_mxge.c
projects/acpica_20090521/sys/dev/mxge/if_mxge_var.h
projects/acpica_20090521/sys/dev/pci/pci.c
projects/acpica_20090521/sys/dev/puc/pucdata.c
projects/acpica_20090521/sys/dev/usb/input/ukbd.c
projects/acpica_20090521/sys/dev/usb/usb_compat_linux.h
projects/acpica_20090521/sys/dev/usb/usb_dev.c
projects/acpica_20090521/sys/dev/usb/usb_dev.h
projects/acpica_20090521/sys/dev/usb/usb_request.c
projects/acpica_20090521/sys/dev/xen/netfront/ (props changed)
projects/acpica_20090521/sys/dev/xen/xenpci/ (props changed)
projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_fs.h
projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_fs_sb.h
projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_lookup.c
projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_vfsops.c
projects/acpica_20090521/sys/gnu/fs/ext2fs/ext2_vnops.c
projects/acpica_20090521/sys/i386/conf/GENERIC
projects/acpica_20090521/sys/ia64/conf/GENERIC
projects/acpica_20090521/sys/kern/kern_descrip.c
projects/acpica_20090521/sys/kern/kern_lock.c
projects/acpica_20090521/sys/kern/kern_prot.c
projects/acpica_20090521/sys/kern/kern_rwlock.c
projects/acpica_20090521/sys/kern/kern_sx.c
projects/acpica_20090521/sys/kern/sys_socket.c
projects/acpica_20090521/sys/kern/uipc_mbuf.c
projects/acpica_20090521/sys/kern/uipc_shm.c
projects/acpica_20090521/sys/kern/uipc_socket.c
projects/acpica_20090521/sys/kern/uipc_syscalls.c
projects/acpica_20090521/sys/kern/uipc_usrreq.c
projects/acpica_20090521/sys/modules/dtrace/dtnfsclient/ (props changed)
projects/acpica_20090521/sys/modules/ip6_mroute_mod/ (props changed)
projects/acpica_20090521/sys/modules/ipmi/ipmi_linux/ (props changed)
projects/acpica_20090521/sys/net/if.c
projects/acpica_20090521/sys/net80211/ieee80211.c
projects/acpica_20090521/sys/net80211/ieee80211_ddb.c
projects/acpica_20090521/sys/net80211/ieee80211_freebsd.c
projects/acpica_20090521/sys/net80211/ieee80211_hostap.c
projects/acpica_20090521/sys/net80211/ieee80211_input.c
projects/acpica_20090521/sys/net80211/ieee80211_ioctl.c
projects/acpica_20090521/sys/net80211/ieee80211_monitor.c
projects/acpica_20090521/sys/net80211/ieee80211_proto.c
projects/acpica_20090521/sys/net80211/ieee80211_radiotap.c
projects/acpica_20090521/sys/net80211/ieee80211_scan.c
projects/acpica_20090521/sys/net80211/ieee80211_var.h
projects/acpica_20090521/sys/netatalk/ddp_input.c
projects/acpica_20090521/sys/netinet/in_pcb.c
projects/acpica_20090521/sys/netinet/ip_divert.c
projects/acpica_20090521/sys/netinet/tcp_input.c
projects/acpica_20090521/sys/netinet/tcp_syncache.c
projects/acpica_20090521/sys/pc98/conf/GENERIC
projects/acpica_20090521/sys/powerpc/conf/GENERIC
projects/acpica_20090521/sys/rpc/svc_vc.c
projects/acpica_20090521/sys/security/mac/mac_atalk.c
projects/acpica_20090521/sys/security/mac/mac_framework.c
projects/acpica_20090521/sys/security/mac/mac_inet.c
projects/acpica_20090521/sys/security/mac/mac_inet6.c
projects/acpica_20090521/sys/security/mac/mac_internal.h
projects/acpica_20090521/sys/security/mac/mac_net.c
projects/acpica_20090521/sys/security/mac/mac_socket.c
projects/acpica_20090521/sys/security/mac_biba/mac_biba.c
projects/acpica_20090521/sys/security/mac_lomac/mac_lomac.c
projects/acpica_20090521/sys/security/mac_mls/mac_mls.c
projects/acpica_20090521/sys/security/mac_stub/mac_stub.c
projects/acpica_20090521/sys/security/mac_test/mac_test.c
projects/acpica_20090521/sys/sparc64/conf/GENERIC
projects/acpica_20090521/sys/sun4v/conf/GENERIC
projects/acpica_20090521/sys/sun4v/include/pcpu.h
projects/acpica_20090521/sys/sys/pmc.h
projects/acpica_20090521/sys/sys/vnode.h
projects/acpica_20090521/sys/ufs/ffs/ffs_softdep.c
projects/acpica_20090521/sys/ufs/ufs/dirhash.h
projects/acpica_20090521/sys/ufs/ufs/ufs_dirhash.c
projects/acpica_20090521/sys/vm/vnode_pager.c
projects/acpica_20090521/tools/regression/fstest/fstest.c
projects/acpica_20090521/tools/regression/lib/msun/test-conj.t (props changed)
projects/acpica_20090521/tools/tools/ath/common/dumpregs.h (props changed)
projects/acpica_20090521/tools/tools/ath/common/dumpregs_5210.c (props changed)
projects/acpica_20090521/tools/tools/ath/common/dumpregs_5211.c (props changed)
projects/acpica_20090521/tools/tools/ath/common/dumpregs_5212.c (props changed)
projects/acpica_20090521/tools/tools/ath/common/dumpregs_5416.c (props changed)
projects/acpica_20090521/usr.bin/Makefile
projects/acpica_20090521/usr.bin/dig/Makefile
projects/acpica_20090521/usr.bin/ee/Makefile
projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
projects/acpica_20090521/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/acpica_20090521/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/acpica_20090521/usr.sbin/makefs/getid.c (props changed)
projects/acpica_20090521/usr.sbin/named/Makefile
projects/acpica_20090521/usr.sbin/nfsd/nfsv4.4
projects/acpica_20090521/usr.sbin/pmcstat/pmcstat.8
Modified: projects/acpica_20090521/ObsoleteFiles.inc
==============================================================================
--- projects/acpica_20090521/ObsoleteFiles.inc Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/ObsoleteFiles.inc Wed Jun 3 22:54:27 2009 (r193409)
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090602: removal of window(1)
+OLD_FILES+=usr/bin/window
+OLD_FILES+=usr/share/man/man1/window.1.gz
# 20090530: removal of early.sh
OLD_FILES+=etc/rc.d/early.sh
# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
Modified: projects/acpica_20090521/UPDATING
==============================================================================
--- projects/acpica_20090521/UPDATING Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/UPDATING Wed Jun 3 22:54:27 2009 (r193409)
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090602:
+ window(1) has been removed from the base system. It can now be
+ installed from ports. The port is called misc/window.
+
20090601:
The way we are storing and accessing `routing table' entries
has changed. Programs reading the FIB, like netstat, need to
@@ -33,6 +37,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
rebuilt.
Bump __FreeBSD_version to 800096.
+20090531:
+ For those who use ipfw and especially pf, those two firewalls
+ are now started BEFORE the network is initialized (i.e., before
+ rc.d/netif). Please review your rules to make sure that your
+ interfaces will be properly described.
+
20090530:
Remove the tunable/sysctl debug.mpsafevfs as its initial purpose
is no more valid.
Modified: projects/acpica_20090521/etc/defaults/rc.conf
==============================================================================
--- projects/acpica_20090521/etc/defaults/rc.conf Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/etc/defaults/rc.conf Wed Jun 3 22:54:27 2009 (r193409)
@@ -315,6 +315,11 @@ rpcbind_flags="" # Flags to rpcbind (if
rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO).
keyserv_enable="NO" # Run the SecureRPC keyserver (or NO).
keyserv_flags="" # Flags to keyserv (if enabled).
+nfsv4_server_enable="NO" # Enable support for NFSv4
+nfscbd_enable="NO" # NFSv4 client side callback daemon
+nfscbd_flags="" # Flags for nfscbd
+nfsuserd_enable="NO" # NFSv4 user/group name mapping daemon
+nfsuserd_flags="" # Flags for nfsuserd
### Network Time Services options: ###
timed_enable="NO" # Run the time daemon (or NO).
Modified: projects/acpica_20090521/etc/periodic/daily/100.clean-disks
==============================================================================
--- projects/acpica_20090521/etc/periodic/daily/100.clean-disks Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/etc/periodic/daily/100.clean-disks Wed Jun 3 22:54:27 2009 (r193409)
@@ -29,7 +29,7 @@ case "$daily_clean_disks_enable" in
echo ""
echo "Cleaning disks:"
set -f noglob
- args="$args -name "`echo "$daily_clean_disks_files" |
+ args="-name "`echo "$daily_clean_disks_files" |
sed -e 's/^[ ]*//' \
-e 's/[ ]*$//' \
-e 's/[ ][ ]*/ -o -name /g'`
@@ -41,9 +41,9 @@ case "$daily_clean_disks_enable" in
print=;;
esac
- rc=$(find / \( ! -fstype local -o -fstype rdonly \) -a -prune -o \
- \( $args \) -atime +$daily_clean_disks_days -delete $print |
- tee /dev/stderr | wc -l)
+ rc=$(find / \( ! -fstype local -o -fstype rdonly \) -prune -o \
+ \( $args \) -atime +$daily_clean_disks_days \
+ -execdir rm -df {} \; $print | tee /dev/stderr | wc -l)
[ -z "$print" ] && rc=0
[ $rc -gt 1 ] && rc=1
set -f glob
Modified: projects/acpica_20090521/etc/rc.d/Makefile
==============================================================================
--- projects/acpica_20090521/etc/rc.d/Makefile Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/etc/rc.d/Makefile Wed Jun 3 22:54:27 2009 (r193409)
@@ -23,8 +23,8 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKI
mixer motd mountcritlocal mountcritremote mountlate \
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
- network_ipv6 newsyslog nfsclient nfsd \
- nfsserver nisdomain nsswitch ntpd ntpdate \
+ network_ipv6 newsyslog nfsclient nfscbd nfsd \
+ nfsserver nfsuserd nisdomain nsswitch ntpd ntpdate \
othermta \
pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
Modified: projects/acpica_20090521/etc/rc.d/mountd
==============================================================================
--- projects/acpica_20090521/etc/rc.d/mountd Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/etc/rc.d/mountd Wed Jun 3 22:54:27 2009 (r193409)
@@ -37,6 +37,13 @@ mountd_precmd()
fi
fi
+ # If nfsv4_server_enable is yes, force use of the experimental
+ # server
+ #
+ if checkyesno nfsv4_server_enable; then
+ rc_flags="-e ${rc_flags}"
+ fi
+
if checkyesno zfs_enable; then
rc_flags="${rc_flags} /etc/exports /etc/zfs/exports"
fi
Copied: projects/acpica_20090521/etc/rc.d/nfscbd (from r193408, head/etc/rc.d/nfscbd)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/acpica_20090521/etc/rc.d/nfscbd Wed Jun 3 22:54:27 2009 (r193409, copy of r193408, head/etc/rc.d/nfscbd)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: nfscbd
+# REQUIRE: NETWORKING nfsuserd
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="nfscbd"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+sig_stop="USR1"
+
+load_rc_config $name
+
+run_rc_command "$1"
Modified: projects/acpica_20090521/etc/rc.d/nfsd
==============================================================================
--- projects/acpica_20090521/etc/rc.d/nfsd Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/etc/rc.d/nfsd Wed Jun 3 22:54:27 2009 (r193409)
@@ -4,7 +4,7 @@
#
# PROVIDE: nfsd
-# REQUIRE: mountd hostname gssd
+# REQUIRE: mountd hostname gssd nfsuserd
# KEYWORD: nojail shutdown
. /etc/rc.subr
@@ -14,14 +14,33 @@ rcvar=`set_rcvar nfs_server`
command="/usr/sbin/${name}"
load_rc_config $name
-command_args="${nfs_server_flags}"
start_precmd="nfsd_precmd"
sig_stop="USR1"
nfsd_precmd()
{
- if ! sysctl vfs.nfsrv >/dev/null 2>&1; then
- force_depend nfsserver || return 1
+ if checkyesno nfsv4_server_enable; then
+ # If nfsv4_server_enable is yes, force use
+ # of the experimental server
+ #
+ rc_flags="-e ${nfs_server_flags}"
+
+ if ! checkyesno nfsuserd_enable && \
+ ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1
+ then
+ force_depend nfsuserd || return 1
+ fi
+ else
+ rc_flags="${nfs_server_flags}"
+
+ if ! sysctl vfs.nfsrv >/dev/null 2>&1; then
+ force_depend nfsserver || return 1
+ fi
+
+ if checkyesno nfs_reserved_port_only; then
+ echo 'NFS on reserved port only=YES'
+ sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
+ fi
fi
if ! checkyesno rpcbind_enable && \
@@ -35,11 +54,6 @@ nfsd_precmd()
then
force_depend mountd || return 1
fi
-
- if checkyesno nfs_reserved_port_only; then
- echo 'NFS on reserved port only=YES'
- sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
- fi
return 0
}
Copied: projects/acpica_20090521/etc/rc.d/nfsuserd (from r193408, head/etc/rc.d/nfsuserd)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/acpica_20090521/etc/rc.d/nfsuserd Wed Jun 3 22:54:27 2009 (r193409, copy of r193408, head/etc/rc.d/nfsuserd)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: nfsuserd
+# REQUIRE: NETWORKING
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="nfsuserd"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+sig_stop="USR1"
+
+load_rc_config $name
+
+run_rc_command "$1"
Modified: projects/acpica_20090521/lib/bind/config.mk
==============================================================================
--- projects/acpica_20090521/lib/bind/config.mk Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/bind/config.mk Wed Jun 3 22:54:27 2009 (r193409)
@@ -70,6 +70,19 @@ ISC_ATOMIC_ARCH= x86_32
ISC_ATOMIC_ARCH= ${MACHINE_ARCH}
.endif
+# Optional features
+.if ${MK_BIND_LARGE_FILE} == "yes"
+CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+.endif
+.if ${MK_BIND_SIGCHASE} == "yes"
+CFLAGS+= -DDIG_SIGCHASE
+.endif
+.if ${MK_BIND_XML} == "yes"
+CFLAGS+= -DHAVE_LIBXML2
+CFLAGS+= -I/usr/local/include -I/usr/local/include/libxml2
+CFLAGS+= -L/usr/local/lib -lxml2 -lz -liconv -lm
+.endif
+
# Link against BIND libraries
.if ${MK_BIND_LIBS} == "no"
LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a
Modified: projects/acpica_20090521/lib/libusb/libusb.3
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb.3 Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/libusb/libusb.3 Wed Jun 3 22:54:27 2009 (r193409)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 21, 2009
+.Dd May 28, 2009
.Dt LIBUSB 3
.Os
.Sh NAME
@@ -78,6 +78,8 @@ USB access library (libusb -lusb)
.Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb"
.Ft void
.Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags"
+.Ft uint32_t
+.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index"
.Ft void
.Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index"
.Ft void
@@ -183,6 +185,10 @@ USB access library (libusb -lusb)
.Ft int
.Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq"
.Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_default "void"
+.Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_freebsd "void"
+.Ft struct libusb20_backend *
.Fn libusb20_be_alloc_linux "void"
.Ft struct libusb20_device *
.Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
@@ -227,7 +233,7 @@ Non-zero return values indicate a LIBUSB
.Pp
.
.Fn libusb20_tr_open
-will allocate kernel resources like
+will allocate kernel buffer resources according to
.Fa max_buf_size
and
.Fa max_frame_count
@@ -235,6 +241,18 @@ associated with an USB
.Fa pxfer
and bind the transfer to the specified
.Fa ep_no .
+.Fa max_buf_size
+is the minimum buffer size which the data transport layer has to support.
+If
+.Fa max_buf_size
+is zero, the
+.Nm
+library will use wMaxPacketSize to compute the buffer size.
+This can be useful for isochronous transfers.
+The actual buffer size can be greater than
+.Fa max_buf_size
+and is returned by
+.Fn libusb20_tr_get_max_total_length .
.
This function returns zero upon success.
.
@@ -367,8 +385,14 @@ Will do a clear-stall before starting th
.
.Pp
.
+.Fn libusb20_tr_get_length
+returns the length of the given USB frame by index.
+After an USB transfer is complete the USB frame length will get updated to the actual transferred length.
+.
+.Pp
+.
.Fn libusb20_tr_set_length
-sets the length of a given USB transfer and frame index.
+sets the length of the given USB frame by index.
.
.Pp
.
@@ -750,7 +774,7 @@ function will wait until a pending USB t
the given USB device.
.
A timeout value can be specified which is passed on to the
-.Xr 2 poll
+.Xr poll 2
function.
.
.Sh USB BACKEND OPERATIONS
@@ -829,6 +853,10 @@ returned.
If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is
returned.
.
+.Pp
+.
+.Fn libusb20_be_alloc_default
+.Fn libusb20_be_alloc_freebsd
.Fn libusb20_be_alloc_linux
These functions are used to allocate a specific USB backend or the
operating system default USB backend. Allocating a backend is a way to
Modified: projects/acpica_20090521/lib/libusb/libusb20.c
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb20.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/libusb/libusb20.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -319,6 +319,12 @@ libusb20_tr_set_flags(struct libusb20_tr
return;
}
+uint32_t
+libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex)
+{
+ return (xfer->pLength[frIndex]);
+}
+
void
libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex)
{
Modified: projects/acpica_20090521/lib/libusb/libusb20.h
==============================================================================
--- projects/acpica_20090521/lib/libusb/libusb20.h Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/libusb/libusb20.h Wed Jun 3 22:54:27 2009 (r193409)
@@ -216,6 +216,7 @@ void libusb20_tr_drain(struct libusb20_t
void libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index);
void libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb);
void libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags);
+uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index);
void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index);
void libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0);
void libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1);
Modified: projects/acpica_20090521/lib/msun/src/e_rem_pio2.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/e_rem_pio2.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/e_rem_pio2.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -48,10 +48,10 @@ pio2_2t = 2.02226624879595063154e-21, /
pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
-#ifdef INLINE_REM_PIO2
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2
+extern
#endif
-int
+__inline int
__ieee754_rem_pio2(double x, double *y)
{
double z,w,t,r,fn;
Modified: projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/e_rem_pio2f.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -40,10 +40,10 @@ invpio2 = 6.36619772367581382433e-01, /
pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */
pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */
-#ifdef INLINE_REM_PIO2F
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2F
+extern
#endif
-int
+__inline int
__ieee754_rem_pio2f(float x, double *y)
{
double w,r,fn;
Modified: projects/acpica_20090521/lib/msun/src/k_cosf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_cosf.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/k_cosf.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -30,10 +30,10 @@ C1 = 0x155553e1053a42.0p-57, /* 0.041
C2 = -0x16c087e80f1e27.0p-62, /* -0.00138867637746099294692 */
C3 = 0x199342e0ee5069.0p-68; /* 0.0000243904487962774090654 */
-#ifdef INLINE_KERNEL_COSDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_COSDF
+extern
#endif
-float
+__inline float
__kernel_cosdf(double x)
{
double r, w, z;
Modified: projects/acpica_20090521/lib/msun/src/k_sinf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_sinf.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/k_sinf.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -29,10 +29,10 @@ S2 = 0x111110896efbb2.0p-59, /* 0.0083
S3 = -0x1a00f9e2cae774.0p-65, /* -0.000198393348360966317347 */
S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */
-#ifdef INLINE_KERNEL_SINDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_SINDF
+extern
#endif
-float
+__inline float
__kernel_sindf(double x)
{
double r, s, w, z;
Modified: projects/acpica_20090521/lib/msun/src/k_tanf.c
==============================================================================
--- projects/acpica_20090521/lib/msun/src/k_tanf.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/k_tanf.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -32,10 +32,10 @@ T[] = {
0x1362b9bf971bcd.0p-59, /* 0.00946564784943673166728 */
};
-#ifdef INLINE_KERNEL_TANDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_TANDF
+extern
#endif
-float
+__inline float
__kernel_tandf(double x, int iy)
{
double z,r,w,s,t,u;
Modified: projects/acpica_20090521/lib/msun/src/math_private.h
==============================================================================
--- projects/acpica_20090521/lib/msun/src/math_private.h Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/lib/msun/src/math_private.h Wed Jun 3 22:54:27 2009 (r193409)
@@ -345,15 +345,30 @@ irint(double x)
int __kernel_rem_pio2(double*,double*,int,int,int);
/* double precision kernel functions */
+#ifdef INLINE_REM_PIO2
+__inline
+#endif
int __ieee754_rem_pio2(double,double*);
double __kernel_sin(double,double,int);
double __kernel_cos(double,double);
double __kernel_tan(double,double,int);
/* float precision kernel functions */
+#ifdef INLINE_REM_PIO2F
+__inline
+#endif
int __ieee754_rem_pio2f(float,double*);
+#ifdef INLINE_KERNEL_SINDF
+__inline
+#endif
float __kernel_sindf(double);
+#ifdef INLINE_KERNEL_COSDF
+__inline
+#endif
float __kernel_cosdf(double);
+#ifdef INLINE_KERNEL_TANDF
+__inline
+#endif
float __kernel_tandf(double,int);
/* long double precision kernel functions */
Modified: projects/acpica_20090521/sbin/fsck_ffs/fsck.h
==============================================================================
--- projects/acpica_20090521/sbin/fsck_ffs/fsck.h Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sbin/fsck_ffs/fsck.h Wed Jun 3 22:54:27 2009 (r193409)
@@ -297,8 +297,8 @@ int lfmode; /* lost & found directory
ufs2_daddr_t n_blks; /* number of blocks in use */
ino_t n_files; /* number of files in use */
-sig_atomic_t got_siginfo; /* received a SIGINFO */
-sig_atomic_t got_sigalarm; /* received a SIGALRM */
+volatile sig_atomic_t got_siginfo; /* received a SIGINFO */
+volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */
#define clearinode(dp) \
if (sblock.fs_magic == FS_UFS1_MAGIC) { \
Modified: projects/acpica_20090521/sbin/fsck_ffs/gjournal.c
==============================================================================
--- projects/acpica_20090521/sbin/fsck_ffs/gjournal.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sbin/fsck_ffs/gjournal.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -672,7 +672,7 @@ gjournal_check(const char *filesys)
devnam = filesys;
getdisk();
- /* Are there any unreferenced inodes in this cylinder group? */
+ /* Are there any unreferenced inodes in this file system? */
if (fs->fs_unrefs == 0) {
//printf("No unreferenced inodes.\n");
closedisk();
Modified: projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c
==============================================================================
--- projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sbin/mksnap_ffs/mksnap_ffs.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -112,6 +112,8 @@ main(int argc, char **argv)
if ((grp = getgrnam("operator")) == NULL)
errx(1, "Cannot retrieve operator gid");
+ iov = NULL;
+ iovlen = 0;
build_iovec(&iov, &iovlen, "fstype", "ffs", 4);
build_iovec(&iov, &iovlen, "from", snapname, (size_t)-1);
build_iovec(&iov, &iovlen, "fspath", stfsbuf.f_mntonname, (size_t)-1);
Modified: projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c
==============================================================================
--- projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/share/examples/kld/dyn_sysctl/dyn_sysctl.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -42,7 +42,7 @@ static struct sysctl_oid *a_root, *a_roo
static struct sysctl_ctx_list clist, clist1, clist2;
static int
-sysctl_dyn_sysctl_test (SYSCTL_HANDLER_ARGS)
+sysctl_dyn_sysctl_test(SYSCTL_HANDLER_ARGS)
{
char *buf = "let's produce some text...";
@@ -53,7 +53,7 @@ sysctl_dyn_sysctl_test (SYSCTL_HANDLER_A
* The function called at load/unload.
*/
static int
-load (module_t mod, int cmd, void *arg)
+load(module_t mod, int cmd, void *arg)
{
int error;
@@ -78,37 +78,37 @@ load (module_t mod, int cmd, void *arg)
SYSCTL_STATIC_CHILDREN(/* top of sysctl tree */),
OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0,
"dyn_sysctl root node");
- if(a_root == NULL) {
+ if (a_root == NULL) {
printf("SYSCTL_ADD_NODE failed!\n");
return (EINVAL);
}
SYSCTL_ADD_LONG(&clist, SYSCTL_CHILDREN(a_root),
- OID_AUTO, "long_a", CTLFLAG_RW, &a, "just to try");
+ OID_AUTO, "long_a", CTLFLAG_RW, &a, "just to try");
SYSCTL_ADD_INT(&clist, SYSCTL_CHILDREN(a_root),
- OID_AUTO, "int_b", CTLFLAG_RW, &b, 0, "just to try 1");
- a_root1=SYSCTL_ADD_NODE(&clist, SYSCTL_CHILDREN(a_root),
- OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
+ OID_AUTO, "int_b", CTLFLAG_RW, &b, 0, "just to try 1");
+ a_root1 = SYSCTL_ADD_NODE(&clist, SYSCTL_CHILDREN(a_root),
+ OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
SYSCTL_ADD_STRING(&clist, SYSCTL_CHILDREN(a_root1),
- OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "just to try 2");
+ OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "just to try 2");
printf("1. (%p) / dyn_sysctl\n", &clist);
/* Add a subtree under already existing category */
a_root1 = SYSCTL_ADD_NODE(&clist, SYSCTL_STATIC_CHILDREN(_kern),
- OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0, "dyn_sysctl root node");
- if(a_root1 == NULL) {
+ OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0, "dyn_sysctl root node");
+ if (a_root1 == NULL) {
printf("SYSCTL_ADD_NODE failed!\n");
return (EINVAL);
}
SYSCTL_ADD_PROC(&clist, SYSCTL_CHILDREN(a_root1),
- OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
- sysctl_dyn_sysctl_test, "A", "I can be here, too");
+ OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
+ sysctl_dyn_sysctl_test, "A", "I can be here, too");
printf(" (%p) /kern dyn_sysctl\n", &clist);
/* Overlap second tree with the first. */
b_root = SYSCTL_ADD_NODE(&clist1, SYSCTL_CHILDREN(a_root),
- OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
+ OID_AUTO, "nextlevel", CTLFLAG_RD, 0, "one level down");
SYSCTL_ADD_STRING(&clist1, SYSCTL_CHILDREN(b_root),
- OID_AUTO, "string_c1", CTLFLAG_RD, c, 0, "just to try 2");
+ OID_AUTO, "string_c1", CTLFLAG_RD, c, 0, "just to try 2");
printf("2. (%p) / dyn_sysctl (overlapping #1)\n", &clist1);
/*
@@ -117,19 +117,19 @@ load (module_t mod, int cmd, void *arg)
* WARNING: this is an example of WRONG use of dynamic sysctls.
*/
b_root=SYSCTL_ADD_NODE(&clist2, SYSCTL_CHILDREN(a_root1),
- OID_AUTO, "bad", CTLFLAG_RW, 0, "dependent node");
+ OID_AUTO, "bad", CTLFLAG_RW, 0, "dependent node");
SYSCTL_ADD_STRING(&clist2, SYSCTL_CHILDREN(b_root),
- OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "shouldn't panic");
+ OID_AUTO, "string_c", CTLFLAG_RD, c, 0, "shouldn't panic");
printf("3. (%p) /kern/dyn_sysctl bad (WRONG!)\n", &clist2);
break;
case MOD_UNLOAD :
printf("1. Try to free ctx1 (%p): ", &clist);
- if(sysctl_ctx_free(&clist))
+ if (sysctl_ctx_free(&clist) != 0)
printf("failed: expected. Need to remove ctx3 first.\n");
else
printf("HELP! sysctl_ctx_free(%p) succeeded. EXPECT PANIC!!!\n", &clist);
printf("2. Try to free ctx3 (%p): ", &clist2);
- if(sysctl_ctx_free(&clist2)) {
+ if (sysctl_ctx_free(&clist2) != 0) {
printf("sysctl_ctx_free(%p) failed!\n", &clist2);
/* Remove subtree forcefully... */
sysctl_remove_oid(b_root, 1, 1);
@@ -137,7 +137,7 @@ load (module_t mod, int cmd, void *arg)
} else
printf("Ok\n");
printf("3. Try to free ctx1 (%p) again: ", &clist);
- if(sysctl_ctx_free(&clist)) {
+ if (sysctl_ctx_free(&clist) != 0) {
printf("sysctl_ctx_free(%p) failed!\n", &clist);
/* Remove subtree forcefully... */
sysctl_remove_oid(a_root1, 1, 1);
@@ -145,7 +145,7 @@ load (module_t mod, int cmd, void *arg)
} else
printf("Ok\n");
printf("4. Try to free ctx2 (%p): ", &clist1);
- if(sysctl_ctx_free(&clist1)) {
+ if (sysctl_ctx_free(&clist1) != 0) {
printf("sysctl_ctx_free(%p) failed!\n", &clist1);
/* Remove subtree forcefully... */
sysctl_remove_oid(a_root, 1, 1);
@@ -156,10 +156,10 @@ load (module_t mod, int cmd, void *arg)
error = EOPNOTSUPP;
break;
}
- return error;
+ return (error);
}
-static moduledata_t mod_data= {
+static moduledata_t mod_data = {
"dyn_sysctl",
load,
0
Modified: projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c
==============================================================================
--- projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/share/examples/kld/syscall/module/syscall.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -26,7 +26,6 @@
* $FreeBSD$
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/module.h>
@@ -38,18 +37,17 @@
/*
* The function for implementing the syscall.
*/
-
static int
-hello (struct thread *td, void *arg)
+hello(struct thread *td, void *arg)
{
- printf ("hello kernel\n");
- return 0;
+
+ printf("hello kernel\n");
+ return (0);
}
/*
* The `sysent' for the new syscall
*/
-
static struct sysent hello_sysent = {
0, /* sy_narg */
hello /* sy_call */
@@ -58,30 +56,28 @@ static struct sysent hello_sysent = {
/*
* The offset in sysent where the syscall is allocated.
*/
-
static int offset = NO_SYSCALL;
/*
* The function called at load/unload.
*/
-
static int
-load (struct module *module, int cmd, void *arg)
+load(struct module *module, int cmd, void *arg)
{
int error = 0;
switch (cmd) {
case MOD_LOAD :
- printf ("syscall loaded at %d\n", offset);
+ printf("syscall loaded at %d\n", offset);
break;
case MOD_UNLOAD :
- printf ("syscall unloaded from %d\n", offset);
+ printf("syscall unloaded from %d\n", offset);
break;
default :
error = EOPNOTSUPP;
break;
}
- return error;
+ return (error);
}
SYSCALL_MODULE(syscall, &offset, &hello_sysent, load, NULL);
Modified: projects/acpica_20090521/share/man/man4/msk.4
==============================================================================
--- projects/acpica_20090521/share/man/man4/msk.4 Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/share/man/man4/msk.4 Wed Jun 3 22:54:27 2009 (r193409)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 25, 2009
+.Dd June 2, 2009
.Dt MSK 4
.Os
.Sh NAME
@@ -202,7 +202,11 @@ Marvell Yukon 88E8056 Gigabit Ethernet
.It
Marvell Yukon 88E8058 Gigabit Ethernet
.It
-Marvell Yukon 88E8070 Fast Ethernet
+Marvell Yukon 88E8070 Gigabit Ethernet
+.It
+Marvell Yukon 88E8071 Gigabit Ethernet
+.It
+Marvell Yukon 88E8072 Gigabit Ethernet
.It
SysKonnect SK-9Sxx Gigabit Ethernet
.It
Modified: projects/acpica_20090521/share/man/man5/src.conf.5
==============================================================================
--- projects/acpica_20090521/share/man/man5/src.conf.5 Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/share/man/man5/src.conf.5 Wed Jun 3 22:54:27 2009 (r193409)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
.\" $FreeBSD$
-.Dd April 5, 2009
+.Dd June 1, 2009
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -150,8 +150,15 @@ and
.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_ETC 156932 2006-03-21 07:50:50Z ru
Set to avoid installing the default files to
.Pa /var/named/etc/namedb .
+.It Va WITH_BIND_IDN
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_IDN 193280 2009-06-01 21:58:59Z dougb
+Set to enable IDN support for dig, host, and nslookup.
+This requires ports/dns/idnkit to be installed in /usr/local.
+.It Va WITH_BIND_LARGE_FILE
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_LARGE_FILE 193280 2009-06-01 21:58:59Z dougb
+Set to enable 64-bit file support.
.It Va WITH_BIND_LIBS
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 193280 2009-06-01 21:58:59Z dougb
Set to install BIND libraries and include files.
.It Va WITHOUT_BIND_LIBS_LWRES
.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_LIBS_LWRES 156932 2006-03-21 07:50:50Z ru
@@ -182,6 +189,9 @@ Set to avoid building or installing
.Xr rndc 8 ,
and
.Xr rndc-confgen 8 .
+.It Va WITH_BIND_SIGCHASE
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_SIGCHASE 193280 2009-06-01 21:58:59Z dougb
+Set to enable DNSSEC validation support for dig, host, and nslookup.
.It Va WITHOUT_BIND_UTILS
.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_UTILS 156932 2006-03-21 07:50:50Z ru
Set to avoid building or installing the BIND userland utilities,
@@ -190,6 +200,10 @@ Set to avoid building or installing the
.Xr nslookup 1 ,
and
.Xr nsupdate 8 .
+.It Va WITH_BIND_XML
+.\" from FreeBSD: head/tools/build/options/WITH_BIND_XML 193280 2009-06-01 21:58:59Z dougb
+Set to enable the http statistics interface for named.
+This requires ports/textproc/libxml2 to be installed in /usr/local.
.It Va WITHOUT_BLUETOOTH
.\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru
Set to not build Bluetooth related kernel modules, programs and libraries.
Modified: projects/acpica_20090521/share/mk/bsd.own.mk
==============================================================================
--- projects/acpica_20090521/share/mk/bsd.own.mk Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/share/mk/bsd.own.mk Wed Jun 3 22:54:27 2009 (r193409)
@@ -402,7 +402,11 @@ MK_${var}:= yes
# MK_* options which default to "no".
#
.for var in \
+ BIND_IDN \
+ BIND_LARGE_FILE \
BIND_LIBS \
+ BIND_SIGCHASE \
+ BIND_XML \
GNU_CPIO \
HESIOD \
IDEA
Modified: projects/acpica_20090521/sys/amd64/conf/GENERIC
==============================================================================
--- projects/acpica_20090521/sys/amd64/conf/GENERIC Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sys/amd64/conf/GENERIC Wed Jun 3 22:54:27 2009 (r193409)
@@ -70,6 +70,7 @@ options KBD_INSTALL_CDEV # install a CD
options STOP_NMI # Stop CPUS using NMI instead of IPI
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
Modified: projects/acpica_20090521/sys/boot/uboot/lib/disk.c
==============================================================================
--- projects/acpica_20090521/sys/boot/uboot/lib/disk.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sys/boot/uboot/lib/disk.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -34,6 +34,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/endian.h>
#include <sys/queue.h>
#include <netinet/in.h>
#include <machine/stdarg.h>
@@ -122,6 +123,15 @@ struct devsw uboot_storage = {
stor_print
};
+static void
+uuid_letoh(uuid_t *uuid)
+{
+
+ uuid->time_low = le32toh(uuid->time_low);
+ uuid->time_mid = le16toh(uuid->time_mid);
+ uuid->time_hi_and_version = le16toh(uuid->time_hi_and_version);
+}
+
static int
stor_init(void)
{
@@ -251,7 +261,7 @@ stor_open_gpt(struct open_dev *od, struc
}
/* Check the slice table magic. */
- if (*((uint16_t *)(buf + DOSMAGICOFFSET)) != DOSMAGIC) {
+ if (le16toh(*((uint16_t *)(buf + DOSMAGICOFFSET))) != DOSMAGIC) {
err = ENXIO;
goto out;
}
@@ -286,9 +296,10 @@ stor_open_gpt(struct open_dev *od, struc
/* Check GPT header */
if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 ||
- hdr->hdr_lba_self != 1 || hdr->hdr_revision < 0x00010000 ||
- hdr->hdr_entsz < sizeof(*ent) ||
- od->od_bsize % hdr->hdr_entsz != 0) {
+ le64toh(hdr->hdr_lba_self) != 1 ||
+ le32toh(hdr->hdr_revision) < 0x00010000 ||
+ le32toh(hdr->hdr_entsz) < sizeof(*ent) ||
+ od->od_bsize % le32toh(hdr->hdr_entsz) != 0) {
debugf("Invalid GPT header!\n");
err = EINVAL;
goto out;
@@ -296,9 +307,9 @@ stor_open_gpt(struct open_dev *od, struc
/* Count number of valid partitions */
part = 0;
- eps = od->od_bsize / hdr->hdr_entsz;
- slba = hdr->hdr_lba_table;
- elba = slba + hdr->hdr_entries / eps;
+ eps = od->od_bsize / le32toh(hdr->hdr_entsz);
+ slba = le64toh(hdr->hdr_lba_table);
+ elba = slba + le32toh(hdr->hdr_entries) / eps;
for (lba = slba; lba < elba; lba++) {
err = stor_readdev(dev, lba, 1, buf);
@@ -312,8 +323,9 @@ stor_open_gpt(struct open_dev *od, struc
for (i = 0; i < eps; i++) {
if (uuid_is_nil(&ent[i].ent_type, NULL) ||
- ent[i].ent_lba_start == 0 ||
- ent[i].ent_lba_end < ent[i].ent_lba_start)
+ le64toh(ent[i].ent_lba_start) == 0 ||
+ le64toh(ent[i].ent_lba_end) <
+ le64toh(ent[i].ent_lba_start))
continue;
part += 1;
@@ -343,8 +355,9 @@ stor_open_gpt(struct open_dev *od, struc
for (i = 0; i < eps; i++) {
if (uuid_is_nil(&ent[i].ent_type, NULL) ||
- ent[i].ent_lba_start == 0 ||
- ent[i].ent_lba_end < ent[i].ent_lba_start)
+ le64toh(ent[i].ent_lba_start) == 0 ||
+ le64toh(ent[i].ent_lba_end) <
+ le64toh(ent[i].ent_lba_start))
continue;
od->od_partitions[part].gp_index = (lba - slba)
@@ -352,9 +365,11 @@ stor_open_gpt(struct open_dev *od, struc
od->od_partitions[part].gp_type =
ent[i].ent_type;
od->od_partitions[part].gp_start =
- ent[i].ent_lba_start;
+ le64toh(ent[i].ent_lba_start);
od->od_partitions[part].gp_end =
- ent[i].ent_lba_end;
+ le64toh(ent[i].ent_lba_end);
+
+ uuid_letoh(&od->od_partitions[part].gp_type);
part += 1;
}
}
Modified: projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile
==============================================================================
--- projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sys/dev/aic7xxx/aicasm/Makefile Wed Jun 3 22:54:27 2009 (r193409)
@@ -15,6 +15,7 @@ SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSR
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
DPADD= ${LIBL}
LDADD= -ll
+WARNS?= 6
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
Modified: projects/acpica_20090521/sys/dev/ata/ata-all.h
==============================================================================
--- projects/acpica_20090521/sys/dev/ata/ata-all.h Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sys/dev/ata/ata-all.h Wed Jun 3 22:54:27 2009 (r193409)
@@ -149,11 +149,26 @@
/* SATA AHCI v1.0 register defines */
#define ATA_AHCI_CAP 0x00
#define ATA_AHCI_CAP_NPMASK 0x0000001f
+#define ATA_AHCI_CAP_SXS 0x00000020
+#define ATA_AHCI_CAP_EMS 0x00000040
+#define ATA_AHCI_CAP_CCCS 0x00000080
+#define ATA_AHCI_CAP_NCS 0x00001F00
+#define ATA_AHCI_CAP_NCS_SHIFT 8
#define ATA_AHCI_CAP_PSC 0x00002000
#define ATA_AHCI_CAP_SSC 0x00004000
+#define ATA_AHCI_CAP_PMD 0x00008000
+#define ATA_AHCI_CAP_FBSS 0x00010000
#define ATA_AHCI_CAP_SPM 0x00020000
-#define ATA_AHCI_CAP_CLO 0x01000000
+#define ATA_AHCI_CAP_SAM 0x00080000
+#define ATA_AHCI_CAP_ISS 0x00F00000
+#define ATA_AHCI_CAP_ISS_SHIFT 20
+#define ATA_AHCI_CAP_SCLO 0x01000000
+#define ATA_AHCI_CAP_SAL 0x02000000
#define ATA_AHCI_CAP_SALP 0x04000000
+#define ATA_AHCI_CAP_SSS 0x08000000
+#define ATA_AHCI_CAP_SMPS 0x10000000
+#define ATA_AHCI_CAP_SSNTF 0x20000000
+#define ATA_AHCI_CAP_SNCQ 0x40000000
#define ATA_AHCI_CAP_64BIT 0x80000000
#define ATA_AHCI_GHC 0x04
Modified: projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c Wed Jun 3 21:56:29 2009 (r193408)
+++ projects/acpica_20090521/sys/dev/ata/chipsets/ata-ahci.c Wed Jun 3 22:54:27 2009 (r193409)
@@ -101,8 +101,8 @@ int
ata_ahci_chipinit(device_t dev)
{
struct ata_pci_controller *ctlr = device_get_softc(dev);
- int error;
- u_int32_t version;
+ int error, speed;
+ u_int32_t caps, version;
/* if we have a memory BAR(5) we are likely on an AHCI part */
ctlr->r_type2 = SYS_RES_MEMORY;
@@ -142,16 +142,45 @@ ata_ahci_chipinit(device_t dev)
ctlr->suspend = ata_ahci_suspend;
ctlr->resume = ata_ahci_ctlr_reset;
- /* announce we support the HW */
- version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS);
- device_printf(dev,
- "AHCI Version %x%x.%x%x controller with %d ports PM %s\n",
- (version >> 24) & 0xff, (version >> 16) & 0xff,
- (version >> 8) & 0xff, version & 0xff,
- (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_NPMASK) + 1,
- (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_SPM) ?
- "supported" : "not supported");
- return 0;
+ /* announce we support the HW */
+ version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS);
+ caps = ATA_INL(ctlr->r_res2, ATA_AHCI_CAP);
+ speed = (caps & ATA_AHCI_CAP_ISS) >> ATA_AHCI_CAP_ISS_SHIFT;
+ device_printf(dev,
+ "AHCI v%x.%02x controller with %d %sGbps ports, PM %s\n",
+ ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f),
+ ((version >> 4) & 0xf0) + (version & 0x0f),
+ (caps & ATA_AHCI_CAP_NPMASK) + 1,
+ ((speed == 1) ? "1.5":((speed == 2) ? "3":
+ ((speed == 3) ? "6":"?"))),
+ (caps & ATA_AHCI_CAP_SPM) ?
+ "supported" : "not supported");
+ if (bootverbose) {
+ device_printf(dev, "Caps:%s%s%s%s%s%s%s%s %sGbps",
+ (caps & ATA_AHCI_CAP_64BIT) ? " 64bit":"",
+ (caps & ATA_AHCI_CAP_SNCQ) ? " NCQ":"",
+ (caps & ATA_AHCI_CAP_SSNTF) ? " SNTF":"",
+ (caps & ATA_AHCI_CAP_SMPS) ? " MPS":"",
+ (caps & ATA_AHCI_CAP_SSS) ? " SS":"",
+ (caps & ATA_AHCI_CAP_SALP) ? " ALP":"",
+ (caps & ATA_AHCI_CAP_SAL) ? " AL":"",
+ (caps & ATA_AHCI_CAP_SCLO) ? " CLO":"",
+ ((speed == 1) ? "1.5":((speed == 2) ? "3":
+ ((speed == 3) ? "6":"?"))));
+ printf("%s%s%s%s%s%s %dcmd%s%s%s %dports\n",
+ (caps & ATA_AHCI_CAP_SAM) ? " AM":"",
+ (caps & ATA_AHCI_CAP_SPM) ? " PM":"",
+ (caps & ATA_AHCI_CAP_FBSS) ? " FBS":"",
+ (caps & ATA_AHCI_CAP_PMD) ? " PMD":"",
+ (caps & ATA_AHCI_CAP_SSC) ? " SSC":"",
+ (caps & ATA_AHCI_CAP_PSC) ? " PSC":"",
+ ((caps & ATA_AHCI_CAP_NCS) >> ATA_AHCI_CAP_NCS_SHIFT) + 1,
+ (caps & ATA_AHCI_CAP_CCCS) ? " CCC":"",
+ (caps & ATA_AHCI_CAP_EMS) ? " EM":"",
+ (caps & ATA_AHCI_CAP_SXS) ? " eSATA":"",
+ (caps & ATA_AHCI_CAP_NPMASK) + 1);
+ }
+ return 0;
}
int
@@ -625,7 +654,7 @@ ata_ahci_clo(device_t dev)
int timeout;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list