Date: Sun, 14 Jun 2009 11:26:42 +0000 (UTC) From: "Simon L. Nielsen" <simon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r194183 - in projects/openssl_098_merge_8: . bin/sh crypto/openssl/test etc gnu/usr.bin/man/apropos lib/libusb sbin/ifconfig share/termcap sys/cddl/compat/opensolaris/kern sys/cddl/cont... Message-ID: <200906141126.n5EBQgRX047906@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: simon Date: Sun Jun 14 11:26:42 2009 New Revision: 194183 URL: http://svn.freebsd.org/changeset/base/194183 Log: Merge from head. Added: projects/openssl_098_merge_8/tools/tools/termcap/ - copied from r194182, head/tools/tools/termcap/ Modified: projects/openssl_098_merge_8/ (props changed) projects/openssl_098_merge_8/UPDATING projects/openssl_098_merge_8/bin/sh/eval.c projects/openssl_098_merge_8/bin/sh/eval.h projects/openssl_098_merge_8/bin/sh/input.c projects/openssl_098_merge_8/bin/sh/input.h projects/openssl_098_merge_8/bin/sh/main.c projects/openssl_098_merge_8/bin/sh/trap.c projects/openssl_098_merge_8/bin/sh/trap.h projects/openssl_098_merge_8/crypto/openssl/test/testfipsssl (props changed) projects/openssl_098_merge_8/etc/crontab projects/openssl_098_merge_8/etc/termcap.small projects/openssl_098_merge_8/gnu/usr.bin/man/apropos/apropos.sh projects/openssl_098_merge_8/lib/libusb/ (props changed) projects/openssl_098_merge_8/sbin/ifconfig/ifieee80211.c projects/openssl_098_merge_8/share/termcap/termcap.src projects/openssl_098_merge_8/sys/cddl/compat/opensolaris/kern/opensolaris.c projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ah_desc.h projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/openssl_098_merge_8/sys/dev/ath/ath_rate/sample/sample.c projects/openssl_098_merge_8/sys/dev/ath/if_ath.c projects/openssl_098_merge_8/sys/dev/firewire/firewire.c projects/openssl_098_merge_8/sys/dev/mii/miidevs projects/openssl_098_merge_8/sys/dev/mii/nsgphy.c projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.c projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.h projects/openssl_098_merge_8/sys/dev/ofw/ofw_disk.c projects/openssl_098_merge_8/sys/dev/ofw/ofw_if.m projects/openssl_098_merge_8/sys/dev/ofw/ofw_iicbus.c projects/openssl_098_merge_8/sys/dev/ofw/ofw_standard.c projects/openssl_098_merge_8/sys/dev/ofw/ofwvar.h projects/openssl_098_merge_8/sys/dev/ofw/openfirm.c projects/openssl_098_merge_8/sys/dev/ofw/openfirm.h projects/openssl_098_merge_8/sys/dev/ofw/openfirmio.c projects/openssl_098_merge_8/sys/dev/sec/sec.c projects/openssl_098_merge_8/sys/dev/sound/pci/hda/hdac.c projects/openssl_098_merge_8/sys/dev/syscons/daemon/daemon_saver.c projects/openssl_098_merge_8/sys/dev/syscons/scterm-teken.c projects/openssl_098_merge_8/sys/dev/tsec/if_tsec.c projects/openssl_098_merge_8/sys/dev/tsec/if_tsec.h projects/openssl_098_merge_8/sys/dev/usb/usbdevs projects/openssl_098_merge_8/sys/dev/xen/blkfront/blkfront.c projects/openssl_098_merge_8/sys/dev/xen/netfront/ (props changed) projects/openssl_098_merge_8/sys/dev/xen/netfront/netfront.c projects/openssl_098_merge_8/sys/dev/xen/xenpci/ (props changed) projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clstate.c projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clvfsops.c projects/openssl_098_merge_8/sys/fs/tmpfs/tmpfs_vnops.c projects/openssl_098_merge_8/sys/i386/include/cpufunc.h projects/openssl_098_merge_8/sys/i386/include/in_cksum.h projects/openssl_098_merge_8/sys/i386/include/pmap.h projects/openssl_098_merge_8/sys/kern/kern_jail.c projects/openssl_098_merge_8/sys/kern/kern_mib.c projects/openssl_098_merge_8/sys/kern/kern_shutdown.c projects/openssl_098_merge_8/sys/kern/vfs_syscalls.c projects/openssl_098_merge_8/sys/mips/conf/ADM5120 projects/openssl_098_merge_8/sys/mips/idt/files.idt projects/openssl_098_merge_8/sys/modules/dtrace/dtnfsclient/ (props changed) projects/openssl_098_merge_8/sys/modules/ip6_mroute_mod/ (props changed) projects/openssl_098_merge_8/sys/modules/ipmi/ipmi_linux/ (props changed) projects/openssl_098_merge_8/sys/net80211/ieee80211_ioctl.h projects/openssl_098_merge_8/sys/netinet/ipfw/ip_dummynet.c (props changed) projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw2.c (props changed) projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw_pfil.c (props changed) projects/openssl_098_merge_8/sys/netinet6/icmp6.c projects/openssl_098_merge_8/sys/netinet6/in6_ifattach.c projects/openssl_098_merge_8/sys/nfsclient/bootp_subr.c projects/openssl_098_merge_8/sys/nfsclient/nfs_vfsops.c projects/openssl_098_merge_8/sys/nlm/nlm_advlock.c projects/openssl_098_merge_8/sys/powerpc/booke/pmap.c projects/openssl_098_merge_8/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c projects/openssl_098_merge_8/sys/sys/jail.h projects/openssl_098_merge_8/sys/vm/phys_pager.c projects/openssl_098_merge_8/tools/regression/lib/msun/test-conj.t (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs.h (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/openssl_098_merge_8/usr.sbin/lpr/lp/lp.1 projects/openssl_098_merge_8/usr.sbin/lpr/lp/lp.sh projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/getid.c (props changed) projects/openssl_098_merge_8/usr.sbin/nscd/agent.c projects/openssl_098_merge_8/usr.sbin/nscd/agent.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.h projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.c projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.h projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.c projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.h projects/openssl_098_merge_8/usr.sbin/nscd/config.c projects/openssl_098_merge_8/usr.sbin/nscd/config.h projects/openssl_098_merge_8/usr.sbin/nscd/debug.h projects/openssl_098_merge_8/usr.sbin/nscd/hashtable.h projects/openssl_098_merge_8/usr.sbin/nscd/log.h projects/openssl_098_merge_8/usr.sbin/nscd/mp_rs_query.c projects/openssl_098_merge_8/usr.sbin/nscd/mp_rs_query.h projects/openssl_098_merge_8/usr.sbin/nscd/mp_ws_query.c projects/openssl_098_merge_8/usr.sbin/nscd/mp_ws_query.h projects/openssl_098_merge_8/usr.sbin/nscd/nscd.c projects/openssl_098_merge_8/usr.sbin/nscd/nscdcli.c projects/openssl_098_merge_8/usr.sbin/nscd/nscdcli.h projects/openssl_098_merge_8/usr.sbin/nscd/parser.h projects/openssl_098_merge_8/usr.sbin/nscd/protocol.h projects/openssl_098_merge_8/usr.sbin/nscd/query.c projects/openssl_098_merge_8/usr.sbin/nscd/query.h Modified: projects/openssl_098_merge_8/UPDATING ============================================================================== --- projects/openssl_098_merge_8/UPDATING Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/UPDATING Sun Jun 14 11:26:42 2009 (r194183) @@ -22,6 +22,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090613: + The layout of the structure returned by IEEE80211_IOC_STA_INFO + has changed. User applications that use this ioctl need to be + rebuilt. + 20090611: The layout of struct thread has changed. Kernel and modules need to be rebuilt. Modified: projects/openssl_098_merge_8/bin/sh/eval.c ============================================================================== --- projects/openssl_098_merge_8/bin/sh/eval.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/eval.c Sun Jun 14 11:26:42 2009 (r194183) @@ -74,11 +74,6 @@ __FBSDID("$FreeBSD$"); #endif -/* flags in argument to evaltree */ -#define EV_EXIT 01 /* exit after evaluating tree */ -#define EV_TESTED 02 /* exit status is checked; ignore -e flag */ -#define EV_BACKCMD 04 /* command executing within back quotes */ - MKINIT int evalskip; /* set if we are skipping commands */ STATIC int skipcount; /* number of levels to skip */ MKINIT int loopnest; /* current loop nesting level */ @@ -163,20 +158,28 @@ evalstring(char *s, int flags) { union node *n; struct stackmark smark; + int flags_exit; + flags_exit = flags & EV_EXIT; + flags &= ~EV_EXIT; setstackmark(&smark); setinputstring(s, 1); while ((n = parsecmd(0)) != NEOF) { - if (n != NULL) - evaltree(n, flags); + if (n != NULL) { + if (flags_exit && preadateof()) + evaltree(n, flags | EV_EXIT); + else + evaltree(n, flags); + } popstackmark(&smark); } popfile(); popstackmark(&smark); + if (flags_exit) + exitshell(exitstatus); } - /* * Evaluate a parse tree. The value is left in the global variable * exitstatus. @@ -731,7 +734,7 @@ evalcommand(union node *cmd, int flags, /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd || (cmdentry.cmdtype == CMDNORMAL - && ((flags & EV_EXIT) == 0 || Tflag)) + && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN || cmdentry.u.index == CDCMD Modified: projects/openssl_098_merge_8/bin/sh/eval.h ============================================================================== --- projects/openssl_098_merge_8/bin/sh/eval.h Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/eval.h Sun Jun 14 11:26:42 2009 (r194183) @@ -45,6 +45,11 @@ struct backcmd { /* result of evalbackc struct job *jp; /* job structure for command */ }; +/* flags in argument to evaltree/evalstring */ +#define EV_EXIT 01 /* exit after evaluating tree */ +#define EV_TESTED 02 /* exit status is checked; ignore -e flag */ +#define EV_BACKCMD 04 /* command executing within back quotes */ + int evalcmd(int, char **); void evalstring(char *, int); union node; /* BLETCH for ansi C */ Modified: projects/openssl_098_merge_8/bin/sh/input.c ============================================================================== --- projects/openssl_098_merge_8/bin/sh/input.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/input.c Sun Jun 14 11:26:42 2009 (r194183) @@ -321,6 +321,23 @@ check: } /* + * Returns if we are certain we are at EOF. Does not cause any more input + * to be read from the outside world. + */ + +int +preadateof(void) +{ + if (parsenleft > 0) + return 0; + if (parsefile->strpush) + return 0; + if (parsenleft == EOF_NLEFT || parsefile->buf == NULL) + return 1; + return 0; +} + +/* * Undo the last call to pgetc. Only one character may be pushed back. * PEOF may be pushed back. */ Modified: projects/openssl_098_merge_8/bin/sh/input.h ============================================================================== --- projects/openssl_098_merge_8/bin/sh/input.h Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/input.h Sun Jun 14 11:26:42 2009 (r194183) @@ -48,6 +48,7 @@ extern int init_editline; /* 0 == not se char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); +int preadateof(void); void pungetc(void); void pushstring(char *, int, void *); void popstring(void); Modified: projects/openssl_098_merge_8/bin/sh/main.c ============================================================================== --- projects/openssl_098_merge_8/bin/sh/main.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/main.c Sun Jun 14 11:26:42 2009 (r194183) @@ -178,7 +178,7 @@ state2: state3: state = 4; if (minusc) { - evalstring(minusc, 0); + evalstring(minusc, sflag ? 0 : EV_EXIT); } if (sflag || minusc == NULL) { state4: /* XXX ??? - why isn't this before the "if" statement */ Modified: projects/openssl_098_merge_8/bin/sh/trap.c ============================================================================== --- projects/openssl_098_merge_8/bin/sh/trap.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/trap.c Sun Jun 14 11:26:42 2009 (r194183) @@ -222,6 +222,21 @@ clear_traps(void) /* + * Check if we have any traps enabled. + */ +int +have_traps(void) +{ + char *volatile *tp; + + for (tp = trap ; tp <= &trap[NSIG - 1] ; tp++) { + if (*tp && **tp) /* trap not NULL or SIG_IGN */ + return 1; + } + return 0; +} + +/* * Set the signal handler for the specified signal. The routine figures * out what it should be set to. */ Modified: projects/openssl_098_merge_8/bin/sh/trap.h ============================================================================== --- projects/openssl_098_merge_8/bin/sh/trap.h Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/bin/sh/trap.h Sun Jun 14 11:26:42 2009 (r194183) @@ -39,6 +39,7 @@ extern volatile sig_atomic_t gotwinch; int trapcmd(int, char **); void clear_traps(void); +int have_traps(void); void setsignal(int); void ignoresig(int); void onsig(int); Modified: projects/openssl_098_merge_8/etc/crontab ============================================================================== --- projects/openssl_098_merge_8/etc/crontab Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/etc/crontab Sun Jun 14 11:26:42 2009 (r194183) @@ -4,7 +4,6 @@ # SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin -HOME=/var/log # #minute hour mday month wday who command # Modified: projects/openssl_098_merge_8/etc/termcap.small ============================================================================== --- projects/openssl_098_merge_8/etc/termcap.small Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/etc/termcap.small Sun Jun 14 11:26:42 2009 (r194183) @@ -71,6 +71,17 @@ cons60|ansi80x60:\ :li#60:tc=cons25: cons60-m|ansi80x60-mono:\ :li#60:tc=cons25-m: +# Syscons console with 132 characters (VESA modes) +cons25-w|ansi132x25:\ + :co#132:tc=cons25: +cons30-w|ansi132x30:\ + :co#132:tc=cons30: +cons43-w|ansi132x43:\ + :co#132:tc=cons43: +cons50-w|ansil-w|ansi132x50:\ + :co#132:tc=cons50: +cons60-w|ansi132x60:\ + :co#132:tc=cons60: # KOI8-R/KOI8-U FreeBSD console with ACS support cons25r|cons25u|pc3r|ibmpc3r|cons25-koi8:\ :ac=q\200x\201m\204v\211j\205t\206n\212u\207l\202w\210k\203y\230z\231f\234~\225a\220h\2210\215:\ @@ -93,6 +104,28 @@ cons60r|cons60u|cons60-koi8:\ :li#60:tc=cons25r: cons60r-m|cons60u-m|cons60-koi8-mono:\ :li#60:tc=cons25r-m: +# Syscons console with 90 characters (VGA modes) +# KOI8-R/KOI8-U FreeBSD console with ACS support. +cons25r-v|cons25u-v|pc3r-v|ibmpc3r-vga|cons25-koi8-vga:\ + :co#90:tc=cons25r: +cons25r-mv|cons25u-mv|pc3r-mv|ibmpc3r-monovga|cons25-koi8-monovga:\ + :co#90:tc=cons25r-m: +cons30r-v|cons30u-v|cons30-koi8-vga:\ + :co#90:tc=cons30r: +cons30r-mv|cons30u-mv|cons30-koi8-monovga:\ + :co#90:tc=cons30r-m: +cons43r-v|cons43u-v|cons43-koi8-vga:\ + :co#90:tc=cons43r: +cons43r-mv|cons43u-mv|cons43-koi8-monovga:\ + :co#90:tc=cons43r-m: +cons50r-v|cons50u-v|cons50-koi8-vga:\ + :co#90:tc=cons50r: +cons50r-mv|cons50u-mv|cons50-koi8-monovga:\ + :co#90:tc=cons50r-m: +cons60r-v|cons60u-v|cons60-koi8-vga:\ + :co#90:tc=cons60r: +cons60r-mv|cons60u-mv|cons60-koi8-monovga:\ + :co#90:tc=cons60r-m: # ISO 8859-2 FreeBSD console with ACS support cons25l2|cons25-iso8859-2:\ :ac=f\260i\247:\ @@ -137,6 +170,17 @@ cons60l1|cons60-iso8859-1:\ :li#60:tc=cons25l1: cons60l1-m|cons60-iso8859-1-mono:\ :li#60:tc=cons25l1-m: +# 132x25 ISO 8859-1 FreeBSD console +cons25l1-w|:cons25w-iso8859-1:\ + :co#132:tc=cons25l1: +cons30l1-w|cons30w-iso8859-1:\ + :co#132:tc=cons30l1: +cons43l1-w|cons43w-iso8859-1:\ + :co#132:tc=cons43l1: +cons50l1-w|cons50w-iso8859-1:\ + :co#132:tc=cons50l1: +cons60l1-w|cons60w-iso8859-1:\ + :co#132:tc=cons60l1: # ISO 8859-7 FreeBSD console with ACS support cons25l7|cons25-iso8859-7:\ :ac=f\260g\261{\360}\243+\253,\273i\247:\ @@ -180,8 +224,6 @@ pc|ibmpc|ibm pc PC/IX:\ :li#24:co#80:am:bs:bw:eo:\ :cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:do=\E[B:ho=\E[;H:\ :nd=\E[C:up=\E[A:so=\E[7m:se=\E[0m:us=\E[4m:ue=\E[0m: -pc3mono|IBM PC 386BSD Console with monochrome monitor:\ - :so=\E[0;1r\E[m:tc=pc3: pc3|ibmpc3|IBM PC 386BSD Console:\ :Co#8:\ :DO=\E[%dB:\ @@ -194,10 +236,10 @@ pc3|ibmpc3|IBM PC 386BSD Console:\ :K5=\E[G:\ :LE=\E[%dD:\ :RI=\E[%dC:\ - :Sb=\E[1;%dx:\ - :Sf=\E[2;%dx:\ + :AB=\E[1;%dx:\ + :AF=\E[2;%dx:\ :UP=\E[%dA:\ - :ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\ + :ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261i^U0\333y\363z\362:\ :am:\ :bl=^G:\ :bs:\ @@ -248,3 +290,33 @@ pc3|ibmpc3|IBM PC 386BSD Console:\ :ti=\E[m:\ :up=\E[A:\ :ut: + +# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $ +# +xterm-xfree86|XFree86 xterm:\ + :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ + :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ + :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ + :@7=\EOF:@8=\EOM:kI=\E[2~:\ + :kh=\EOH:kP=\E[5~:kN=\E[6~:\ + :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic: +# +# This chunk is used for building the VT220/Sun/PC keyboard variants. +xterm-basic|xterm common (XFree86):\ + :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\ + :is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:\ + :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\ + :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\ + :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\ + :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:kb=^H:\ + :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\ + :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ + :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ + :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ + :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\ +# +# This is the only entry which you should have to customize, since "xterm" +# is widely used for a variety of incompatible terminal emulations including +# color_xterm and rxvt. +xterm|xterm-color|X11 terminal emulator:\ + :ti@:te@:tc=xterm-xfree86: Modified: projects/openssl_098_merge_8/gnu/usr.bin/man/apropos/apropos.sh ============================================================================== --- projects/openssl_098_merge_8/gnu/usr.bin/man/apropos/apropos.sh Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/gnu/usr.bin/man/apropos/apropos.sh Sun Jun 14 11:26:42 2009 (r194183) @@ -18,7 +18,6 @@ # $FreeBSD$ -PATH=/bin:/usr/bin:$PATH db=whatis # name of whatis data base grepopt='' Modified: projects/openssl_098_merge_8/sbin/ifconfig/ifieee80211.c ============================================================================== --- projects/openssl_098_merge_8/sbin/ifconfig/ifieee80211.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sbin/ifconfig/ifieee80211.c Sun Jun 14 11:26:42 2009 (r194183) @@ -104,19 +104,25 @@ /* XXX need these publicly defined or similar */ #ifndef IEEE80211_NODE_AUTH -#define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ -#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ -#define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ -#define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ -#define IEEE80211_NODE_HT 0x0040 /* HT enabled */ -#define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ -#define IEEE80211_NODE_WPS 0x0100 /* WPS association */ -#define IEEE80211_NODE_TSN 0x0200 /* TSN association */ -#define IEEE80211_NODE_AMPDU_RX 0x0400 /* AMPDU rx enabled */ -#define IEEE80211_NODE_AMPDU_TX 0x0800 /* AMPDU tx enabled */ -#define IEEE80211_NODE_MIMO_PS 0x1000 /* MIMO power save enabled */ -#define IEEE80211_NODE_MIMO_RTS 0x2000 /* send RTS in MIMO PS */ -#define IEEE80211_NODE_RIFS 0x4000 /* RIFS enabled */ +#define IEEE80211_NODE_AUTH 0x000001 /* authorized for data */ +#define IEEE80211_NODE_QOS 0x000002 /* QoS enabled */ +#define IEEE80211_NODE_ERP 0x000004 /* ERP enabled */ +#define IEEE80211_NODE_PWR_MGT 0x000010 /* power save mode enabled */ +#define IEEE80211_NODE_AREF 0x000020 /* authentication ref held */ +#define IEEE80211_NODE_HT 0x000040 /* HT enabled */ +#define IEEE80211_NODE_HTCOMPAT 0x000080 /* HT setup w/ vendor OUI's */ +#define IEEE80211_NODE_WPS 0x000100 /* WPS association */ +#define IEEE80211_NODE_TSN 0x000200 /* TSN association */ +#define IEEE80211_NODE_AMPDU_RX 0x000400 /* AMPDU rx enabled */ +#define IEEE80211_NODE_AMPDU_TX 0x000800 /* AMPDU tx enabled */ +#define IEEE80211_NODE_MIMO_PS 0x001000 /* MIMO power save enabled */ +#define IEEE80211_NODE_MIMO_RTS 0x002000 /* send RTS in MIMO PS */ +#define IEEE80211_NODE_RIFS 0x004000 /* RIFS enabled */ +#define IEEE80211_NODE_SGI20 0x008000 /* Short GI in HT20 enabled */ +#define IEEE80211_NODE_SGI40 0x010000 /* Short GI in HT40 enabled */ +#define IEEE80211_NODE_ASSOCID 0x020000 /* xmit requires associd */ +#define IEEE80211_NODE_AMSDU_RX 0x040000 /* AMSDU rx enabled */ +#define IEEE80211_NODE_AMSDU_TX 0x080000 /* AMSDU tx enabled */ #endif #define MAXCHAN 1536 /* max 1.5K channels */ @@ -2302,6 +2308,16 @@ getflags(int flags) } if (flags & IEEE80211_NODE_RIFS) *cp++ = 'I'; + if (flags & IEEE80211_NODE_SGI40) { + *cp++ = 'S'; + if (flags & IEEE80211_NODE_SGI20) + *cp++ = '+'; + } else if (flags & IEEE80211_NODE_SGI20) + *cp++ = 's'; + if (flags & IEEE80211_NODE_AMSDU_TX) + *cp++ = 't'; + if (flags & IEEE80211_NODE_AMSDU_RX) + *cp++ = 'r'; *cp = '\0'; return flagstring; } @@ -3081,8 +3097,6 @@ static enum ieee80211_opmode get80211opm static int gettxseq(const struct ieee80211req_sta_info *si) { -#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ - int i, txseq; if ((si->isi_state & IEEE80211_NODE_QOS) == 0) @@ -3093,14 +3107,11 @@ gettxseq(const struct ieee80211req_sta_i if (si->isi_txseqs[i] > txseq) txseq = si->isi_txseqs[i]; return txseq; -#undef IEEE80211_NODE_QOS } static int getrxseq(const struct ieee80211req_sta_info *si) { -#define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ - int i, rxseq; if ((si->isi_state & IEEE80211_NODE_QOS) == 0) @@ -3111,7 +3122,6 @@ getrxseq(const struct ieee80211req_sta_i if (si->isi_rxseqs[i] > rxseq) rxseq = si->isi_rxseqs[i]; return rxseq; -#undef IEEE80211_NODE_QOS } static void @@ -3141,7 +3151,7 @@ list_stations(int s) getchaninfo(s); - printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %4s\n" + printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %-7s\n" , "ADDR" , "AID" , "CHAN" @@ -3160,7 +3170,7 @@ list_stations(int s) si = (const struct ieee80211req_sta_info *) cp; if (si->isi_len < sizeof(*si)) break; - printf("%s %4u %4d %3dM %3.1f %4d %6d %6d %-4.4s %-4.4s" + printf("%s %4u %4d %3dM %3.1f %4d %6d %6d %-4.4s %-7.7s" , ether_ntoa((const struct ether_addr*) si->isi_macaddr) , IEEE80211_AID(si->isi_associd) , ieee80211_mhz2ieee(si->isi_freq, si->isi_flags) Modified: projects/openssl_098_merge_8/share/termcap/termcap.src ============================================================================== --- projects/openssl_098_merge_8/share/termcap/termcap.src Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/share/termcap/termcap.src Sun Jun 14 11:26:42 2009 (r194183) @@ -2481,7 +2481,7 @@ vt100|dec-vt100|vt100-am|vt100am|dec vt1 :K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:pt:sr=2*\EM:xn:\ :sc=2\E7:rc=2\E8:cs=5\E[%i%d;%dr:UP=2\E[%dA:DO=2\E[%dB:RI=2\E[%dC:\ :LE=2\E[%dD:ct=2\E[3g:st=2\EH:ta=^I:ms:bl=^G:cr=^M:eo:it#8:\ - :RA=\E[?7l:SA=\E[?7h: + :RA=\E[?7l:SA=\E[?7h:po=\E[5i:pf=\E[4i: vt100-nam|dec-vt100-nam|vt100nam|vt100 w/no am:\ :am@:xn@:\ :is=\E>\E[?1;3;4;5;7l\E[?8h\E[1;24r\E[24;1H:\ @@ -2771,6 +2771,8 @@ SC|screen|VT 100/ANSI X3.64 virtual term :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ + :F3=\E[25~:F4=\E[26~:F5=\E[28~:F6=\E[29~:\ + :F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\ :kh=\E[1~:kI=\E[2~:kD=\E[3~:@7=\E[4~:kP=\E[5~:\ :kN=\E[6~:eA=\E(B\E)0:as=^N:ae=^O:ti=\E[?1049h:te=\E[?1049l:\ :vi=\E[?25l:ve=\E[34h\E[?25h:vs=\E[34l:\ @@ -3998,6 +4000,31 @@ wy100q|Wyse 100 for Quotron:\ :dc=\EW:dl=\ER:do=^J:ei=\Er:im=\Eq:is=\E`\072\200\EC\EDF\E0\E'\E(\EA21:\ :kd=^J:kl=^H:kr=^L:ku=^K:li#24:nd=^L:up=^K:us=\EG8:ue=\EG0:\ :so=\EG4:se=\EG0:sg#1:sr=\Ej:ho=^^:ug#1: +# Wyse 120 definitions from conf/81882 by Meister des Chaos <meister@netz00.com> +wy120|wyse120|wy150|wyse150|Wyse 120/150:\ + :am:bw:hs:km:mi:ms:xo:\ + :co#80:it#8:li#24:pb#9601:ws#45:\ + :ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\ + :cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\ + :ei=\Er:fs=^M:ho=^^:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\ + :is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\ + :k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\ + :k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\ + :kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:mb=\EG2:\ + :me=\E(\EH\003\EG0\EcD:mh=\EGp:mr=\EG4:nd=^L:nw=\r\n:\ + :se=\EG0:sf=\n:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:\ + :ti=\Ew0:ts=\EF:ue=\EG0:up=^K:us=\EG8:vb=\E`8\E`9:ve=\E`1:\ + :vi=\E`0: +wy120-w|wyse120-w|wy150-w|wyse150-w|wyse 120/150 132-column:\ + :cm=\Ea%i%dR%dC:co#132:ws#97:tc=wy120: +wy120-25|wyse120-25|wy150-25|wyse150-25|wyse 120/150 80-column 25-lines:\ + :li#25:tc=wy120: +wy120-25-w|wyse120-25-w|wy150-25-w|wyse150-25-w|wyse 120/150 132-column 25-lines:\ + :cm=\Ea%i%dR%dC:co#132:li#25:ws#97:tc=wy120: +wy120-vb|wyse120-vb|wy150-vb|wyse150-vb|Wyse 120/150 visible bell:\ + :bl@:tc=wy120: +wy120-w-vb|wy120-wvb|wyse120-wvb|wy150-w-vb|wyse150-w-vb|Wyse 120/150 132-column visible bell:\ + :bl@:cm=\Ea%i%dR%dC:co#132:ws#97:tc=wy120: # # -------------------------------- # # y: TELERAY @@ -4501,7 +4528,9 @@ linux|Linux Console:\ :me=\E[0;10m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:\ :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ :ue=\E[24m:up=\E[A:us=\E[4m:vb=200\E[?5h\E[?5l:\ - :ve=\E[?25h:vi=\E[?25l: + :ve=\E[?25h:vi=\E[?25l:\ + :k;=\E[21~:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\ + :F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~: linux-m|Linux Console no color:\ :pa@:Co@:AF@:AB@:op@:\ :tc=linux: @@ -4547,6 +4576,12 @@ rxvt-mono|rxvt terminal emulator (monoch :te=\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\ :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h: +# Termcap entry for rxvt-unicode, taken from http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.7.html#I_need_a_termcap_file_entry +rxvt-unicode|rxvt-unicode terminal (X Window System):\ + :SF=\E[%dS:SR=\E[%dT:bw:ec=\E[%dX:kb=\177:kd=\EOB:ke=\E[?1l\E>:\ + :kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:lm#0:te=\E[r\E[?1049l:\ + :ti=\E[?1049h:tc=rxvt-mono: + rxvt|rxvt terminal emulator (X Window System):\ :pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:tc=rxvt-mono: Modified: projects/openssl_098_merge_8/sys/cddl/compat/opensolaris/kern/opensolaris.c ============================================================================== --- projects/openssl_098_merge_8/sys/cddl/compat/opensolaris/kern/opensolaris.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/cddl/compat/opensolaris/kern/opensolaris.c Sun Jun 14 11:26:42 2009 (r194183) @@ -83,7 +83,7 @@ opensolaris_modevent(module_t mod __unus switch (type) { case MOD_LOAD: - utsname.nodename = prison0.pr_host; + utsname.nodename = prison0.pr_hostname; break; case MOD_UNLOAD: Modified: projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c ============================================================================== --- projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c Sun Jun 14 11:26:42 2009 (r194183) @@ -179,9 +179,9 @@ static char * spa_history_zone() { #ifdef _KERNEL - /* XXX: pr_host can be changed by default from within a jail! */ + /* XXX: pr_hostname can be changed by default from within a jail! */ if (jailed(curthread->td_ucred)) - return (curthread->td_ucred->cr_prison->pr_host); + return (curthread->td_ucred->cr_prison->pr_hostname); #endif return ("global"); } Modified: projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ah_desc.h ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ah_desc.h Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ah_desc.h Sun Jun 14 11:26:42 2009 (r194183) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_desc.h,v 1.5 2008/11/10 04:08:00 sam Exp $ + * $FreeBSD$ */ #ifndef _DEV_ATH_DESC_H @@ -36,7 +36,6 @@ struct ath_tx_status { uint16_t ts_tstamp; /* h/w assigned timestamp */ uint8_t ts_status; /* frame status, 0 => xmit ok */ uint8_t ts_rate; /* h/w transmit rate index */ -#define HAL_TXSTAT_ALTRATE 0x80 /* alternate xmit rate used */ int8_t ts_rssi; /* tx ack RSSI */ uint8_t ts_shortretry; /* # short retries */ uint8_t ts_longretry; /* # long retries */ Modified: projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Sun Jun 14 11:26:42 2009 (r194183) @@ -869,16 +869,13 @@ ar5212ProcTxDesc(struct ath_hal *ah, ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate0); break; case 1: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate1) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate1); break; case 2: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate2) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate2); break; case 3: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate3) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate3); break; } ts->ts_rssi = MS(ads->ds_txstatus1, AR_AckSigStrength); Modified: projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Sun Jun 14 11:26:42 2009 (r194183) @@ -519,16 +519,13 @@ ar5416ProcTxDesc(struct ath_hal *ah, ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate0); break; case 1: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate1) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate1); break; case 2: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate2) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate2); break; case 3: - ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate3) | - HAL_TXSTAT_ALTRATE; + ts->ts_rate = MS(ads->ds_ctl3, AR_XmitRate3); break; } Modified: projects/openssl_098_merge_8/sys/dev/ath/ath_rate/sample/sample.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ath/ath_rate/sample/sample.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ath/ath_rate/sample/sample.c Sun Jun 14 11:26:42 2009 (r194183) @@ -561,7 +561,7 @@ ath_rate_tx_complete(struct ath_softc *s const HAL_RATE_TABLE *rt = sc->sc_currates; int mrr; - final_rix = rt->rateCodeToIndex[ts->ts_rate &~ HAL_TXSTAT_ALTRATE]; + final_rix = rt->rateCodeToIndex[ts->ts_rate]; short_tries = ts->ts_shortretry; long_tries = ts->ts_longretry + 1; frame_size = ds0->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ @@ -579,7 +579,7 @@ ath_rate_tx_complete(struct ath_softc *s return; } mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT); - if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) { + if (!mrr || ts->ts_finaltsi == 0) { if (!IS_RATE_DEFINED(sn, final_rix)) { badrate(ifp, 0, ts->ts_rate, long_tries, ts->ts_status); return; Modified: projects/openssl_098_merge_8/sys/dev/ath/if_ath.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ath/if_ath.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ath/if_ath.c Sun Jun 14 11:26:42 2009 (r194183) @@ -4918,7 +4918,7 @@ ath_tx_processq(struct ath_softc *sc, st u_int8_t txant = ts->ts_antenna; sc->sc_stats.ast_ant_tx[txant]++; sc->sc_ant_tx[txant]++; - if (ts->ts_rate & HAL_TXSTAT_ALTRATE) + if (ts->ts_finaltsi != 0) sc->sc_stats.ast_tx_altrate++; pri = M_WME_GETAC(bf->bf_m); if (pri >= WME_AC_VO) Modified: projects/openssl_098_merge_8/sys/dev/firewire/firewire.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/firewire/firewire.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/firewire/firewire.c Sun Jun 14 11:26:42 2009 (r194183) @@ -724,7 +724,7 @@ fw_reset_crom(struct firewire_comm *fc) crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif mtx_lock(&prison0.pr_mtx); - crom_add_simple_text(src, root, &buf->hw, prison0.pr_host); + crom_add_simple_text(src, root, &buf->hw, prison0.pr_hostname); mtx_unlock(&prison0.pr_mtx); } Modified: projects/openssl_098_merge_8/sys/dev/mii/miidevs ============================================================================== --- projects/openssl_098_merge_8/sys/dev/mii/miidevs Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/mii/miidevs Sun Jun 14 11:26:42 2009 (r194183) @@ -204,6 +204,7 @@ model NATSEMI DP83815 0x0002 DP83815 10 model NATSEMI DP83847 0x0003 DP83847 10/100 media interface model NATSEMI DP83891 0x0005 DP83891 10/100/1000 media interface model NATSEMI DP83861 0x0006 DP83861 10/100/1000 media interface +model NATSEMI DP83865 0x0007 DP83865 10/100/1000 media interface /* Quality Semiconductor PHYs */ model QUALSEMI QS6612 0x0000 QS6612 10/100 media interface Modified: projects/openssl_098_merge_8/sys/dev/mii/nsgphy.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/mii/nsgphy.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/mii/nsgphy.c Sun Jun 14 11:26:42 2009 (r194183) @@ -41,17 +41,19 @@ __FBSDID("$FreeBSD$"); /* - * Driver for the National Semiconductor DP83891 and DP83861 + * Driver for the National Semiconductor DP83861, DP83865 and DP83891 * 10/100/1000 PHYs. * Datasheet available at: http://www.national.com/ds/DP/DP83861.pdf + * and at: http://www.national.com/ds/DP/DP83865.pdf * - * The DP83891 is the older NatSemi gigE PHY which isn't being sold - * anymore. The DP83861 is its replacement, which is an 'enhanced' - * firmware driven component. The major difference between the - * two is that the 83891 can't generate interrupts, while the - * 83861 can. (I think it wasn't originally designed to do this, but - * it can now thanks to firmware updates.) The 83861 also allows - * access to its internal RAM via indirect register access. + * The DP83891 is the older NS GigE PHY which isn't being sold + * anymore. The DP83861 is its replacement, which is an 'enhanced' + * firmware driven component. The major difference between the + * two is that the DP83891 can't generate interrupts, while the + * 83861 can (probably it wasn't originally designed to do this, but + * it can now thanks to firmware updates). The DP83861 also allows + * access to its internal RAM via indirect register access. The + * DP83865 is an ultra low power version of the DP83861 and DP83891. */ #include <sys/param.h> @@ -99,6 +101,7 @@ static void nsgphy_status(struct mii_sof static const struct mii_phydesc nsgphys[] = { MII_PHY_DESC(NATSEMI, DP83861), + MII_PHY_DESC(NATSEMI, DP83865), MII_PHY_DESC(NATSEMI, DP83891), MII_PHY_END }; @@ -133,8 +136,14 @@ nsgphy_attach(device_t dev) mii->mii_instance++; + mii_phy_reset(sc); + + /* + * NB: the PHY has the 10baseT BMSR bits hard-wired to 0, + * even though it supports 10baseT. + */ sc->mii_capabilities = (PHY_READ(sc, MII_BMSR) | - (BMSR_10TFDX|BMSR_10THDX)) & ma->mii_capmask; + (BMSR_10TFDX | BMSR_10THDX)) & ma->mii_capmask; if (sc->mii_capabilities & BMSR_EXTSTAT) sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); @@ -238,7 +247,7 @@ nsgphy_status(struct mii_softc *sc) return; } - switch (physup & (PHY_SUP_SPEED1|PHY_SUP_SPEED0)) { + switch (physup & (PHY_SUP_SPEED1 | PHY_SUP_SPEED0)) { case PHY_SUP_SPEED1: mii->mii_media_active |= IFM_1000_T; gtsr = PHY_READ(sc, MII_100T2SR); @@ -257,9 +266,13 @@ nsgphy_status(struct mii_softc *sc) default: mii->mii_media_active |= IFM_NONE; mii->mii_media_status = 0; + return; } + if (physup & PHY_SUP_DUPLEX) mii->mii_media_active |= IFM_FDX; + else + mii->mii_media_active |= IFM_HDX; } else mii->mii_media_active = ife->ifm_media; } Modified: projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.c Sun Jun 14 11:26:42 2009 (r194183) @@ -74,10 +74,11 @@ ofw_bus_gen_destroy_devinfo(struct ofw_b free(obd->obd_type, M_OFWPROP); } -int +int ofw_bus_gen_child_pnpinfo_str(device_t cbdev, device_t child, char *buf, size_t buflen) { + if (ofw_bus_get_name(child) != NULL) { strlcat(buf, "name=", buflen); strlcat(buf, ofw_bus_get_name(child), buflen); @@ -87,7 +88,6 @@ ofw_bus_gen_child_pnpinfo_str(device_t c strlcat(buf, " compat=", buflen); strlcat(buf, ofw_bus_get_compat(child), buflen); } - return (0); }; @@ -95,19 +95,19 @@ const char * ofw_bus_gen_get_compat(device_t bus, device_t dev) { const struct ofw_bus_devinfo *obd; - - obd = OFW_BUS_GET_DEVINFO(bus, dev); + + obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) return (NULL); return (obd->obd_compat); } - + const char * ofw_bus_gen_get_model(device_t bus, device_t dev) { const struct ofw_bus_devinfo *obd; - obd = OFW_BUS_GET_DEVINFO(bus, dev); + obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) return (NULL); return (obd->obd_model); @@ -118,7 +118,7 @@ ofw_bus_gen_get_name(device_t bus, devic { const struct ofw_bus_devinfo *obd; - obd = OFW_BUS_GET_DEVINFO(bus, dev); + obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) return (NULL); return (obd->obd_name); @@ -129,7 +129,7 @@ ofw_bus_gen_get_node(device_t bus, devic { const struct ofw_bus_devinfo *obd; - obd = OFW_BUS_GET_DEVINFO(bus, dev); + obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) return (0); return (obd->obd_node); @@ -140,7 +140,7 @@ ofw_bus_gen_get_type(device_t bus, devic { const struct ofw_bus_devinfo *obd; - obd = OFW_BUS_GET_DEVINFO(bus, dev); + obd = OFW_BUS_GET_DEVINFO(bus, dev); if (obd == NULL) return (NULL); return (obd->obd_type); @@ -162,15 +162,13 @@ ofw_bus_setup_iinfo(phandle_t node, stru msksz = OF_getprop_alloc(node, "interrupt-map-mask", 1, (void **)&ii->opi_imapmsk); /* - * Failure to get the mask is ignored; a full mask is used then. - * Barf on bad mask sizes, however. + * Failure to get the mask is ignored; a full mask is used + * then. We barf on bad mask sizes, however. */ - if (msksz != -1 && msksz != ii->opi_addrc + intrsz) { + if (msksz != -1 && msksz != ii->opi_addrc + intrsz) panic("ofw_bus_setup_iinfo: bad interrupt-map-mask " "property!"); - } } - } int @@ -197,10 +195,10 @@ ofw_bus_lookup_imap(phandle_t node, stru * Map an interrupt using the firmware reg, interrupt-map and * interrupt-map-mask properties. * The interrupt property to be mapped must be of size intrsz, and pointed to - * by intr. The regs property of the node for which the mapping is done must + * by intr. The regs property of the node for which the mapping is done must * be passed as regs. This property is an array of register specifications; * the size of the address part of such a specification must be passed as - * physsz. Only the first element of the property is used. + * physsz. Only the first element of the property is used. * imap and imapsz hold the interrupt mask and it's size. * imapmsk is a pointer to the interrupt-map-mask property, which must have * a size of physsz + intrsz; it may be NULL, in which case a full mask is @@ -216,11 +214,11 @@ ofw_bus_search_intrmap(void *intr, int i int rintrsz) { phandle_t parent; - u_int8_t *ref = maskbuf; - u_int8_t *uiintr = intr; - u_int8_t *uiregs = regs; - u_int8_t *uiimapmsk = imapmsk; - u_int8_t *mptr; + uint8_t *ref = maskbuf; + uint8_t *uiintr = intr; + uint8_t *uiregs = regs; + uint8_t *uiimapmsk = imapmsk; + uint8_t *mptr; pcell_t pintrsz; int i, rsz, tsz; @@ -244,13 +242,13 @@ ofw_bus_search_intrmap(void *intr, int i pintrsz = 1; /* default */ pintrsz *= sizeof(pcell_t); - /* Compute the map stride size */ + /* Compute the map stride size. */ tsz = physsz + intrsz + sizeof(phandle_t) + pintrsz; KASSERT(i >= tsz, ("ofw_bus_search_intrmap: truncated map")); - + /* * XXX: Apple hardware uses a second cell to set information - * on the interrupt trigger type. This information should + * on the interrupt trigger type. This information should * be used somewhere to program the PIC. */ Modified: projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.h ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.h Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ofw/ofw_bus_subr.h Sun Jun 14 11:26:42 2009 (r194183) @@ -41,30 +41,30 @@ #define ORIR_NOTFOUND 0xffffffff struct ofw_bus_iinfo { - u_int8_t *opi_imap; - u_int8_t *opi_imapmsk; + uint8_t *opi_imap; + uint8_t *opi_imapmsk; int opi_imapsz; pcell_t opi_addrc; }; +/* Generic implementation of ofw_bus_if.m methods and helper routines */ int ofw_bus_gen_setup_devinfo(struct ofw_bus_devinfo *, phandle_t); void ofw_bus_gen_destroy_devinfo(struct ofw_bus_devinfo *); +ofw_bus_get_compat_t ofw_bus_gen_get_compat; +ofw_bus_get_model_t ofw_bus_gen_get_model; +ofw_bus_get_name_t ofw_bus_gen_get_name; +ofw_bus_get_node_t ofw_bus_gen_get_node; +ofw_bus_get_type_t ofw_bus_gen_get_type; + /* Helper method to report interesting OF properties in pnpinfo */ -int ofw_bus_gen_child_pnpinfo_str(device_t, device_t, char *, size_t); +bus_child_pnpinfo_str_t ofw_bus_gen_child_pnpinfo_str; /* Routines for processing firmware interrupt maps */ - void ofw_bus_setup_iinfo(phandle_t, struct ofw_bus_iinfo *, int); int ofw_bus_lookup_imap(phandle_t, struct ofw_bus_iinfo *, void *, int, void *, int, void *, int, void *); int ofw_bus_search_intrmap(void *, int, void *, int, void *, int, void *, void *, void *, int); -ofw_bus_get_compat_t ofw_bus_gen_get_compat; -ofw_bus_get_model_t ofw_bus_gen_get_model; -ofw_bus_get_name_t ofw_bus_gen_get_name; -ofw_bus_get_node_t ofw_bus_gen_get_node; -ofw_bus_get_type_t ofw_bus_gen_get_type; - #endif /* !_DEV_OFW_OFW_BUS_SUBR_H_ */ Modified: projects/openssl_098_merge_8/sys/dev/ofw/ofw_disk.c ============================================================================== --- projects/openssl_098_merge_8/sys/dev/ofw/ofw_disk.c Sun Jun 14 09:54:16 2009 (r194182) +++ projects/openssl_098_merge_8/sys/dev/ofw/ofw_disk.c Sun Jun 14 11:26:42 2009 (r194183) @@ -21,8 +21,6 @@ * 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 <sys/cdefs.h> @@ -47,16 +45,16 @@ __FBSDID("$FreeBSD$"); struct ofwd_softc { - struct bio_queue_head ofwd_bio_queue; - struct mtx ofwd_queue_mtx; + struct bio_queue_head ofwd_bio_queue; + struct mtx ofwd_queue_mtx; ihandle_t ofwd_instance; off_t ofwd_mediasize; - unsigned ofwd_sectorsize; - unsigned ofwd_fwheads; - unsigned ofwd_fwsectors; - struct proc *ofwd_procp; - struct g_geom *ofwd_gp; - struct g_provider *ofwd_pp; + unsigned ofwd_sectorsize; + unsigned ofwd_fwheads; + unsigned ofwd_fwsectors; + struct proc *ofwd_procp; + struct g_geom *ofwd_gp; + struct g_provider *ofwd_pp; } ofwd_softc; static g_init_t g_ofwd_init; @@ -83,21 +81,21 @@ ofwd_startio(struct ofwd_softc *sc, stru r = OF_seek(sc->ofwd_instance, bp->bio_offset); - switch (bp->bio_cmd) { - case BIO_READ: + switch (bp->bio_cmd) { + case BIO_READ: r = OF_read(sc->ofwd_instance, (void *)bp->bio_data, - bp->bio_length); - break; - case BIO_WRITE: + bp->bio_length); + break; + case BIO_WRITE: r = OF_write(sc->ofwd_instance, (void *)bp->bio_data, - bp->bio_length); - break; - } + bp->bio_length); + break; + } if (r != bp->bio_length) panic("ofwd: incorrect i/o count"); - bp->bio_resid = 0; - return (0); + bp->bio_resid = 0; + return (0); } static void @@ -107,41 +105,41 @@ ofwd_kthread(void *arg) struct bio *bp; int error; - sc = arg; - curthread->td_base_pri = PRIBIO; + sc = arg; + curthread->td_base_pri = PRIBIO; - for (;;) { + for (;;) { mtx_lock(&sc->ofwd_queue_mtx); bp = bioq_takefirst(&sc->ofwd_bio_queue); if (!bp) { msleep(sc, &sc->ofwd_queue_mtx, PRIBIO | PDROP, "ofwdwait", 0); - continue; + continue; } - mtx_unlock(&sc->ofwd_queue_mtx); - if (bp->bio_cmd == BIO_GETATTR) { + mtx_unlock(&sc->ofwd_queue_mtx); + if (bp->bio_cmd == BIO_GETATTR) { error = EOPNOTSUPP; - } else + } else error = ofwd_startio(sc, bp); if (error != -1) { - bp->bio_completed = bp->bio_length; - g_io_deliver(bp, error); - } + bp->bio_completed = bp->bio_length; + g_io_deliver(bp, error); + } } } static void g_ofwd_init(struct g_class *mp __unused) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906141126.n5EBQgRX047906>