Date: Sun, 1 Nov 2009 16:54:21 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r198753 - in projects/ppc64: . bin/sh contrib/ncurses contrib/ncurses/ncurses/base gnu/lib/libgcov lib/libbluetooth lib/libc/gen lib/libc/sys lib/libpmc lib/libstand lib/libthr/arch/ia6... Message-ID: <200911011654.nA1GsLA0028395@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Sun Nov 1 16:54:20 2009 New Revision: 198753 URL: http://svn.freebsd.org/changeset/base/198753 Log: IFC @ 198752 to pick up 32-bit PPC bug fixes. Added: projects/ppc64/lib/libc/sys/pselect.2 - copied unchanged from r198752, head/lib/libc/sys/pselect.2 projects/ppc64/lib/libthr/arch/ia64/ia64/_umtx_op_err.S - copied unchanged from r198752, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S projects/ppc64/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu - copied unchanged from r198752, head/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu projects/ppc64/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu - copied unchanged from r198752, head/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu projects/ppc64/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu - copied unchanged from r198752, head/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu projects/ppc64/sys/ia64/ia64/highfp.c - copied unchanged from r198752, head/sys/ia64/ia64/highfp.c projects/ppc64/sys/modules/iwnfw/Makefile.inc - copied unchanged from r198752, head/sys/modules/iwnfw/Makefile.inc projects/ppc64/sys/modules/iwnfw/iwn4965/ - copied from r198752, head/sys/modules/iwnfw/iwn4965/ projects/ppc64/sys/modules/iwnfw/iwn5000/ - copied from r198752, head/sys/modules/iwnfw/iwn5000/ projects/ppc64/sys/modules/iwnfw/iwn5150/ - copied from r198752, head/sys/modules/iwnfw/iwn5150/ projects/ppc64/tools/regression/bin/sh/expansion/question1.0 - copied unchanged from r198752, head/tools/regression/bin/sh/expansion/question1.0 projects/ppc64/tools/regression/bin/sh/expansion/set-u1.0 - copied unchanged from r198752, head/tools/regression/bin/sh/expansion/set-u1.0 projects/ppc64/tools/regression/bin/sh/expansion/set-u2.0 - copied unchanged from r198752, head/tools/regression/bin/sh/expansion/set-u2.0 Deleted: projects/ppc64/lib/libc/gen/pselect.3 projects/ppc64/lib/libc/gen/pselect.c projects/ppc64/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu Modified: projects/ppc64/ (props changed) projects/ppc64/Makefile.inc1 projects/ppc64/ObsoleteFiles.inc projects/ppc64/UPDATING projects/ppc64/bin/sh/expand.c projects/ppc64/bin/sh/sh.1 projects/ppc64/contrib/ncurses/ (props changed) projects/ppc64/contrib/ncurses/ncurses/base/lib_getch.c projects/ppc64/gnu/lib/libgcov/Makefile projects/ppc64/lib/libbluetooth/bluetooth.3 projects/ppc64/lib/libbluetooth/bluetooth.h projects/ppc64/lib/libc/gen/Makefile.inc projects/ppc64/lib/libc/gen/Symbol.map projects/ppc64/lib/libc/sys/Makefile.inc projects/ppc64/lib/libc/sys/Symbol.map projects/ppc64/lib/libpmc/libpmc.c projects/ppc64/lib/libstand/open.c projects/ppc64/lib/libthr/arch/ia64/Makefile.inc projects/ppc64/lib/libthr/arch/ia64/include/pthread_md.h projects/ppc64/lib/libthr/thread/thr_syscalls.c projects/ppc64/sbin/camcontrol/camcontrol.c projects/ppc64/sbin/ddb/ddb_capture.c projects/ppc64/sbin/geom/class/part/Makefile projects/ppc64/sbin/geom/class/part/geom_part.c projects/ppc64/sbin/mknod/mknod.8 projects/ppc64/sbin/mount_nfs/mount_nfs.c projects/ppc64/share/man/man4/acpi_hp.4 projects/ppc64/share/man/man4/acpi_wmi.4 projects/ppc64/share/man/man4/atapicam.4 projects/ppc64/share/man/man4/bge.4 projects/ppc64/share/man/man4/iwn.4 projects/ppc64/share/man/man4/iwnfw.4 projects/ppc64/share/man/man4/msk.4 projects/ppc64/share/man/man4/umass.4 projects/ppc64/share/man/man5/regdomain.5 projects/ppc64/share/man/man9/Makefile projects/ppc64/share/man/man9/get_cyclecount.9 projects/ppc64/share/zoneinfo/ (props changed) projects/ppc64/share/zoneinfo/southamerica projects/ppc64/sys/ (props changed) projects/ppc64/sys/amd64/amd64/machdep.c projects/ppc64/sys/amd64/ia32/ia32_signal.c projects/ppc64/sys/amd64/linux32/linux32_machdep.c projects/ppc64/sys/amd64/linux32/linux32_sysvec.c projects/ppc64/sys/arm/arm/machdep.c projects/ppc64/sys/arm/mv/mv_sata.c projects/ppc64/sys/boot/common/commands.c projects/ppc64/sys/cam/ata/ata_da.c projects/ppc64/sys/cam/ata/ata_pmp.c projects/ppc64/sys/cam/ata/ata_xpt.c projects/ppc64/sys/cam/cam.h projects/ppc64/sys/cam/cam_ccb.h projects/ppc64/sys/cam/cam_periph.h projects/ppc64/sys/cam/cam_xpt.c projects/ppc64/sys/cam/cam_xpt_internal.h projects/ppc64/sys/cam/scsi/scsi_da.c projects/ppc64/sys/cam/scsi/scsi_sg.c projects/ppc64/sys/cam/scsi/scsi_xpt.c projects/ppc64/sys/cddl/compat/opensolaris/sys/vnode.h projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c projects/ppc64/sys/compat/freebsd32/freebsd32_proto.h projects/ppc64/sys/compat/freebsd32/freebsd32_syscall.h projects/ppc64/sys/compat/freebsd32/freebsd32_syscalls.c projects/ppc64/sys/compat/freebsd32/freebsd32_sysent.c projects/ppc64/sys/compat/freebsd32/syscalls.master projects/ppc64/sys/compat/linux/linux_socket.c projects/ppc64/sys/conf/NOTES projects/ppc64/sys/conf/files projects/ppc64/sys/conf/files.ia64 projects/ppc64/sys/contrib/dev/iwn/LICENSE projects/ppc64/sys/dev/aac/aac.c projects/ppc64/sys/dev/aac/aac_cam.c projects/ppc64/sys/dev/aac/aacreg.h projects/ppc64/sys/dev/aac/aacvar.h projects/ppc64/sys/dev/acpi_support/acpi_aiboost.c projects/ppc64/sys/dev/aic7xxx/aic79xx_pci.c projects/ppc64/sys/dev/amr/amr.c projects/ppc64/sys/dev/ata/ata-all.c projects/ppc64/sys/dev/ata/ata-all.h projects/ppc64/sys/dev/ata/ata-disk.c projects/ppc64/sys/dev/ata/ata-dma.c projects/ppc64/sys/dev/ata/ata-lowlevel.c projects/ppc64/sys/dev/ata/ata-pci.c projects/ppc64/sys/dev/ata/ata-pci.h projects/ppc64/sys/dev/ata/ata-queue.c projects/ppc64/sys/dev/ata/ata-raid.c projects/ppc64/sys/dev/ata/ata-sata.c projects/ppc64/sys/dev/ata/atapi-cam.c projects/ppc64/sys/dev/ata/atapi-cd.c projects/ppc64/sys/dev/ata/chipsets/ata-adaptec.c projects/ppc64/sys/dev/ata/chipsets/ata-ahci.c projects/ppc64/sys/dev/ata/chipsets/ata-intel.c projects/ppc64/sys/dev/ata/chipsets/ata-marvell.c projects/ppc64/sys/dev/ata/chipsets/ata-nvidia.c projects/ppc64/sys/dev/ata/chipsets/ata-promise.c projects/ppc64/sys/dev/ata/chipsets/ata-serverworks.c projects/ppc64/sys/dev/ata/chipsets/ata-siliconimage.c projects/ppc64/sys/dev/ata/chipsets/ata-via.c projects/ppc64/sys/dev/drm/drmP.h projects/ppc64/sys/dev/drm/drm_scatter.c projects/ppc64/sys/dev/drm/r600_blit.c projects/ppc64/sys/dev/drm/radeon_cp.c projects/ppc64/sys/dev/fdc/fdc.c projects/ppc64/sys/dev/hwpmc/hwpmc_core.c projects/ppc64/sys/dev/iwn/if_iwn.c projects/ppc64/sys/dev/iwn/if_iwnreg.h projects/ppc64/sys/dev/iwn/if_iwnvar.h projects/ppc64/sys/dev/msk/if_msk.c projects/ppc64/sys/dev/msk/if_mskreg.h projects/ppc64/sys/dev/pci/pci.c projects/ppc64/sys/dev/sym/sym_hipd.c projects/ppc64/sys/dev/xen/xenpci/ (props changed) projects/ppc64/sys/fs/smbfs/smbfs_vfsops.c projects/ppc64/sys/fs/tmpfs/tmpfs_subr.c projects/ppc64/sys/i386/bios/apm.c projects/ppc64/sys/i386/i386/machdep.c projects/ppc64/sys/i386/linux/linux_machdep.c projects/ppc64/sys/i386/linux/linux_sysvec.c projects/ppc64/sys/ia64/conf/GENERIC projects/ppc64/sys/ia64/ia64/interrupt.c projects/ppc64/sys/ia64/ia64/machdep.c projects/ppc64/sys/ia64/ia64/trap.c projects/ppc64/sys/ia64/ia64/vm_machdep.c projects/ppc64/sys/ia64/include/md_var.h projects/ppc64/sys/ia64/include/param.h projects/ppc64/sys/ia64/include/proc.h projects/ppc64/sys/kern/init_sysent.c projects/ppc64/sys/kern/kern_context.c projects/ppc64/sys/kern/kern_cpuset.c projects/ppc64/sys/kern/kern_sig.c projects/ppc64/sys/kern/kern_thread.c projects/ppc64/sys/kern/subr_trap.c projects/ppc64/sys/kern/sys_generic.c projects/ppc64/sys/kern/sys_process.c projects/ppc64/sys/kern/syscalls.c projects/ppc64/sys/kern/syscalls.master projects/ppc64/sys/kern/systrace_args.c projects/ppc64/sys/kern/sysv_shm.c projects/ppc64/sys/kern/uipc_syscalls.c projects/ppc64/sys/mips/mips/pm_machdep.c projects/ppc64/sys/modules/iwnfw/Makefile projects/ppc64/sys/net80211/ieee80211_hwmp.c projects/ppc64/sys/netgraph/NOTES projects/ppc64/sys/netinet/ip_input.c projects/ppc64/sys/netinet/libalias/alias.c projects/ppc64/sys/netinet/sctp_cc_functions.c projects/ppc64/sys/netinet/sctp_output.c projects/ppc64/sys/pc98/pc98/machdep.c projects/ppc64/sys/powerpc/aim/copyinout.c projects/ppc64/sys/powerpc/aim/machdep.c projects/ppc64/sys/powerpc/aim/swtch.S projects/ppc64/sys/powerpc/booke/machdep.c projects/ppc64/sys/powerpc/include/hid.h projects/ppc64/sys/powerpc/powermac/hrowpic.c projects/ppc64/sys/powerpc/powerpc/cpu.c projects/ppc64/sys/powerpc/powerpc/stack_machdep.c projects/ppc64/sys/sparc64/include/in_cksum.h projects/ppc64/sys/sparc64/sparc64/machdep.c projects/ppc64/sys/sun4v/sun4v/machdep.c projects/ppc64/sys/sys/aac_ioctl.h projects/ppc64/sys/sys/ata.h projects/ppc64/sys/sys/conf.h projects/ppc64/sys/sys/signalvar.h projects/ppc64/sys/sys/syscall.h projects/ppc64/sys/sys/syscall.mk projects/ppc64/sys/sys/syscallsubr.h projects/ppc64/sys/sys/sysproto.h projects/ppc64/sys/sys/time.h projects/ppc64/sys/tools/fw_stub.awk projects/ppc64/sys/vm/vm_fault.c projects/ppc64/sys/vm/vm_map.c projects/ppc64/usr.bin/bsdiff/bsdiff/bsdiff.1 projects/ppc64/usr.bin/bsdiff/bspatch/bspatch.1 projects/ppc64/usr.bin/logger/logger.c projects/ppc64/usr.bin/vmstat/vmstat.c projects/ppc64/usr.sbin/crashinfo/crashinfo.sh projects/ppc64/usr.sbin/mfiutil/mfiutil.8 (props changed) projects/ppc64/usr.sbin/sysinstall/cdrom.c projects/ppc64/usr.sbin/usbconfig/usbconfig.8 Modified: projects/ppc64/Makefile.inc1 ============================================================================== --- projects/ppc64/Makefile.inc1 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/Makefile.inc1 Sun Nov 1 16:54:20 2009 (r198753) @@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse - LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ - -iprefix ${LIB32TMP}/usr/ \ + -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -599,11 +599,14 @@ installcheck_UGID: .if ${MK_INFO} != "no" _install-info= install-info .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zic tzsetup +.endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic + test true uname wc ${_zoneinfo} # # distributeworld Modified: projects/ppc64/ObsoleteFiles.inc ============================================================================== --- projects/ppc64/ObsoleteFiles.inc Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/ObsoleteFiles.inc Sun Nov 1 16:54:20 2009 (r198753) @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091027: pselect.3 implemented as syscall +OLD_FILES+=usr/share/man/man3/pselect.3.gz +# 20091005: fusword.9 and susword.9 removed +OLD_FILES+=usr/share/man/man9/fusword.9.gz +OLD_FILES+=usr/share/man/man9/susword.9.gz # 20090909: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz @@ -26,6 +31,49 @@ OLD_FILES+=usr/share/man/man8/lukemftpd. OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist OLD_FILES+=etc/mtree/BSD.x11-4.dist +# 20090812: net80211 documentation overhaul +OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 Modified: projects/ppc64/UPDATING ============================================================================== --- projects/ppc64/UPDATING Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/UPDATING Sun Nov 1 16:54:20 2009 (r198753) @@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091025: + The iwn(4) driver has been updated to support the 5000 and 5150 series. + There's one kernel module for each firmware. Adding "device iwnfw" + to the kernel configuration file means including all three firmware + images inside the kernel. If you want to include just the one for + your wireless card, use the the devices iwn4965fw, iwn5000fw or + iwn5150fw. + 20090926: The rc.d/network_ipv6, IPv6 configuration script has been integrated into rc.d/netif. The changes are the following: @@ -624,6 +632,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. userland (libpmc(3)) and the kernel module (hwpmc(4)) in sync. +20081009: + atapci kernel module now includes only generic PCI ATA + driver. AHCI driver moved to ataahci kernel module. + All vendor-specific code moved into separate kernel modules: + ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek, + atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron, + atamarvell, atamicron, atanational, atanetcell, atanvidia, + atapromise, ataserverworks, atasiliconimage, atasis, atavia + 20080820: The TTY subsystem of the kernel has been replaced by a new implementation, which provides better scalability and an Modified: projects/ppc64/bin/sh/expand.c ============================================================================== --- projects/ppc64/bin/sh/expand.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/bin/sh/expand.c Sun Nov 1 16:54:20 2009 (r198753) @@ -657,7 +657,7 @@ again: /* jump here after setting a vari } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: Modified: projects/ppc64/bin/sh/sh.1 ============================================================================== --- projects/ppc64/bin/sh/sh.1 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/bin/sh/sh.1 Sun Nov 1 16:54:20 2009 (r198753) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd May 31, 2009 +.Dd October 24, 2009 .Dt SH 1 .Os .Sh NAME @@ -296,7 +296,10 @@ sh -T -c "trap 'exit 1' 2 ; some-blockin .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in Modified: projects/ppc64/contrib/ncurses/ncurses/base/lib_getch.c ============================================================================== --- projects/ppc64/contrib/ncurses/ncurses/base/lib_getch.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/contrib/ncurses/ncurses/base/lib_getch.c Sun Nov 1 16:54:20 2009 (r198753) @@ -476,6 +476,12 @@ _nc_wgetch(WINDOW *win, /* resizeterm can push KEY_RESIZE */ if (cooked_key_in_fifo()) { *result = fifo_pull(sp); + /* + * Get the ERR from queue -- it is from WINCH, + * so we should take it out, the "error" is handled. + */ + if (fifo_peek(sp) == -1) + fifo_pull(sp); returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK); } } Modified: projects/ppc64/gnu/lib/libgcov/Makefile ============================================================================== --- projects/ppc64/gnu/lib/libgcov/Makefile Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/gnu/lib/libgcov/Makefile Sun Nov 1 16:54:20 2009 (r198753) @@ -2,6 +2,7 @@ NO_PROFILE= .include <bsd.own.mk> +MK_SSP= no .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc Modified: projects/ppc64/lib/libbluetooth/bluetooth.3 ============================================================================== --- projects/ppc64/lib/libbluetooth/bluetooth.3 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libbluetooth/bluetooth.3 Sun Nov 1 16:54:20 2009 (r198753) @@ -272,7 +272,7 @@ otherwise 0. .Pp The .Fn bt_devinfo -function populates prodivded +function populates provided .Vt bt_devinfo structure with the information about given Bluetooth device. The caller is expected to pass Bluetooth device name in the Modified: projects/ppc64/lib/libbluetooth/bluetooth.h ============================================================================== --- projects/ppc64/lib/libbluetooth/bluetooth.h Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libbluetooth/bluetooth.h Sun Nov 1 16:54:20 2009 (r198753) @@ -163,8 +163,8 @@ int bt_devclose(int s); int bt_devsend (int s, uint16_t opcode, void *param, size_t plen); ssize_t bt_devrecv (int s, void *buf, size_t size, time_t to); int bt_devreq (int s, struct bt_devreq *r, time_t to); -int bt_devfilter(int s, struct bt_devfilter const *new, - struct bt_devfilter *old); +int bt_devfilter(int s, struct bt_devfilter const *newp, + struct bt_devfilter *oldp); void bt_devfilter_pkt_set(struct bt_devfilter *filter, uint8_t type); void bt_devfilter_pkt_clr(struct bt_devfilter *filter, uint8_t type); int bt_devfilter_pkt_tst(struct bt_devfilter const *filter, uint8_t type); Modified: projects/ppc64/lib/libc/gen/Makefile.inc ============================================================================== --- projects/ppc64/lib/libc/gen/Makefile.inc Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libc/gen/Makefile.inc Sun Nov 1 16:54:20 2009 (r198753) @@ -21,7 +21,7 @@ SRCS+= __getosreldate.c __xuname.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pmadvise.c popen.c posix_spawn.c pselect.c \ + pause.c pmadvise.c popen.c posix_spawn.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ @@ -62,7 +62,7 @@ MAN+= alarm.3 arc4random.3 \ posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \ posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \ posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \ - pselect.3 psignal.3 pwcache.3 \ + psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \ Modified: projects/ppc64/lib/libc/gen/Symbol.map ============================================================================== --- projects/ppc64/lib/libc/gen/Symbol.map Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libc/gen/Symbol.map Sun Nov 1 16:54:20 2009 (r198753) @@ -223,7 +223,6 @@ FBSD_1.0 { posix_madvise; popen; pclose; - pselect; psignal; raise; readdir; @@ -454,7 +453,6 @@ FBSDprivate_1.0 { __opendir2; __pause; _pause; - __pselect; __pw_scan; /* Used by (at least) libutil */ __raise; _raise; Modified: projects/ppc64/lib/libc/sys/Makefile.inc ============================================================================== --- projects/ppc64/lib/libc/sys/Makefile.inc Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libc/sys/Makefile.inc Sun Nov 1 16:54:20 2009 (r198753) @@ -83,7 +83,8 @@ MAN+= abort2.2 accept.2 access.2 acct.2 mq_setattr.2 \ msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \ msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \ - pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \ + pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 \ + pselect.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 .if !defined(NO_P1003_1B) Modified: projects/ppc64/lib/libc/sys/Symbol.map ============================================================================== --- projects/ppc64/lib/libc/sys/Symbol.map Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libc/sys/Symbol.map Sun Nov 1 16:54:20 2009 (r198753) @@ -211,6 +211,7 @@ FBSD_1.0 { posix_openpt; preadv; profil; + pselect; ptrace; pwritev; quotactl; @@ -781,6 +782,8 @@ FBSDprivate_1.0 { __sys_preadv; _profil; __sys_profil; + _pselect; + __sys_pselect; _ptrace; __sys_ptrace; _pwritev; Copied: projects/ppc64/lib/libc/sys/pselect.2 (from r198752, head/lib/libc/sys/pselect.2) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/lib/libc/sys/pselect.2 Sun Nov 1 16:54:20 2009 (r198753, copy of r198752, head/lib/libc/sys/pselect.2) @@ -0,0 +1,122 @@ +.\" +.\" Copyright 2002 Massachusetts Institute of Technology +.\" +.\" Permission to use, copy, modify, and distribute this software and +.\" its documentation for any purpose and without fee is hereby +.\" granted, provided that both the above copyright notice and this +.\" permission notice appear in all copies, that both the above +.\" copyright notice and this permission notice appear in all +.\" supporting documentation, and that the name of M.I.T. not be used +.\" in advertising or publicity pertaining to distribution of the +.\" software without specific, written prior permission. M.I.T. makes +.\" no representations about the suitability of this software for any +.\" purpose. It is provided "as is" without express or implied +.\" warranty. +.\" +.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS +.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, +.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT +.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +.\" OR TORT (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$ +.\" +.Dd October 27, 2009 +.Dt PSELECT 2 +.Os +.Sh NAME +.Nm pselect +.Nd synchronous I/O multiplexing a la POSIX.1g +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.In sys/select.h +.Ft int +.Fo pselect +.Fa "int nfds" +.Fa "fd_set * restrict readfds" +.Fa "fd_set * restrict writefds" +.Fa "fd_set * restrict exceptfds" +.Fa "const struct timespec * restrict timeout" +.Fa "const sigset_t * restrict newsigmask" +.Fc +.Sh DESCRIPTION +The +.Fn pselect +function was introduced by +.St -p1003.1g-2000 +as a slightly stronger version of +.Xr select 2 . +The +.Fa nfds , readfds , writefds , +and +.Fa exceptfds +arguments are all identical to the analogous arguments of +.Fn select . +The +.Fa timeout +argument in +.Fn pselect +points to a +.Vt "const struct timespec" +rather than the (modifiable) +.Vt "struct timeval" +used by +.Fn select ; +as in +.Fn select , +a null pointer may be passed to indicate that +.Fn pselect +should wait indefinitely. +Finally, +.Fa newsigmask +specifies a signal mask which is set while waiting for input. +When +.Fn pselect +returns, the original signal mask is restored. +.Pp +See +.Xr select 2 +for a more detailed discussion of the semantics of this interface, and +for macros used to manipulate the +.Vt "fd_set" +data type. +.Sh RETURN VALUES +The +.Fn pselect +function returns the same values and under the same conditions as +.Fn select . +.Sh ERRORS +The +.Fn pselect +function may fail for any of the reasons documented for +.Xr select 2 +and (if a signal mask is provided) +.Xr sigprocmask 2 . +.Sh SEE ALSO +.Xr kqueue 2 , +.Xr poll 2 , +.Xr select 2 , +.Xr sigprocmask 2 +.Sh STANDARDS +The +.Fn pselect +function conforms to +.St -p1003.1-2001 . +.Sh HISTORY +The +.Fn pselect +function first appeared in +.Fx 5.0 . +.Sh AUTHORS +The first implementation of +.Fn pselect +function and this manual page were written by +.An Garrett Wollman Aq wollman@FreeBSD.org . Modified: projects/ppc64/lib/libpmc/libpmc.c ============================================================================== --- projects/ppc64/lib/libpmc/libpmc.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libpmc/libpmc.c Sun Nov 1 16:54:20 2009 (r198753) @@ -442,6 +442,10 @@ static struct pmc_event_alias core_alias /* * Intel Core2 (Family 6, Model F), Core2Extreme (Family 6, Model 17H) * and Atom (Family 6, model 1CH) PMCs. + * + * We map aliases to events on the fixed-function counters if these + * are present. Note that not all CPUs in this family contain fixed-function + * counters. */ static struct pmc_event_alias core2_aliases[] = { @@ -454,8 +458,22 @@ static struct pmc_event_alias core2_alia EV_ALIAS("unhalted-cycles", "iaf-cpu-clk-unhalted.core"), EV_ALIAS(NULL, NULL) }; -#define atom_aliases core2_aliases -#define corei7_aliases core2_aliases + +static struct pmc_event_alias core2_aliases_without_iaf[] = { + EV_ALIAS("branches", "iap-br-inst-retired.any"), + EV_ALIAS("branch-mispredicts", "iap-br-inst-retired.mispred"), + EV_ALIAS("cycles", "tsc-tsc"), + EV_ALIAS("ic-misses", "iap-l1i-misses"), + EV_ALIAS("instructions", "iap-inst-retired.any_p"), + EV_ALIAS("interrupts", "iap-hw-int-rcv"), + EV_ALIAS("unhalted-cycles", "iap-cpu-clk-unhalted.core_p"), + EV_ALIAS(NULL, NULL) +}; + +#define atom_aliases core2_aliases +#define atom_aliases_without_iaf core2_aliases_without_iaf +#define corei7_aliases core2_aliases +#define corei7_aliases_without_iaf core2_aliases_without_iaf #define IAF_KW_OS "os" #define IAF_KW_USR "usr" @@ -2379,6 +2397,10 @@ pmc_init(void) uint32_t abi_version; struct module_stat pmc_modstat; struct pmc_op_getcpuinfo op_cpu_info; +#if defined(__amd64__) || defined(__i386__) + int cpu_has_iaf_counters; + unsigned int t; +#endif if (pmc_syscall != -1) /* already inited */ return (0); @@ -2420,6 +2442,8 @@ pmc_init(void) if (pmc_class_table == NULL) return (-1); + for (n = 0; n < PMC_CLASS_TABLE_SIZE; n++) + pmc_class_table[n] = NULL; /* * Fill in the class table. @@ -2427,6 +2451,14 @@ pmc_init(void) n = 0; #if defined(__amd64__) || defined(__i386__) pmc_class_table[n++] = &tsc_class_table_descr; + + /* + * Check if this CPU has fixed function counters. + */ + cpu_has_iaf_counters = 0; + for (t = 0; t < cpu_info.pm_nclass; t++) + if (cpu_info.pm_classes[t].pm_class == PMC_CLASS_IAF) + cpu_has_iaf_counters = 1; #endif #define PMC_MDEP_INIT(C) do { \ @@ -2436,6 +2468,16 @@ pmc_init(void) PMC_TABLE_SIZE(C##_pmc_classes); \ } while (0) +#define PMC_MDEP_INIT_INTEL_V2(C) do { \ + PMC_MDEP_INIT(C); \ + if (cpu_has_iaf_counters) \ + pmc_class_table[n++] = &iaf_class_table_descr; \ + else \ + pmc_mdep_event_aliases = \ + C##_aliases_without_iaf; \ + pmc_class_table[n] = &C##_class_table_descr; \ + } while (0) + /* Configure the event name parser. */ switch (cpu_info.pm_cputype) { #if defined(__i386__) @@ -2461,24 +2503,17 @@ pmc_init(void) pmc_class_table[n] = &k8_class_table_descr; break; case PMC_CPU_INTEL_ATOM: - PMC_MDEP_INIT(atom); - pmc_class_table[n++] = &iaf_class_table_descr; - pmc_class_table[n] = &atom_class_table_descr; + PMC_MDEP_INIT_INTEL_V2(atom); break; case PMC_CPU_INTEL_CORE: PMC_MDEP_INIT(core); - pmc_class_table[n] = &core_class_table_descr; break; case PMC_CPU_INTEL_CORE2: case PMC_CPU_INTEL_CORE2EXTREME: - PMC_MDEP_INIT(core2); - pmc_class_table[n++] = &iaf_class_table_descr; - pmc_class_table[n] = &core2_class_table_descr; + PMC_MDEP_INIT_INTEL_V2(core2); break; case PMC_CPU_INTEL_COREI7: - PMC_MDEP_INIT(corei7); - pmc_class_table[n++] = &iaf_class_table_descr; - pmc_class_table[n] = &corei7_class_table_descr; + PMC_MDEP_INIT_INTEL_V2(corei7); break; case PMC_CPU_INTEL_PIV: PMC_MDEP_INIT(p4); Modified: projects/ppc64/lib/libstand/open.c ============================================================================== --- projects/ppc64/lib/libstand/open.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libstand/open.c Sun Nov 1 16:54:20 2009 (r198753) @@ -113,6 +113,7 @@ open(const char *fname, int mode) /* see if we opened a raw device; otherwise, 'file' is the file name. */ if (file == (char *)0 || *file == '\0') { f->f_flags |= F_RAW; + f->f_rabuf = NULL; return (fd); } Modified: projects/ppc64/lib/libthr/arch/ia64/Makefile.inc ============================================================================== --- projects/ppc64/lib/libthr/arch/ia64/Makefile.inc Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libthr/arch/ia64/Makefile.inc Sun Nov 1 16:54:20 2009 (r198753) @@ -2,4 +2,4 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= _umtx_op_err.S pthread_md.c Copied: projects/ppc64/lib/libthr/arch/ia64/ia64/_umtx_op_err.S (from r198752, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/lib/libthr/arch/ia64/ia64/_umtx_op_err.S Sun Nov 1 16:54:20 2009 (r198753, copy of r198752, head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2009 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <machine/asm.h> +__FBSDID("$FreeBSD$"); + +#include <sys/syscall.h> + +ENTRY(_umtx_op_err, 5) + CALLSYS_NOERROR(_umtx_op) + br.ret.sptk.few rp +END(_umtx_op_err) Modified: projects/ppc64/lib/libthr/arch/ia64/include/pthread_md.h ============================================================================== --- projects/ppc64/lib/libthr/arch/ia64/include/pthread_md.h Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libthr/arch/ia64/include/pthread_md.h Sun Nov 1 16:54:20 2009 (r198753) @@ -33,6 +33,8 @@ #define CPU_SPINWAIT +#define HAS__UMTX_OP_ERR 1 + #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* Modified: projects/ppc64/lib/libthr/thread/thr_syscalls.c ============================================================================== --- projects/ppc64/lib/libthr/thread/thr_syscalls.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/lib/libthr/thread/thr_syscalls.c Sun Nov 1 16:54:20 2009 (r198753) @@ -104,6 +104,8 @@ extern int __sys_accept(int, struct sock extern int __sys_connect(int, const struct sockaddr *, socklen_t); extern int __sys_fsync(int); extern int __sys_msync(void *, size_t, int); +extern int __sys_pselect(int, fd_set *, fd_set *, fd_set *, + const struct timespec *, const sigset_t *); extern int __sys_poll(struct pollfd *, unsigned, int); extern ssize_t __sys_recv(int, void *, size_t, int); extern ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); @@ -394,7 +396,7 @@ ___pselect(int count, fd_set *rfds, fd_s int ret; _thr_cancel_enter(curthread); - ret = __pselect(count, rfds, wfds, efds, timo, mask); + ret = __sys_pselect(count, rfds, wfds, efds, timo, mask); _thr_cancel_leave(curthread); return (ret); Modified: projects/ppc64/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/ppc64/sbin/camcontrol/camcontrol.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/camcontrol/camcontrol.c Sun Nov 1 16:54:20 2009 (r198753) @@ -186,7 +186,7 @@ static int scsidoinquiry(struct cam_devi char *combinedopt, int retry_count, int timeout); static int scsiinquiry(struct cam_device *device, int retry_count, int timeout); static int scsiserial(struct cam_device *device, int retry_count, int timeout); -static int scsixferrate(struct cam_device *device); +static int camxferrate(struct cam_device *device); #endif /* MINIMALISTIC */ static int parse_btl(char *tstr, int *bus, int *target, int *lun, cam_argmask *arglst); @@ -663,7 +663,7 @@ scsidoinquiry(struct cam_device *device, return(error); if (arglist & CAM_ARG_GET_XFERRATE) - error = scsixferrate(device); + error = camxferrate(device); return(error); } @@ -873,14 +873,18 @@ scsiserial(struct cam_device *device, in } static int -scsixferrate(struct cam_device *device) +camxferrate(struct cam_device *device) { + struct ccb_pathinq cpi; u_int32_t freq = 0; u_int32_t speed = 0; union ccb *ccb; u_int mb; int retval = 0; + if ((retval = get_cpi(device, &cpi)) != 0) + return (1); + ccb = cam_getccb(device); if (ccb == NULL) { @@ -913,6 +917,8 @@ scsixferrate(struct cam_device *device) } + speed = cpi.base_transfer_speed; + freq = 0; if (ccb->cts.transport == XPORT_SPI) { struct ccb_trans_settings_spi *spi = &ccb->cts.xport_specific.spi; @@ -920,31 +926,44 @@ scsixferrate(struct cam_device *device) if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) { freq = scsi_calc_syncsrate(spi->sync_period); speed = freq; - } else { - struct ccb_pathinq cpi; - - retval = get_cpi(device, &cpi); - if (retval == 0) { - speed = cpi.base_transfer_speed; - freq = 0; - } } - - fprintf(stdout, "%s%d: ", device->device_name, - device->dev_unit_num); - if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) { speed *= (0x01 << spi->bus_width); } + } else if (ccb->cts.transport == XPORT_FC) { + struct ccb_trans_settings_fc *fc = + &ccb->cts.xport_specific.fc; + + if (fc->valid & CTS_FC_VALID_SPEED) + speed = fc->bitrate; + } else if (ccb->cts.transport == XPORT_SAS) { + struct ccb_trans_settings_sas *sas = + &ccb->cts.xport_specific.sas; + + if (sas->valid & CTS_SAS_VALID_SPEED) + speed = sas->bitrate; + } else if (ccb->cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = + &ccb->cts.xport_specific.sata; + + if (sata->valid & CTS_SATA_VALID_SPEED) + speed = sata->bitrate; + } + + mb = speed / 1000; + if (mb > 0) { + fprintf(stdout, "%s%d: %d.%03dMB/s transfers ", + device->device_name, device->dev_unit_num, + mb, speed % 1000); + } else { + fprintf(stdout, "%s%d: %dKB/s transfers ", + device->device_name, device->dev_unit_num, + speed); + } - mb = speed / 1000; - - if (mb > 0) - fprintf(stdout, "%d.%03dMB/s transfers ", - mb, speed % 1000); - else - fprintf(stdout, "%dKB/s transfers ", - speed); + if (ccb->cts.transport == XPORT_SPI) { + struct ccb_trans_settings_spi *spi = + &ccb->cts.xport_specific.spi; if (((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0) && (spi->sync_offset != 0)) @@ -964,25 +983,22 @@ scsixferrate(struct cam_device *device) && (spi->sync_offset != 0)) { fprintf(stdout, ")"); } - } else { - struct ccb_pathinq cpi; - - retval = get_cpi(device, &cpi); - - if (retval != 0) - goto xferrate_bailout; - - speed = cpi.base_transfer_speed; - freq = 0; - - mb = speed / 1000; - - if (mb > 0) - fprintf(stdout, "%d.%03dMB/s transfers ", - mb, speed % 1000); - else - fprintf(stdout, "%dKB/s transfers ", - speed); + } else if (ccb->cts.transport == XPORT_ATA) { + struct ccb_trans_settings_ata *ata = + &ccb->cts.xport_specific.ata; + + if (ata->valid & CTS_ATA_VALID_BYTECOUNT) { + fprintf(stdout, "(PIO size %dbytes)", + ata->bytecount); + } + } else if (ccb->cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = + &ccb->cts.xport_specific.sata; + + if (sata->valid & CTS_SATA_VALID_BYTECOUNT) { + fprintf(stdout, "(PIO size %dbytes)", + sata->bytecount); + } } if (ccb->cts.protocol == PROTO_SCSI) { @@ -1305,6 +1321,7 @@ ataidentify(struct cam_device *device, i fprintf(stdout, "%s%d: ", device->device_name, device->dev_unit_num); ata_print_ident(ident_buf); + camxferrate(device); atacapprint(ident_buf); free(ident_buf); Modified: projects/ppc64/sbin/ddb/ddb_capture.c ============================================================================== --- projects/ppc64/sbin/ddb/ddb_capture.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/ddb/ddb_capture.c Sun Nov 1 16:54:20 2009 (r198753) @@ -95,24 +95,24 @@ kread_symbol(kvm_t *kvm, int index, void static void ddb_capture_print_kvm(kvm_t *kvm) { - u_int db_capture_bufsize; + u_int db_capture_bufoff; char *buffer, *db_capture_buf; if (kread_symbol(kvm, X_DB_CAPTURE_BUF, &db_capture_buf, sizeof(db_capture_buf), 0) < 0) errx(-1, "kvm: unable to read db_capture_buf"); - if (kread_symbol(kvm, X_DB_CAPTURE_BUFSIZE, &db_capture_bufsize, - sizeof(db_capture_bufsize), 0) < 0) - errx(-1, "kvm: unable to read db_capture_bufsize"); + if (kread_symbol(kvm, X_DB_CAPTURE_BUFOFF, &db_capture_bufoff, + sizeof(db_capture_bufoff), 0) < 0) + errx(-1, "kvm: unable to read db_capture_bufoff"); - buffer = malloc(db_capture_bufsize + 1); + buffer = malloc(db_capture_bufoff + 1); if (buffer == NULL) - err(-1, "malloc: db_capture_bufsize (%u)", - db_capture_bufsize); - bzero(buffer, db_capture_bufsize + 1); + err(-1, "malloc: db_capture_bufoff (%u)", + db_capture_bufoff); + bzero(buffer, db_capture_bufoff + 1); - if (kread(kvm, db_capture_buf, buffer, db_capture_bufsize, 0) < 0) + if (kread(kvm, db_capture_buf, buffer, db_capture_bufoff, 0) < 0) errx(-1, "kvm: unable to read buffer"); printf("%s\n", buffer); @@ -161,7 +161,7 @@ ddb_capture_status_kvm(kvm_t *kvm) errx(-1, "kvm: unable to read db_capture_bufsize"); if (kread_symbol(kvm, X_DB_CAPTURE_INPROGRESS, &db_capture_inprogress, sizeof(db_capture_inprogress), 0) < 0) - err(-1, "kvm: unable to read db_capture_inpgoress"); + err(-1, "kvm: unable to read db_capture_inprogress"); printf("%u/%u bytes used\n", db_capture_bufoff, db_capture_bufsize); if (db_capture_inprogress) printf("capture is on\n"); Modified: projects/ppc64/sbin/geom/class/part/Makefile ============================================================================== --- projects/ppc64/sbin/geom/class/part/Makefile Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/geom/class/part/Makefile Sun Nov 1 16:54:20 2009 (r198753) @@ -6,6 +6,4 @@ CLASS= part LDADD= -lutil -WARNS?= 4 - .include <bsd.lib.mk> Modified: projects/ppc64/sbin/geom/class/part/geom_part.c ============================================================================== --- projects/ppc64/sbin/geom/class/part/geom_part.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/geom/class/part/geom_part.c Sun Nov 1 16:54:20 2009 (r198753) @@ -192,6 +192,7 @@ find_provider(struct ggeom *gp, unsigned unsigned long long sector, bestsector; bestpp = NULL; + bestsector = 0; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { s = find_provcfg(pp, "start"); if (s == NULL) { Modified: projects/ppc64/sbin/mknod/mknod.8 ============================================================================== --- projects/ppc64/sbin/mknod/mknod.8 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/mknod/mknod.8 Sun Nov 1 16:54:20 2009 (r198753) @@ -28,7 +28,7 @@ .\" @(#)mknod.8 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 15, 2004 +.Dd October 31, 2009 .Dt MKNOD 8 .Os .Sh NAME @@ -74,9 +74,7 @@ and pseudo devices, and are type .It Ar major The major device number is an integer number which tells the kernel which device driver entry point to use. -To learn what -major device number to use for a particular device, check -.Pa /usr/src/sys/conf/majors . +This is a compatibility shim and should be left zero. .It Ar minor The minor device number tells the kernel which subunit the node corresponds to on the device; for example, Modified: projects/ppc64/sbin/mount_nfs/mount_nfs.c ============================================================================== --- projects/ppc64/sbin/mount_nfs/mount_nfs.c Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/sbin/mount_nfs/mount_nfs.c Sun Nov 1 16:54:20 2009 (r198753) @@ -232,16 +232,16 @@ main(int argc, char *argv[]) char *pnextopt = NULL; char *val = ""; pass_flag_to_nmount = 1; - pval = strchr(opt, '='); pnextopt = strchr(opt, ','); + if (pnextopt != NULL) { + *pnextopt = '\0'; + pnextopt++; + } + pval = strchr(opt, '='); if (pval != NULL) { *pval = '\0'; val = pval + 1; } - if (pnextopt) { - *pnextopt = '\0'; - pnextopt++; - } if (strcmp(opt, "bg") == 0) { opflags |= BGRND; pass_flag_to_nmount=0; Modified: projects/ppc64/share/man/man4/acpi_hp.4 ============================================================================== --- projects/ppc64/share/man/man4/acpi_hp.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/acpi_hp.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -256,7 +256,7 @@ sysctl dev.acpi_hp.0.cmi_detail=7 The .Nm device driver first appeared in -.Fx CURRENT . +.Fx 8.0 . .Sh AUTHORS .An -nosplit The @@ -279,7 +279,7 @@ http://www.microsoft.com/whdc/system/pnp This manual page was written by .An Michael Gmelin Aq freebsd@grem.de .Sh BUGS -This driver is experimental and has only been tested on CURRENT i386 on an +This driver is experimental and has only been tested on i386 on an HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN). Expect undefined results when operating on different hardware. .Pp Modified: projects/ppc64/share/man/man4/acpi_wmi.4 ============================================================================== --- projects/ppc64/share/man/man4/acpi_wmi.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/acpi_wmi.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -79,7 +79,7 @@ GUID IN The .Nm device driver first appeared in -.Fx CURRENT . +.Fx 8.0 . .Sh AUTHORS .An -nosplit The Modified: projects/ppc64/share/man/man4/atapicam.4 ============================================================================== --- projects/ppc64/share/man/man4/atapicam.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/atapicam.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -39,7 +39,6 @@ place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device scbus" -.Cd "device cam" .Cd "device ata" .Cd "device atapicam" .Ed Modified: projects/ppc64/share/man/man4/bge.4 ============================================================================== --- projects/ppc64/share/man/man4/bge.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/bge.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Oct 7, 2009 +.Dd October 7, 2009 .Dt BGE 4 .Os .Sh NAME Modified: projects/ppc64/share/man/man4/iwn.4 ============================================================================== --- projects/ppc64/share/man/man4/iwn.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/iwn.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -25,36 +25,53 @@ .\" .\" $FreeBSD$ .\" -.Dd April 13, 2008 +.Dd October 25, 2009 .Os .Dt IWN 4 .Sh NAME .Nm iwn -.Nd "Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver" +.Nd "Intel Wireless WiFi Link 4965/5000 IEEE 802.11n driver" .Sh SYNOPSIS To compile this driver into the kernel, include the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device iwn" -.Cd "device iwnfw" .Cd "device pci" .Cd "device wlan" .Cd "device firmware" .Ed .Pp +You also need to select a firmware for your device. +Choose one from: +.Bd -ragged -offset indent +.Cd "device iwn4965fw" +.Cd "device iwn5000fw" +.Cd "device iwn5100fw" +.Ed +.Pp +Or you can use +.Bd -ragged -offset indent +.Cd "device iwnfw" +.Ed +.Pp +to include them all. +.Pp Alternatively, to load the driver as a -module at boot time, place the following line in +module at boot time, place the following lines in .Xr loader.conf 5 : .Bd -literal -offset indent if_iwn_load="YES" +iwn4965fw_load="YES" +iwn5000fw_load="YES" +iwn5100fw_load="YES" .Ed .Sh DESCRIPTION The .Nm driver provides support for .Tn Intel -Wireless WiFi Link 4965AGN PCI-Express network adapters. +Wireless WiFi Link 4965 and 5000 series of PCI-Express network adapters. .Nm supports .Cm station , Modified: projects/ppc64/share/man/man4/iwnfw.4 ============================================================================== --- projects/ppc64/share/man/man4/iwnfw.4 Sun Nov 1 13:06:15 2009 (r198752) +++ projects/ppc64/share/man/man4/iwnfw.4 Sun Nov 1 16:54:20 2009 (r198753) @@ -22,7 +22,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2009 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911011654.nA1GsLA0028395>