Date: Tue, 25 Oct 2011 23:51:19 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r226768 - in user/adrian/if_ath_tx: contrib/top contrib/tzdata sbin/swapon share/man/man4 share/mk sys/boot/i386/boot2 sys/boot/i386/btx/lib sys/boot/i386/common sys/boot/i386/libi386 s... Message-ID: <201110252351.p9PNpJeY022507@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Oct 25 23:51:18 2011 New Revision: 226768 URL: http://svn.freebsd.org/changeset/base/226768 Log: Another IFC pass, primarily to pick up the 11n/HEAD HAL sync I just did. Added: user/adrian/if_ath_tx/sys/boot/i386/common/edd.h - copied unchanged from r226767, head/sys/boot/i386/common/edd.h Modified: user/adrian/if_ath_tx/contrib/tzdata/asia user/adrian/if_ath_tx/contrib/tzdata/australasia user/adrian/if_ath_tx/contrib/tzdata/backward user/adrian/if_ath_tx/contrib/tzdata/europe user/adrian/if_ath_tx/contrib/tzdata/northamerica user/adrian/if_ath_tx/contrib/tzdata/southamerica user/adrian/if_ath_tx/contrib/tzdata/zone.tab user/adrian/if_ath_tx/sbin/swapon/Makefile user/adrian/if_ath_tx/sbin/swapon/swapon.c user/adrian/if_ath_tx/share/man/man4/axe.4 user/adrian/if_ath_tx/share/man/man4/vlan.4 user/adrian/if_ath_tx/sys/boot/i386/boot2/boot2.c user/adrian/if_ath_tx/sys/boot/i386/btx/lib/btxv86.h user/adrian/if_ath_tx/sys/boot/i386/common/cons.c user/adrian/if_ath_tx/sys/boot/i386/common/drv.c user/adrian/if_ath_tx/sys/boot/i386/libi386/Makefile user/adrian/if_ath_tx/sys/boot/i386/libi386/bioscd.c user/adrian/if_ath_tx/sys/boot/i386/libi386/biosdisk.c user/adrian/if_ath_tx/sys/boot/i386/libi386/biosmem.c user/adrian/if_ath_tx/sys/boot/i386/libi386/biospci.c user/adrian/if_ath_tx/sys/boot/i386/libi386/biossmap.c user/adrian/if_ath_tx/sys/boot/i386/libi386/libi386.h user/adrian/if_ath_tx/sys/boot/i386/libi386/vidconsole.c user/adrian/if_ath_tx/sys/boot/pc98/boot2/boot2.c user/adrian/if_ath_tx/sys/boot/pc98/btx/lib/btxv86.h user/adrian/if_ath_tx/sys/boot/pc98/libpc98/bioscd.c user/adrian/if_ath_tx/sys/boot/pc98/libpc98/vidconsole.c user/adrian/if_ath_tx/sys/boot/pc98/loader/main.c user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416.h user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/adrian/if_ath_tx/sys/dev/bge/if_bge.c user/adrian/if_ath_tx/sys/dev/usb/net/if_axe.c user/adrian/if_ath_tx/sys/dev/usb/net/if_axereg.h user/adrian/if_ath_tx/sys/modules/zfs/Makefile user/adrian/if_ath_tx/sys/vm/vm_page.c user/adrian/if_ath_tx/usr.sbin/bsdinstall/partedit/partedit.c user/adrian/if_ath_tx/usr.sbin/bsdinstall/scripts/netconfig Directory Properties: user/adrian/if_ath_tx/ (props changed) user/adrian/if_ath_tx/cddl/contrib/opensolaris/ (props changed) user/adrian/if_ath_tx/contrib/bind9/ (props changed) user/adrian/if_ath_tx/contrib/binutils/ (props changed) user/adrian/if_ath_tx/contrib/bzip2/ (props changed) user/adrian/if_ath_tx/contrib/com_err/ (props changed) user/adrian/if_ath_tx/contrib/compiler-rt/ (props changed) user/adrian/if_ath_tx/contrib/dialog/ (props changed) user/adrian/if_ath_tx/contrib/ee/ (props changed) user/adrian/if_ath_tx/contrib/expat/ (props changed) user/adrian/if_ath_tx/contrib/file/ (props changed) user/adrian/if_ath_tx/contrib/gcc/ (props changed) user/adrian/if_ath_tx/contrib/gdb/ (props changed) user/adrian/if_ath_tx/contrib/gdtoa/ (props changed) user/adrian/if_ath_tx/contrib/gnu-sort/ (props changed) user/adrian/if_ath_tx/contrib/groff/ (props changed) user/adrian/if_ath_tx/contrib/less/ (props changed) user/adrian/if_ath_tx/contrib/libpcap/ (props changed) user/adrian/if_ath_tx/contrib/libstdc++/ (props changed) user/adrian/if_ath_tx/contrib/llvm/ (props changed) user/adrian/if_ath_tx/contrib/llvm/tools/clang/ (props changed) user/adrian/if_ath_tx/contrib/ncurses/ (props changed) user/adrian/if_ath_tx/contrib/netcat/ (props changed) user/adrian/if_ath_tx/contrib/ntp/ (props changed) user/adrian/if_ath_tx/contrib/one-true-awk/ (props changed) user/adrian/if_ath_tx/contrib/openbsm/ (props changed) user/adrian/if_ath_tx/contrib/openpam/ (props changed) user/adrian/if_ath_tx/contrib/openresolv/ (props changed) user/adrian/if_ath_tx/contrib/pf/ (props changed) user/adrian/if_ath_tx/contrib/sendmail/ (props changed) user/adrian/if_ath_tx/contrib/tcpdump/ (props changed) user/adrian/if_ath_tx/contrib/tcsh/ (props changed) user/adrian/if_ath_tx/contrib/tnftp/ (props changed) user/adrian/if_ath_tx/contrib/top/ (props changed) user/adrian/if_ath_tx/contrib/top/install-sh (props changed) user/adrian/if_ath_tx/contrib/tzcode/stdtime/ (props changed) user/adrian/if_ath_tx/contrib/tzcode/zic/ (props changed) user/adrian/if_ath_tx/contrib/tzdata/ (props changed) user/adrian/if_ath_tx/contrib/wpa/ (props changed) user/adrian/if_ath_tx/contrib/xz/ (props changed) user/adrian/if_ath_tx/crypto/heimdal/ (props changed) user/adrian/if_ath_tx/crypto/openssh/ (props changed) user/adrian/if_ath_tx/crypto/openssl/ (props changed) user/adrian/if_ath_tx/gnu/lib/ (props changed) user/adrian/if_ath_tx/gnu/usr.bin/binutils/ (props changed) user/adrian/if_ath_tx/gnu/usr.bin/cc/cc_tools/ (props changed) user/adrian/if_ath_tx/gnu/usr.bin/gdb/ (props changed) user/adrian/if_ath_tx/lib/libc/ (props changed) user/adrian/if_ath_tx/lib/libc/stdtime/ (props changed) user/adrian/if_ath_tx/lib/libutil/ (props changed) user/adrian/if_ath_tx/lib/libz/ (props changed) user/adrian/if_ath_tx/sbin/ (props changed) user/adrian/if_ath_tx/sbin/ipfw/ (props changed) user/adrian/if_ath_tx/share/mk/bsd.arch.inc.mk (props changed) user/adrian/if_ath_tx/share/zoneinfo/ (props changed) user/adrian/if_ath_tx/sys/ (props changed) user/adrian/if_ath_tx/sys/amd64/include/xen/ (props changed) user/adrian/if_ath_tx/sys/boot/ (props changed) user/adrian/if_ath_tx/sys/boot/i386/efi/ (props changed) user/adrian/if_ath_tx/sys/boot/ia64/efi/ (props changed) user/adrian/if_ath_tx/sys/boot/ia64/ski/ (props changed) user/adrian/if_ath_tx/sys/boot/powerpc/boot1.chrp/ (props changed) user/adrian/if_ath_tx/sys/boot/powerpc/ofw/ (props changed) user/adrian/if_ath_tx/sys/cddl/contrib/opensolaris/ (props changed) user/adrian/if_ath_tx/sys/conf/ (props changed) user/adrian/if_ath_tx/sys/contrib/dev/acpica/ (props changed) user/adrian/if_ath_tx/sys/contrib/octeon-sdk/ (props changed) user/adrian/if_ath_tx/sys/contrib/pf/ (props changed) user/adrian/if_ath_tx/sys/contrib/x86emu/ (props changed) user/adrian/if_ath_tx/usr.bin/calendar/ (props changed) user/adrian/if_ath_tx/usr.bin/csup/ (props changed) user/adrian/if_ath_tx/usr.bin/procstat/ (props changed) user/adrian/if_ath_tx/usr.sbin/ndiscvt/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtadvctl/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtadvd/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtsold/ (props changed) user/adrian/if_ath_tx/usr.sbin/zic/ (props changed) Modified: user/adrian/if_ath_tx/contrib/tzdata/asia ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/asia Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/asia Tue Oct 25 23:51:18 2011 (r226768) @@ -1,4 +1,4 @@ -# @(#)asia 8.68 +# @(#)asia 8.69 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/adrian/if_ath_tx/contrib/tzdata/australasia ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/australasia Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/australasia Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.27 +# @(#)australasia 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/adrian/if_ath_tx/contrib/tzdata/backward ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/backward Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/backward Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)backward 8.9 +# @(#)backward 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -67,7 +67,6 @@ Link America/Havana Cuba Link Africa/Cairo Egypt Link Europe/Dublin Eire Link Europe/London Europe/Belfast -Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB Link Europe/London GB-Eire Link Etc/GMT GMT+0 Modified: user/adrian/if_ath_tx/contrib/tzdata/europe ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/europe Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/europe Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.38 +# @(#)europe 8.39 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1655,6 +1655,29 @@ Zone Europe/Malta 0:58:04 - LMT 1893 Nov # But [two people] separately reported via # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau. # The Tiraspol entry has therefore been removed for now. +# +# From Alexander Krivenyshev (2011-10-17): +# Pridnestrovian Moldavian Republic (PMR, also known as +# "Pridnestrovie") has abolished seasonal clock change (no transition +# to the Winter Time). +# +# News (in Russian): +# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">; +# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html +# </a> +# +# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">; +# http://www.allmoldova.com/moldova-news/1249064116.html +# </a> +# +# The substance of this change (reinstatement of the Tiraspol entry) +# is from a patch from Petr Machata (2011-10-17) +# +# From Tim Parenti (2011-10-19) +# In addition, being situated at +4651+2938 would give Tiraspol +# a pre-1880 LMT offset of 1:58:32. +# +# (which agrees with the earlier entry that had been removed) # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -1671,6 +1694,21 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880 # See Romania commentary for the guessed 1997 transition to EU rules. 2:00 EU EE%sT +Zone Europe/Tiraspol 1:58:32 - LMT 1880 + 1:55 - CMT 1918 Feb 15 # Chisinau MT + 1:44:24 - BMT 1931 Jul 24 # Bucharest MT + 2:00 Romania EE%sT 1940 Aug 15 + 2:00 1:00 EEST 1941 Jul 17 + 1:00 C-Eur CE%sT 1944 Aug 24 + 3:00 Russia MSK/MSD 1990 + 3:00 - MSK 1990 May 6 + 2:00 - EET 1991 + 2:00 Russia EE%sT 1992 + 2:00 E-Eur EE%sT 1997 +# See Romania commentary for the guessed 1997 transition to EU rules. + 2:00 EU EE%sT 2011 Mar lastSun 1:00u + 3:00 - FET # Further-eastern European Time + # Monaco # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. @@ -2651,6 +2689,28 @@ Link Europe/Istanbul Asia/Istanbul # Ist # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">; # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ # </a> +# +# From Philip Pizzey (2011-10-18): +# Today my Ukrainian colleagues have informed me that the +# Ukrainian parliament have decided that they will go to winter +# time this year after all. +# +# From Udo Schwedt (2011-10-18): +# As far as I understand, the recent change to the Ukranian time zone +# (Europe/Kiev) to introduce permanent daylight saving time (similar +# to Russia) was reverted today: +# +# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">; +# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995 +# </a> +# +# Also reported by Alexander Bokovoy (2011-10-18) who also noted: +# The law documents themselves are at +# +# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">; +# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 +# </a> + # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Most of Ukraine since 1970 has been like Kiev. @@ -2665,8 +2725,7 @@ Zone Europe/Kiev 2:02:04 - LMT 1880 3:00 - MSK 1990 Jul 1 2:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Ruthenia used CET 1990/1991. # "Uzhhorod" is the transliteration of the Ukrainian name, but # "Uzhgorod" is more common in English. @@ -2680,8 +2739,7 @@ Zone Europe/Uzhgorod 1:29:12 - LMT 1890 1:00 - CET 1991 Mar 31 3:00 2:00 - EET 1992 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. # "Zaporizhia" is the transliteration of the Ukrainian name, but # "Zaporozh'ye" is more common in English. Use the common English @@ -2694,8 +2752,7 @@ Zone Europe/Zaporozhye 2:20:40 - LMT 188 1:00 C-Eur CE%sT 1943 Oct 25 3:00 Russia MSK/MSD 1991 Mar 31 2:00 2:00 E-Eur EE%sT 1995 - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT # Central Crimea used Moscow time 1994/1997. Zone Europe/Simferopol 2:16:24 - LMT 1880 2:16 - SMT 1924 May 2 # Simferopol Mean T @@ -2720,8 +2777,7 @@ Zone Europe/Simferopol 2:16:24 - LMT 188 # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time + 2:00 EU EE%sT ############################################################################### Modified: user/adrian/if_ath_tx/contrib/tzdata/northamerica ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/northamerica Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/northamerica Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.49 +# @(#)northamerica 8.50 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: user/adrian/if_ath_tx/contrib/tzdata/southamerica ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/southamerica Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/southamerica Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.50 +# @(#)southamerica 8.52 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -818,6 +818,19 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # oficial agency about time in Brazil, and she confirmed that the old rule is # still in force. +# From Guilherme Bernardes Rodrigues (2011-10-14) +# It's official, the President signed a decree that includes Bahia in summer +# time. +# [ and in a second message (same day): ] +# I found the decree. +# +# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011 +# Link : +# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">; +# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6 +# </a> + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a>; (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a>; (1932-01-10) @@ -1054,10 +1067,8 @@ Zone America/Maceio -2:22:52 - LMT 1914 # of America/Salvador. Zone America/Bahia -2:34:04 - LMT 1914 -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT -# as noted above, not yet in operation. -# -3:00 - BRT 2011 Oct 16 -# -3:00 Brazil BR%sT + -3:00 - BRT 2011 Oct 16 + -3:00 Brazil BR%sT # # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), Modified: user/adrian/if_ath_tx/contrib/tzdata/zone.tab ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/zone.tab Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/contrib/tzdata/zone.tab Tue Oct 25 23:51:18 2011 (r226768) @@ -1,5 +1,5 @@ # <pre> -# @(#)zone.tab 8.49 +# @(#)zone.tab 8.50 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -258,6 +258,7 @@ LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau +MD +4651+02938 Europe/Tiraspol Pridnestrovie ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo Modified: user/adrian/if_ath_tx/sbin/swapon/Makefile ============================================================================== --- user/adrian/if_ath_tx/sbin/swapon/Makefile Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sbin/swapon/Makefile Tue Oct 25 23:51:18 2011 (r226768) @@ -8,7 +8,6 @@ LINKS+= ${BINDIR}/swapon ${BINDIR}/swapc MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 -WARNS?= 3 DPADD= ${LIBUTIL} LDADD= -lutil Modified: user/adrian/if_ath_tx/sbin/swapon/swapon.c ============================================================================== --- user/adrian/if_ath_tx/sbin/swapon/swapon.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sbin/swapon/swapon.c Tue Oct 25 23:51:18 2011 (r226768) @@ -67,7 +67,7 @@ main(int argc, char **argv) { struct fstab *fsp; char *ptr; - int stat; + int ret; int ch, doall; int sflag = 0, lflag = 0, hflag = 0, qflag = 0; const char *etc_fstab; @@ -144,7 +144,7 @@ main(int argc, char **argv) } argv += optind; - stat = 0; + ret = 0; if (etc_fstab != NULL) setfstab(etc_fstab); if (which_prog == SWAPON || which_prog == SWAPOFF) { @@ -155,7 +155,7 @@ main(int argc, char **argv) if (strstr(fsp->fs_mntops, "noauto")) continue; if (swap_on_off(fsp->fs_spec, 1)) { - stat = 1; + ret = 1; } else { if (!qflag) { printf("%s: %sing %s as swap device\n", @@ -170,7 +170,7 @@ main(int argc, char **argv) usage(); for (; *argv; ++argv) { if (swap_on_off(*argv, 0)) { - stat = 1; + ret = 1; } else if (orig_prog == SWAPCTL) { printf("%s: %sing %s as swap device\n", getprogname(), which_prog == SWAPOFF ? "remov" : "add", @@ -183,7 +183,7 @@ main(int argc, char **argv) else usage(); } - exit(stat); + exit(ret); } static int Modified: user/adrian/if_ath_tx/share/man/man4/axe.4 ============================================================================== --- user/adrian/if_ath_tx/share/man/man4/axe.4 Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/share/man/man4/axe.4 Tue Oct 25 23:51:18 2011 (r226768) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 14, 2011 +.Dd October 25, 2011 .Dt AXE 4 .Os .Sh NAME @@ -238,6 +238,7 @@ The driver failed to allocate an mbuf fo .Xr netintro 4 , .Xr ng_ether 4 , .Xr rgephy 4 , +.Xr vlan 4 , .Xr ifconfig 8 .Rs .%T "ASIX AX88x7x and AX88760 data sheets" Modified: user/adrian/if_ath_tx/share/man/man4/vlan.4 ============================================================================== --- user/adrian/if_ath_tx/share/man/man4/vlan.4 Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/share/man/man4/vlan.4 Tue Oct 25 23:51:18 2011 (r226768) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 30, 2010 +.Dd October 25, 2011 .Dt VLAN 4 .Os .Sh NAME @@ -166,6 +166,7 @@ filtering that breaks the Path MTU Disco The following interfaces support long frames for .Nm natively: +.Xr axe 4 , .Xr bfe 4 , .Xr cas 4 , .Xr dc 4 , Modified: user/adrian/if_ath_tx/sys/boot/i386/boot2/boot2.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/boot2/boot2.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/boot2/boot2.c Tue Oct 25 23:51:18 2011 (r226768) @@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bootinfo.h> #include <machine/elf.h> -#include <machine/psl.h> #include <stdarg.h> @@ -85,8 +84,6 @@ __FBSDID("$FreeBSD$"); #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 -#define V86_CY(x) ((x) & PSL_C) -#define V86_ZR(x) ((x) & PSL_Z) #define DRV_HARD 0x80 #define DRV_MASK 0x7f Modified: user/adrian/if_ath_tx/sys/boot/i386/btx/lib/btxv86.h ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/btx/lib/btxv86.h Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/btx/lib/btxv86.h Tue Oct 25 23:51:18 2011 (r226768) @@ -21,6 +21,7 @@ #define _BTXV86_H_ #include <sys/types.h> +#include <machine/psl.h> #define V86_ADDR 0x10000 /* Segment:offset address */ #define V86_CALLF 0x20000 /* Emulate far call */ @@ -57,6 +58,9 @@ extern u_int32_t __args; #define VTOPSEG(va) (u_int16_t)(VTOP((caddr_t)va) >> 4) #define VTOPOFF(va) (u_int16_t)(VTOP((caddr_t)va) & 0xf) +#define V86_CY(x) ((x) & PSL_C) +#define V86_ZR(x) ((x) & PSL_Z) + void __exit(int) __attribute__((__noreturn__)); void __exec(caddr_t, ...); Modified: user/adrian/if_ath_tx/sys/boot/i386/common/cons.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/common/cons.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/common/cons.c Tue Oct 25 23:51:18 2011 (r226768) @@ -27,8 +27,6 @@ __FBSDID("$FreeBSD$"); #include "util.h" #include "cons.h" -#define V86_ZR(x) ((x) & PSL_Z) - #define SECOND 18 /* Circa that many ticks in a second. */ uint8_t ioctrl = IO_KEYBOARD; Modified: user/adrian/if_ath_tx/sys/boot/i386/common/drv.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/common/drv.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/common/drv.c Tue Oct 25 23:51:18 2011 (r226768) @@ -19,53 +19,41 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <machine/psl.h> - #include <btxv86.h> #include "rbx.h" #include "util.h" #include "drv.h" +#include "edd.h" #ifdef USE_XREAD #include "xreadorg.h" #endif -#define V86_CY(x) ((x) & PSL_C) -#define V86_ZR(x) ((x) & PSL_Z) - #ifdef GPT +static struct edd_params params; + uint64_t drvsize(struct dsk *dskp) { - unsigned char params[0x42]; - uint64_t sectors; - - *(uint32_t *)params = sizeof(params); + params.len = sizeof(struct edd_params); v86.ctl = V86_FLAGS; v86.addr = 0x13; v86.eax = 0x4800; v86.edx = dskp->drive; - v86.ds = VTOPSEG(params); - v86.esi = VTOPOFF(params); + v86.ds = VTOPSEG(¶ms); + v86.esi = VTOPOFF(¶ms); v86int(); if (V86_CY(v86.efl)) { printf("error %u\n", v86.eax >> 8 & 0xff); return (0); } - memcpy(§ors, params + 0x10, sizeof(sectors)); - return (sectors); + return (params.sectors); } #endif /* GPT */ #ifndef USE_XREAD -static struct { - uint16_t len; - uint16_t count; - uint16_t off; - uint16_t seg; - uint64_t lba; -} packet; +static struct edd_packet packet; #endif int @@ -76,7 +64,7 @@ drvread(struct dsk *dskp, void *buf, dad if (!OPT_CHECK(RBX_QUIET)) printf("%c\b", c = c << 8 | c >> 24); #ifndef USE_XREAD - packet.len = 0x10; + packet.len = sizeof(struct edd_packet); packet.count = nblk; packet.off = VTOPOFF(buf); packet.seg = VTOPSEG(buf); @@ -110,7 +98,7 @@ int drvwrite(struct dsk *dskp, void *buf, daddr_t lba, unsigned nblk) { - packet.len = 0x10; + packet.len = sizeof(struct edd_packet); packet.count = nblk; packet.off = VTOPOFF(buf); packet.seg = VTOPSEG(buf); Copied: user/adrian/if_ath_tx/sys/boot/i386/common/edd.h (from r226767, head/sys/boot/i386/common/edd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/if_ath_tx/sys/boot/i386/common/edd.h Tue Oct 25 23:51:18 2011 (r226768, copy of r226767, head/sys/boot/i386/common/edd.h) @@ -0,0 +1,110 @@ +/*- + * Copyright (c) 2011 Advanced Computing Technologies LLC + * Written by: John H. Baldwin <jhb@FreeBSD.org> + * 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. + * + * $FreeBSD$ + */ + +#ifndef _EDD_H_ +#define _EDD_H_ + +/* Supported interfaces for "Check Extensions Present". */ +#define EDD_INTERFACE_FIXED_DISK 0x01 +#define EDD_INTERFACE_EJECT 0x02 +#define EDD_INTERFACE_EDD 0x04 + +struct edd_packet { + uint16_t len; + uint16_t count; + uint16_t off; + uint16_t seg; + uint64_t lba; +}; + +struct edd_packet_v3 { + uint16_t len; + uint16_t count; + uint16_t off; + uint16_t seg; + uint64_t lba; + uint64_t phys_addr; +}; + +struct edd_params { + uint16_t len; + uint16_t flags; + uint32_t cylinders; + uint32_t heads; + uint32_t sectors_per_track; + uint64_t sectors; + uint16_t sector_size; + uint16_t edd_params_seg; + uint16_t edd_params_off; +}; + +struct edd_device_path_v3 { + uint16_t key; + uint8_t len; + uint8_t reserved[3]; + char host_bus[4]; + char interface[8]; + uint64_t interface_path; + uint64_t device_path; + uint8_t reserved2[1]; + uint8_t checksum; +}; + +struct edd_params_v3 { + struct edd_params params; + struct edd_device_path_v3 device_path; +}; + +struct edd_device_path_v4 { + uint16_t key; + uint8_t len; + uint8_t reserved[3]; + char host_bus[4]; + char interface[8]; + uint64_t interface_path; + uint64_t device_path[2]; + uint8_t reserved2[1]; + uint8_t checksum; +}; + +struct edd_params_v4 { + struct edd_params params; + struct edd_device_path_v4 device_path; +}; + +#define EDD_FLAGS_DMA_BOUNDARY_HANDLING 0x0001 +#define EDD_FLAGS_REMOVABLE_MEDIA 0x0002 +#define EDD_FLAGS_WRITE_VERIFY 0x0004 +#define EDD_FLAGS_MEDIA_CHANGE_NOTIFICATION 0x0008 +#define EDD_FLAGS_LOCKABLE_MEDIA 0x0010 +#define EDD_FLAGS_NO_MEDIA_PRESENT 0x0020 + +#define EDD_DEVICE_PATH_KEY 0xbedd + +#endif /* !_EDD_H_ */ Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/Makefile ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/Makefile Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/Makefile Tue Oct 25 23:51:18 2011 (r226768) @@ -47,7 +47,8 @@ CFLAGS+= -DTERM_EMU # XXX: make alloca() useable CFLAGS+= -Dalloca=__builtin_alloca -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ + -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/bioscd.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/bioscd.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/bioscd.c Tue Oct 25 23:51:18 2011 (r226768) @@ -42,12 +42,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <machine/bootinfo.h> -#include <machine/psl.h> #include <stdarg.h> #include <bootstrap.h> #include <btxv86.h> +#include <edd.h> #include "libi386.h" #define BIOSCD_SECSIZE 2048 @@ -325,9 +325,9 @@ bc_read(int unit, daddr_t dblk, int blks v86int(); } - packet.len = 0x10; + packet.len = sizeof(struct edd_packet); packet.count = x; - packet.offset = VTOPOFF(xp); + packet.off = VTOPOFF(xp); packet.seg = VTOPSEG(xp); packet.lba = dblk; v86.ctl = V86_FLAGS; @@ -337,7 +337,7 @@ bc_read(int unit, daddr_t dblk, int blks v86.ds = VTOPSEG(&packet); v86.esi = VTOPOFF(&packet); v86int(); - result = (v86.efl & PSL_C); + result = V86_CY(v86.efl); if (result == 0) break; } Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/biosdisk.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/biosdisk.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/biosdisk.c Tue Oct 25 23:51:18 2011 (r226768) @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include <bootstrap.h> #include <btxv86.h> +#include <edd.h> #include "libi386.h" #define BIOS_NUMDRIVES 0x475 @@ -250,7 +251,7 @@ bd_int13probe(struct bdinfo *bd) v86.edx = bd->bd_unit; v86int(); - if (!(v86.efl & 0x1) && /* carry clear */ + if (!(V86_CY(v86.efl)) && /* carry clear */ ((v86.edx & 0xff) > ((unsigned)bd->bd_unit & 0x7f))) { /* unit # OK */ if ((v86.ecx & 0x3f) == 0) { /* absurd sector size */ DEBUG("Invalid geometry for unit %d", bd->bd_unit); @@ -264,11 +265,11 @@ bd_int13probe(struct bdinfo *bd) v86.edx = bd->bd_unit; v86.ebx = 0x55aa; v86int(); - if (!(v86.efl & 0x1) && /* carry clear */ + if (!(V86_CY(v86.efl)) && /* carry clear */ ((v86.ebx & 0xffff) == 0xaa55) && /* signature */ - (v86.ecx & 0x1)) { /* packets mode ok */ + (v86.ecx & EDD_INTERFACE_FIXED_DISK)) { /* packets mode ok */ bd->bd_flags |= BD_MODEEDD1; - if((v86.eax & 0xff00) >= 0x3000) + if ((v86.eax & 0xff00) >= 0x3000) bd->bd_flags |= BD_MODEEDD3; } return(1); @@ -562,7 +563,7 @@ bd_opendisk(struct open_disk **odp, stru return (ENOMEM); } - /* Look up BIOS unit number, intialise open_disk structure */ + /* Look up BIOS unit number, initalise open_disk structure */ od->od_dkunit = dev->d_unit; od->od_unit = bdinfo[od->od_dkunit].bd_unit; od->od_flags = bdinfo[od->od_dkunit].bd_flags; @@ -1134,9 +1135,9 @@ bd_edd_io(struct open_disk *od, daddr_t { static struct edd_packet packet; - packet.len = 0x10; + packet.len = sizeof(struct edd_packet); packet.count = blks; - packet.offset = VTOPOFF(dest); + packet.off = VTOPOFF(dest); packet.seg = VTOPSEG(dest); packet.lba = dblk; v86.ctl = V86_FLAGS; @@ -1150,7 +1151,7 @@ bd_edd_io(struct open_disk *od, daddr_t v86.ds = VTOPSEG(&packet); v86.esi = VTOPOFF(&packet); v86int(); - return (v86.efl & 0x1); + return (V86_CY(v86.efl)); } static int @@ -1183,7 +1184,7 @@ bd_chs_io(struct open_disk *od, daddr_t v86.es = VTOPSEG(dest); v86.ebx = VTOPOFF(dest); v86int(); - return (v86.efl & 0x1); + return (V86_CY(v86.efl)); } static int @@ -1311,7 +1312,7 @@ bd_getgeom(struct open_disk *od) v86.edx = od->od_unit; v86int(); - if ((v86.efl & 0x1) || /* carry set */ + if ((V86_CY(v86.efl)) || /* carry set */ ((v86.edx & 0xff) <= (unsigned)(od->od_unit & 0x7f))) /* unit # bad */ return(1); @@ -1348,7 +1349,7 @@ bd_getbigeom(int bunit) v86.eax = 0x800; v86.edx = 0x80 + bunit; v86int(); - if (v86.efl & 0x1) + if (V86_CY(v86.efl)) return 0x4f010f; return ((v86.ecx & 0xc0) << 18) | ((v86.ecx & 0xff00) << 8) | (v86.edx & 0xff00) | (v86.ecx & 0x3f); Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/biosmem.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/biosmem.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/biosmem.c Tue Oct 25 23:51:18 2011 (r226768) @@ -61,7 +61,7 @@ bios_getmem(void) v86.es = VTOPSEG(&smap); v86.edi = VTOPOFF(&smap); v86int(); - if ((v86.efl & 1) || (v86.eax != SMAP_SIG)) + if ((V86_CY(v86.efl)) || (v86.eax != SMAP_SIG)) break; /* look for a low-memory segment that's large enough */ if ((smap.type == SMAP_TYPE_MEMORY) && (smap.base == 0) && @@ -108,7 +108,7 @@ bios_getmem(void) v86.addr = 0x15; /* int 0x15 function 0xe801*/ v86.eax = 0xe801; v86int(); - if (!(v86.efl & 1)) { + if (!(V86_CY(v86.efl))) { bios_extmem = ((v86.ecx & 0xffff) + ((v86.edx & 0xffff) * 64)) * 1024; } } Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/biospci.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/biospci.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/biospci.c Tue Oct 25 23:51:18 2011 (r226768) @@ -218,7 +218,8 @@ biospci_enumerate(void) v86int(); /* Check for OK response */ - if ((v86.efl & 1) || ((v86.eax & 0xff00) != 0) || (v86.edx != 0x20494350)) + if (V86_CY(v86.efl) || ((v86.eax & 0xff00) != 0) || + (v86.edx != 0x20494350)) return; biospci_version = v86.ebx & 0xffff; @@ -295,7 +296,7 @@ biospci_find_devclass(uint32_t class, in v86int(); /* error */ - if ((v86.efl & 1) || (v86.eax & 0xff00)) + if (V86_CY(v86.efl) || (v86.eax & 0xff00)) return (-1); *locator = v86.ebx; @@ -317,7 +318,7 @@ biospci_write_config(uint32_t locator, i v86int(); /* error */ - if ((v86.efl & 1) || (v86.eax & 0xff00)) + if (V86_CY(v86.efl) || (v86.eax & 0xff00)) return (-1); return(0); @@ -334,7 +335,7 @@ biospci_read_config(uint32_t locator, in v86int(); /* error */ - if ((v86.efl & 1) || (v86.eax & 0xff00)) + if (V86_CY(v86.efl) || (v86.eax & 0xff00)) return (-1); *val = v86.ecx; Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/biossmap.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/biossmap.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/biossmap.c Tue Oct 25 23:51:18 2011 (r226768) @@ -36,14 +36,11 @@ __FBSDID("$FreeBSD$"); #include <sys/queue.h> #include <sys/stddef.h> #include <machine/metadata.h> -#include <machine/psl.h> #include <machine/pc/bios.h> #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" -#define V86_CY(x) ((x) & PSL_C) - struct smap_buf { struct bios_smap smap; uint32_t xattr; /* Extended attribute from ACPI 3.0 */ Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/libi386.h ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/libi386.h Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/libi386.h Tue Oct 25 23:51:18 2011 (r226768) @@ -52,14 +52,6 @@ struct i386_devdesc } d_kind; }; -struct edd_packet { - uint16_t len; - uint16_t count; - uint16_t offset; - uint16_t seg; - uint64_t lba; -}; - int i386_getdev(void **vdev, const char *devspec, const char **path); char *i386_fmtdev(void *vdev); int i386_setcurrdev(struct env_var *ev, int flags, const void *value); Modified: user/adrian/if_ath_tx/sys/boot/i386/libi386/vidconsole.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/i386/libi386/vidconsole.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/i386/libi386/vidconsole.c Tue Oct 25 23:51:18 2011 (r226768) @@ -516,7 +516,7 @@ vidc_ischar(void) v86.addr = 0x16; v86.eax = 0x100; v86int(); - return (!(v86.efl & PSL_Z)); + return (!V86_ZR(v86.efl)); } #if KEYBOARD_PROBE Modified: user/adrian/if_ath_tx/sys/boot/pc98/boot2/boot2.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/pc98/boot2/boot2.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/pc98/boot2/boot2.c Tue Oct 25 23:51:18 2011 (r226768) @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bootinfo.h> #include <machine/cpufunc.h> #include <machine/elf.h> -#include <machine/psl.h> #include <stdarg.h> @@ -85,8 +84,6 @@ __FBSDID("$FreeBSD$"); #define ARGS 0x900 #define NOPT 14 #define NDEV 3 -#define V86_CY(x) ((x) & PSL_C) -#define V86_ZR(x) ((x) & PSL_Z) #define DRV_DISK 0xf0 #define DRV_UNIT 0x0f Modified: user/adrian/if_ath_tx/sys/boot/pc98/btx/lib/btxv86.h ============================================================================== --- user/adrian/if_ath_tx/sys/boot/pc98/btx/lib/btxv86.h Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/pc98/btx/lib/btxv86.h Tue Oct 25 23:51:18 2011 (r226768) @@ -21,6 +21,7 @@ #define _BTXV86_H_ #include <sys/types.h> +#include <machine/psl.h> #define V86_ADDR 0x10000 /* Segment:offset address */ #define V86_CALLF 0x20000 /* Emulate far call */ @@ -57,6 +58,9 @@ extern u_int32_t __args; #define VTOPSEG(va) (u_int16_t)(VTOP((caddr_t)va) >> 4) #define VTOPOFF(va) (u_int16_t)(VTOP((caddr_t)va) & 0xf) +#define V86_CY(x) ((x) & PSL_C) +#define V86_ZR(x) ((x) & PSL_Z) + void __exit(int) __attribute__((__noreturn__)); void __exec(caddr_t, ...); Modified: user/adrian/if_ath_tx/sys/boot/pc98/libpc98/bioscd.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/pc98/libpc98/bioscd.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/pc98/libpc98/bioscd.c Tue Oct 25 23:51:18 2011 (r226768) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <machine/bootinfo.h> -#include <machine/psl.h> #include <stdarg.h> @@ -325,7 +324,7 @@ bc_read(int unit, daddr_t dblk, int blks v86.ebp = VTOPOFF(xp); v86.es = VTOPSEG(xp); v86int(); - result = (v86.efl & PSL_C); + result = V86_CY(v86.efl); if (result == 0) break; } Modified: user/adrian/if_ath_tx/sys/boot/pc98/libpc98/vidconsole.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/pc98/libpc98/vidconsole.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/pc98/libpc98/vidconsole.c Tue Oct 25 23:51:18 2011 (r226768) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include <stand.h> #include <bootstrap.h> #include <btxv86.h> -#include <machine/psl.h> #include <machine/cpufunc.h> #include "libi386.h" Modified: user/adrian/if_ath_tx/sys/boot/pc98/loader/main.c ============================================================================== --- user/adrian/if_ath_tx/sys/boot/pc98/loader/main.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/boot/pc98/loader/main.c Tue Oct 25 23:51:18 2011 (r226768) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include <stand.h> #include <string.h> #include <machine/bootinfo.h> -#include <machine/psl.h> #include <sys/param.h> #include <sys/reboot.h> Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Oct 25 23:51:18 2011 (r226768) @@ -221,7 +221,6 @@ ar5212WriteAssocid(struct ath_hal *ah, c /* save bssid for possible re-use on reset */ OS_MEMCPY(ahp->ah_bssid, bssid, IEEE80211_ADDR_LEN); ahp->ah_assocId = assocId; - OS_REG_WRITE(ah, AR_BSS_ID0, LE_READ_4(ahp->ah_bssid)); OS_REG_WRITE(ah, AR_BSS_ID1, LE_READ_2(ahp->ah_bssid+4) | ((assocId & 0x3fff)<<AR_BSS_ID1_AID_S)); Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416.h Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416.h Tue Oct 25 23:51:18 2011 (r226768) @@ -344,12 +344,10 @@ extern u_int ar5416GetGlobalTxTimeout(st extern void ar5416Set11nRateScenario(struct ath_hal *ah, struct ath_desc *ds, u_int durUpdateEn, u_int rtsctsRate, HAL_11N_RATE_SERIES series[], u_int nseries, u_int flags); - extern void ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, u_int aggrLen, u_int numDelims); extern void ar5416Set11nAggrMiddle(struct ath_hal *ah, struct ath_desc *ds, u_int numDelims); extern void ar5416Set11nAggrLast(struct ath_hal *ah, struct ath_desc *ds); - extern void ar5416Clr11nAggr(struct ath_hal *ah, struct ath_desc *ds); extern void ar5416Set11nBurstDuration(struct ath_hal *ah, struct ath_desc *ds, u_int burstDuration); Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Oct 25 23:51:18 2011 (r226768) @@ -634,7 +634,7 @@ ar5416InitIMR(struct ath_hal *ah, HAL_OP ahp->ah_maskReg |= AR_IMR_RXINTM | AR_IMR_RXMINTR; #else ahp->ah_maskReg |= AR_IMR_RXOK; -#endif +#endif ahp->ah_maskReg |= AR_IMR_TXOK; if (opmode == HAL_M_HOSTAP) Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416reg.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Tue Oct 25 23:51:18 2011 (r226768) @@ -263,7 +263,7 @@ #define AR_ISR_S5_GENTIMER7 0x00000080 // Mask for timer 7 trigger #define AR_ISR_S5_TIM_TIMER 0x00000010 // TIM Timer ISR #define AR_ISR_S5_DTIM_TIMER 0x00000020 // DTIM Timer ISR -#define AR_ISR_S5_GENTIMER_TRIG 0x0000FF80 // ISR for generic timer trigger 7-15 +#define AR_ISR_S5_GENTIMER_TRIG 0x0000FF80 // ISR for generic timer trigger 7-15 #define AR_ISR_S5_GENTIMER_TRIG_S 0 #define AR_ISR_S5_GENTIMER_THRESH 0xFF800000 // ISR for generic timer threshold 7-15 #define AR_ISR_S5_GENTIMER_THRESH_S 16 Modified: user/adrian/if_ath_tx/sys/dev/bge/if_bge.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/bge/if_bge.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/bge/if_bge.c Tue Oct 25 23:51:18 2011 (r226768) @@ -2985,9 +2985,9 @@ bge_attach(device_t dev) sc->bge_flags |= BGE_FLAG_TSO; } - /* + /* * Check if this is a PCI-X or PCI Express device. - */ + */ if (pci_find_cap(dev, PCIY_EXPRESS, ®) == 0) { /* * Found a PCI Express capabilities register, this @@ -3995,7 +3995,7 @@ bge_intr_task(void *arg, int pending) if (ifp->if_drv_flags & IFF_DRV_RUNNING) { /* Check TX ring producer/consumer. */ bge_txeof(sc, tx_cons); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) bge_start_locked(ifp); } BGE_UNLOCK(sc); @@ -4112,7 +4112,7 @@ bge_tick(void *xsc) /* Synchronize with possible callout reset/stop. */ if (callout_pending(&sc->bge_stat_ch) || !callout_active(&sc->bge_stat_ch)) - return; + return; if (BGE_IS_5705_PLUS(sc)) bge_stats_update_regs(sc); @@ -5036,7 +5036,7 @@ bge_ioctl(struct ifnet *ifp, u_long comm break; } } else if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > ETHERMTU) { - error = EINVAL; + error = EINVAL; break; } BGE_LOCK(sc); Modified: user/adrian/if_ath_tx/sys/dev/usb/net/if_axe.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/usb/net/if_axe.c Tue Oct 25 23:33:54 2011 (r226767) +++ user/adrian/if_ath_tx/sys/dev/usb/net/if_axe.c Tue Oct 25 23:51:18 2011 (r226768) @@ -76,24 +76,30 @@ __FBSDID("$FreeBSD$"); * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf */ -#include <sys/stdint.h> -#include <sys/stddef.h> #include <sys/param.h> -#include <sys/queue.h> -#include <sys/types.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/bus.h> -#include <sys/module.h> +#include <sys/condvar.h> +#include <sys/endian.h> +#include <sys/kernel.h> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110252351.p9PNpJeY022507>