Date: Tue, 27 May 2014 04:03:05 +0800 From: Buganini <buganini@gmail.com> To: Kevin Lo <kevlo@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r264912 - in head: share/man/man4 sys/conf sys/contrib/dev/urtwn sys/dev/usb sys/dev/usb/wlan sys/modules/usb/urtwnfw sys/modules/usb/urtwnfw/urtwnrtl8188eu Message-ID: <CAC_-zweFNGKaQxuibhTNS7b=0WmBX2s16X3VRPjmKT8B91UpHg@mail.gmail.com> In-Reply-To: <201404250801.s3P81ME1008705@svn.freebsd.org> References: <201404250801.s3P81ME1008705@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I think this accidentally removed URTWN_DEV(ASUS, USBN10NANO), 2014-04-25 16:01 GMT+08:00 Kevin Lo <kevlo@freebsd.org>: > Author: kevlo > Date: Fri Apr 25 08:01:22 2014 > New Revision: 264912 > URL: http://svnweb.freebsd.org/changeset/base/264912 > > Log: > Add preliminary support for the Realtek RTL8188EUS and RTL8188ETV chipsets. > > Committed over the TP-LINK TL-WN725N v2 (RTL8188EUS) on amd64 with WPA. > > Added: > head/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu > head/sys/modules/usb/urtwnfw/urtwnrtl8188eu/ > head/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile (contents, props changed) > Modified: > head/share/man/man4/urtwn.4 > head/share/man/man4/urtwnfw.4 > head/sys/conf/files > head/sys/dev/usb/usbdevs > head/sys/dev/usb/wlan/if_urtwn.c > head/sys/dev/usb/wlan/if_urtwnreg.h > head/sys/modules/usb/urtwnfw/Makefile > > Modified: head/share/man/man4/urtwn.4 > ============================================================================== > --- head/share/man/man4/urtwn.4 Fri Apr 25 04:49:27 2014 (r264911) > +++ head/share/man/man4/urtwn.4 Fri Apr 25 08:01:22 2014 (r264912) > @@ -14,12 +14,12 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd October 31, 2013 > +.Dd April 25, 2014 > .Dt URTWN 4 > .Os > .Sh NAME > .Nm urtwn > -.Nd Realtek RTL8188CU/RTL8192CU USB IEEE 802.11b/g/n wireless network device > +.Nd Realtek RTL8188CU/RTL8188EU/RTL8192CU USB IEEE 802.11b/g/n wireless network device > .Sh SYNOPSIS > To compile this driver into the kernel, > place the following lines in your > @@ -50,11 +50,11 @@ legal.realtek.license_ack=1 > The > .Nm > driver supports USB 2.0 wireless network devices based on Realtek > -RTL8188CUS, RTL8188CE-VAU, RTL8188RU and RTL8192CU chipsets. > +RTL8188CUS, RTL8188CE-VAU, RTL8188EUS, RTL8188RU and RTL8192CU chipsets. > .Pp > -The RTL8188CUS is a highly integrated 802.11n adapter that combines > -a MAC, a 1T1R capable baseband and an RF in a single chip. > -It operates in the 2GHz spectrum only. > +The RTL8188CUS and RTL8188EUS are highly integrated 802.11n adapter that > +combine a MAC, a 1T1R capable baseband and an RF in a single chip. > +They operate in the 2GHz spectrum only. > The RTL8188RU is a high-power variant of the RTL8188CUS. > The RTL8188CE-VAU is a PCI Express Mini Card adapter that attaches > to the USB interface. > @@ -90,6 +90,8 @@ The following adapters should work: > .It Netgear WNA1000M > .It Realtek RTL8192CU > .It Realtek RTL8188CUS > +.It TP-LINK TL-WN723N v3 > +.It TP-LINK TL-WN725N v2 > .El > .Sh EXAMPLES > Join an existing BSS network (i.e., connect to an access point): > > Modified: head/share/man/man4/urtwnfw.4 > ============================================================================== > --- head/share/man/man4/urtwnfw.4 Fri Apr 25 04:49:27 2014 (r264911) > +++ head/share/man/man4/urtwnfw.4 Fri Apr 25 08:01:22 2014 (r264912) > @@ -22,7 +22,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd October 31, 2013 > +.Dd April 25, 2014 > .Dt URTWNFW 4 > .Os > .Sh NAME > @@ -42,6 +42,7 @@ of the following: > .Bd -ragged -offset indent > .Cd "device urtwn-rtl8192cfwT" > .Cd "device urtwn-rtl8192cfwU" > +.Cd "device urtwn-rtl8188eufw" > .Ed > .Pp > Alternatively, to load the driver as a > @@ -50,10 +51,11 @@ module at boot time, place the following > .Bd -literal -offset indent > urtwn-rtl8192cfwT_load="YES" > urtwn-rtl8192cfwU_load="YES" > +urtwn-rtl8188eufw_load="YES" > .Ed > .Sh DESCRIPTION > This module provides access to firmware sets for the > -Realtek RTL8188CUS, RTL8188CE-VAU, RTL8188RU and RTL8192CU > +Realtek RTL8188CUS, RTL8188CE-VAU, RTL8188EUS, RTL8188RU and RTL8192CU > chip based USB WiFi adapters. > It may be > statically linked into the kernel, or loaded as a module. > > Modified: head/sys/conf/files > ============================================================================== > --- head/sys/conf/files Fri Apr 25 04:49:27 2014 (r264911) > +++ head/sys/conf/files Fri Apr 25 08:01:22 2014 (r264912) > @@ -2373,6 +2373,20 @@ dev/usb/wlan/if_upgt.c optional upgt > dev/usb/wlan/if_ural.c optional ural > dev/usb/wlan/if_urtw.c optional urtw > dev/usb/wlan/if_urtwn.c optional urtwn > +urtwn-rtl8188eufw.c optional urtwn-rtl8188eufw | urtwnfw \ > + compile-with "${AWK} -f $S/tools/fw_stub.awk urtwn-rtl8188eufw.fw:urtwn-rtl8188eufw:111 -murtwn-rtl8188eufw -c${.TARGET}" \ > + no-implicit-rule before-depend local \ > + clean "urtwn-rtl8188eufw.c" > +urtwn-rtl8188eufw.fwo optional urtwn-rtl8188eufw | urtwnfw \ > + dependency "urtwn-rtl8188eufw.fw" \ > + compile-with "${NORMAL_FWO}" \ > + no-implicit-rule \ > + clean "urtwn-rtl8188eufw.fwo" > +urtwn-rtl8188eufw.fw optional urtwn-rtl8188eufw | urtwnfw \ > + dependency "$S/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu" \ > + compile-with "${NORMAL_FW}" \ > + no-obj no-implicit-rule \ > + clean "urtwn-rtl8188eufw.fw" > urtwn-rtl8192cfwT.c optional urtwn-rtl8192cfwT | urtwnfw \ > compile-with "${AWK} -f $S/tools/fw_stub.awk urtwn-rtl8192cfwT.fw:urtwn-rtl8192cfwT:111 -murtwn-rtl8192cfwT -c${.TARGET}" \ > no-implicit-rule before-depend local \ > > Added: head/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/contrib/dev/urtwn/urtwn-rtl8188eufw.fw.uu Fri Apr 25 08:01:22 2014 (r264912) > @@ -0,0 +1,312 @@ > +begin 644 urtwn-rtl8188eufw.fw.uu > +MX8@0``L``0`!(1$G,#8``"T'```````````````````"14X````````````` > +M````````P6\````````````````````````````````````````````````` > +M````````````H>8````````"5O<````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M```````````````````````````````````````````````````````````` > +M`````,*O@/XR$D($A=`+==`(JN#"C.6*)&?UBN6,-'GUC-*,["2)^.:\`P)T > +M_\.5@;1``$#.>01X@!;F"'`+PJ_F,.$#1!CVTJ\(V>WJB]`BY0S_(R2!^`\( > +M"+\$!'\`>('F,.3R`.4,PY]0(`4,=(@E#/CF_::!".:N#+X#`G3_S?CH;6#@ > +M".;`X(#VY0S3GT`GY0PDB?CFK@R^`P)T__T8YLWXY8%M8`;0X/88@/7E#"2( > +MR/85#(#3Y0PC)('X?P3"K^8PX`,0X@Q_`##A!S#C!'\(5/14?,;2KU2`0@<B > +M>(BF@70#8`;_"';_W_M_!.1X@/8(]@C?^GB!=C"01=YT`9/`X.23P.!#B0%U > +MBF!UC'G2C-*O(@/OTY0#0`-__R)T@2\O^.8@Y?3"K^9$,/;2KZX,[L.?4"$. > +M=(@N^.;Y".88O@,"=/_][6E@"0GG&1GW"0F`\Q86@-KNTY]`!`6!!8'NTY]` > +M(G2(+O@(YOGNM0P"J8$8!@;F_>UI8`D9&><)"?<9@/,>@-GO)(CXY@3X[R\$ > +MD$7>D_8([R^3]G\`(N_3E`-``W__(N\C)('XYC#E],*OYE2,]M*OY0RU!PIT > +MB"_XYO6!`D)-4"YTB2_XYK\#`G3__1CF^72(+_C[YOSI;&`(J`7G]AT9@/2H > +M`Z8%'^4,M0?C?P`B=(DO^.;]&(8!#W2(+_BF`0B&!.4,M0<"K('M;&`(#0FH > +M!>;W@/3E#+4'WHF!?P`B[].4`T`#?_\B[R,D@?C"K^8PY04PX`+2Y-+BQM*O > +M?P`PX@$/`D),C_#D__[E#",D@/C"J3#W#7\(YF`++?9@,%`N@`<P\0;M]F`E > +M?@((,/`0PJ_F$.<C#C#B#-*O?P2`$L*OYA#G$U3L3O;2KP)"37\(".]$@_3" > +MKU;&TJ]4@$__(L7P^*/@*/#%\/CE@A6"<`(5@^`X\"+O6__N6O[M6?WL6/PB > +M[TO_[DK^[4G][$C\(N#\H^#]H^#^H^#_(N+\".+]".+^".+_(N+[".+Y".+Z > +M".++^"+L\@CM\@CN\@CO\B*D)8+U@N7P-8/U@R+@^Z/@^J/@^2+K\*/J\*/I > +M\"+0@]""^.23<!)T`9-P#:.CD_AT`9/U@HB#Y'-T`I-H8.^CHZ.`WP)%C`)" > +MW>23H_CDDZ-``_:``?((W_2`*>23H_A4!R0,R,,SQ%0/1"#(@T`$]%:``4;V > +MW^2`"P$"!`@0($"`D$71Y'X!DV"\H_]4/S#E"50?_N23HV`!#L]4P"7@8*A` > +MN.23H_KDDZ/XY).CR,6"R,K%@\KPH\C%@LC*Q8/*W^G>YX"^`$&""0!!@@H` > +M08(7`%GB7"1>75^AP.#`\,"#P(+`T'70`,``P`'``L`#P`3`!<`&P`>0`<1T > +MYO!T1:/PT35TY@20`<3P=$6C\-`'T`;0!=`$T`/0`M`!T`#0T-""T(/0\-#@ > +M,I``5.!5-?4YH^!5-O4ZH^!5-_4[H^!5./4\K3E_5!(R'JTZ?U42,AZM.W]6 > +M$C(>K3Q_5Q(R'E.1[R+`X,#PP(/`@L#0==``P`#``<`"P`/`!,`%P`;`!Y`! > +MQ'1O\'1&H_`2;'CE03#D!'\"D2?E03#F`Q)LU>5#,.`#$E'"Y4,PX0,230SE > +M0S#B`Q),P>5#,.,#$FSBY4,PY`,2;03E0S#E`Q)M,^5#,.8"\0_E1##A`Q)1 > +M?W1O!)`!Q/!T1J/PT`?0!M`%T`30`]`"T`'0`-#0T(+0@]#PT.`RD(#>X+0! > +M$Y"!)^!@#9"!*^!4_O!4!W`"\2HBD($?X)"!*3#@!>#_`G2/X/]]`=,0KP'# > +MP-"0@A/M\)"!*N"0@A3PD($DX/[$$Q-4`S#@`P)(H.[$$Q,35`$PX`,"2*"0 > +M@A3@_F]P`P)(H.]P`P)(%R3^<`,"2%`D_F!1)/QP`P)(BR3\8`,"2*#NM`X# > +M$DE>D((4X'`%?P$229.0@A3@M`8#$DDTD((4X+0$#Y""$^#_8`42<W6``Q)F > +M)I""%.!D"&`#`DB@$G/3`DB@D((4X'`%?P$229.0@A3@M`8#$DDTD((4X+0. > +M"1)(I;\!`Q))7I""%.!D#&`"`:`1I>]D`6`"`:`1^@&@D((4X+0.!Q&EOP$" > +M,5Z0@A3@M`8",320@A3@M`P'$:6_`0(1^I""%.!D!'!<$G+U[V0!<%0QOH!0 > +MD((4X+0.!Q&EOP$",5Z0@A3@M`8",320@A3@M`P'$:6_`0(1^I""%.!P!'\! > +M,9.0@A3@M`0:$G.[@!60@A3@M`P.D($EX/\3$U0_,.`",;'0T)*O(M&K[V0! > +M8`B0`;AT`?"`/9"!).#_$Q,35!\PX`B0`;AT`O"`*._$5`\PX`B0`;AT!/"` > +M&9"!*>#3E`1`")`!N'0(\(`(D`&XY/!_`2*0`;ET`O!_`"*0@-[@9`%P,9"! > +M)>!4_?"0!2)T;_!_`?$-OP$2D($DX$2`\)"!*G0.\)"!(_`BD`&Y=`'PD`&X > +M!/`BD($EX)`&!"#@#.!$0/"0@2IT!/"`#N!4?_"0@2IT#/"0@2/PD`4BY/`B > +MD($EX,,3(.`(D($J=`SP@!Z0!@3@1$#PX$2`\)"!*G0$\)`%)^!$@/"0@2-T > +M!/"0!2+D\"*0@A7O\!)499""%>!@!9`%(N3PD($J=`3PD($C\"(QXY"!*G0( > +M\)"!(_`BD`4B=/_P\3J0`3=T`O#]?P-15S'CY)"!*O"0@2/P(I`%(G3_\/$Z > +MD(6[$B#:S/``P'^,?@@2+J*0A;L2(-H````4?W!^#A(NHI"!^1(@V@````#D > +M_?\251Q_?'X($BU<[$2`_)""!1(@SI""!1)$V9"%NQ(@SG]\?@@2+J*0`0!T > +M/_"CX%3]\)`%4^!$(/`BD`$T=$#P_>3_=#TO^.9-_O9T,"_U@N0T`?6#[O`B > +MTQ"O`</`T.20@<OP$A^D_U0!_I"!'^!4_D[^\.]4`O_N5/U/__`2'Z3^5`3] > +M[U3[3?^0@1_P[E0(_N]4]T[_\!(?I/Y4$/WO5.]-_Y"!'_#N5"#^[U3?3O`2 > +M'Z3#$R#@`F%>D($?X/\PX&V0@<MT(?#O$Q-4/S#@"U%.D('+X$0(\(`,Y)"! > +M(/"C\'U`_Y$FD($?X/T3$Q-4'S#@!Y"!R^!$$O#MQ%0/,.`'D('+X$04\)"! > +M'^#$$U0',.`'D('+X$2`\)"!R^"0!2?PD($BX&`"@1=_`8`5D('+=`'PD`4G > +M\)"!(N!D!&`"@1?_$E,.@1>0@1_@_R#@`F'GD('+=#'P[Q,35#\PX`M13I"! > +MR^!$"/"`!GU`Y/^1)I"!'^#]$Q,35!\PX`>0@<O@1`+P[<14#S#@!Y"!R^!$ > +M!/"0@<O@D`4G\)"!(^!D`G`=_7\$$D<]$E%SOP$)D($IX/]]`8`#Y/W_$D<] > +M@$&0@2K@D($C\)`%)^!$0/"`,)"!RW0!\)`%)_"0@2/@M`(&?0%_!(`+D($C > +MX+0(!WT!?PP21SW1-)"!*1)'.1):I]#0DJ\B?0)_`I$F?0%_`G0]+_CF_NWT > +M7O[V=#`O]8+D-`'U@^[P(N]P-WUX?P*1)GT"?P.1)GW(?P(2<8^0`5?D\)`! > +M/'0"\'T!?PP21SV0@23@5/?P5._PD`8*X%3X\"*0`39T>/"C=`+P?7C_45=] > +M`G\#45>0!@K@1`?PD($RH^"0!5CPD(#>X+0!%9"!)>!4^_"0@2K@(.(.?0%_ > +M!`)'/9"!)>!$!/`BD($?X/\PX`B0@2/@9`)@.I"!)^!P!.\PX`J0@2K@9`)@ > +M*+&#D($EX!,3$U0?,.`4D($MX/^CX&]P"O'-D1R0@2[@%/"0`>;@!/`BD($? > +MX##@!I"!(70!\)"!)^!@19"!)>#_$Q,35!\PX!*0`3O@,.0+D1R0@2W@%)`% > +M<_"0@@OD=?`!$D2IPY""#."4@)"""^!D@)2`0`N0`9C@5/[PX$0!\!)U^-'6 > +MD($_X##@#.3U':/Q^Y`!5W0%\)`!ON`$\"*0@-[@9`%@`L$CD($GX'`"P2.0 > +M@2;@Q%0/9`%P(I`&J^"0@2[PD`:JX)"!+?"CX/]P")"!+>#^_X``D($N[_"0 > +M@27@1`3PY)"!,/"0@3*CX)`%6/"0`5?D\)`!/'0"\)"!*^!4_?!4[_"0@2;@ > +M_\14#R3]4`*`#Y"!'^`PX`42;?*``Q)NR9"!)>`3$Q-4'S#@#I"!+>#_H^"U > +M!P3QS9$BD($?X,,3(.`'D($EX$0$\"+1J^]P`M$\(I"!)^!D`7!FD($FX%0/ > +M8%&0@2K@<`/_,9.0@2K@9`Q@`Q)F)I`!6^3PD`$\=`3PT:OO9`%@..3U'9"! > +M.N##$U1_]1[D^_U_6'X!$E`%D`%;=`7PD`:2=`'PD($DX$0(\"*0@2K@<`=] > +M`7\$$D<](I`$&N#T8`-_`"*0!!O@5`=D!W\!8`)_`"(24&"0@2W@%)`%<_!] > +M`G\"45>0@4+@,.`MD(#>X+0!)I""%^`$\."T"@N0@43@!/#DD((7\)"!1.#_ > +MD(%#X+4'!>2C\/$+(N3_CU.0!!W@8!F0!2+@]59T__#Q.K\!`Q)T^Y`%(N56 > +M\(`#$G3[D`0?="#P?P$BY)""#_"C\)`%^.!P#Z/@<`NCX'`'H^!P`W\!(M.0 > +M@A#@E.B0@@_@E`-`"I`!P.!$(/!_`")_,GX`$C*JD((/Y'7P`1)$J8"_=!\M > +M]8+D-/SU@^!4/_#O8!UT(2WU@N0T_/6#X$00\'0?+?6"Y#3\]8/@1(#P(G0A > +M+?6"Y#3\]8/@5._P=!\M]8+D-/SU@^!$0/`B[Q20!7/PD`$_=!#P_7\#=$4O > +M^.9-_O9T."_U@N0T`?6#[O`BX$0"\.3U'9"!.>#U'N3[_7]4?@&.&8\:Y1Y4 > +M!\0S5."%&8.%&H+PY1U4!\0S5.#_Y1X3$Q-4'T^C\.M4!\0S5.#_Y1T3$Q-4 > +M'T^%&H*%&8.CH_"]`0R%&H*.@Z.CHW0#\"*%&H*%&8.CHZ-T`?`BY)"!3?"0 > +M@2?@8%B0@-[@9`%P4)"!303PY)"!+O"0@1_@,.`5D($CX+0"!>20@4WP,7/O > +M<`20@4WPD(%-X&`DD($KX$00\.3U'9"!+Q)/^Y`!5W0%\)"!*N`@X@=]`7\$ > +M$D<](N20@4SPD($GX'`"(7*0@-[@9`%@`B%RD($FX/_$5`]@(B3^8`,$<"&0 > +M@2[@%/#@_V`&D($PX&`1[W`(D($MX*/P@`"0@4QT`?"0@1_@,.`5D($CX+0" > +M!>20@4SP,7/O<`20@4SPD(%,X&!#D($KX$00\)"!,.!@`[0!">3U'9"!,."` > +M#>3U'9"!,.!U\`.D)/[_D($OX"\23_R0`5=T!?"0@2K@(.('?0%_!!)'/2*0 > +M!4/@?P`PYP)_`2*0@2?@<`>0@1_@,.`1D($?X##@!S%SOP$%05L23CPBTQ"O > +M`</`T)"!'N"T`01_!(`+,7._`01_`8`"?P)Q#M#0DJ\BD(%+X&`/Y/"0!5/@ > +M1`+PD`7\X`3PD($?X##@$*-T`?"0@1_@_\,3,.`",9X1Q)"!/^`PX`>199`% > +M(N3P(I"!'^#_,.`]D($CX'X`M`("?@&0@2+@?0"T!`)]`>U.<"/OPQ,PX`(A > +MGE%%D($CX+0(!N3]?PR`"9"!(^!P!OU_!!)'/2*0@1[@M`$/D($CX&0"8`=] > +M`7\"$D<]D($GX&0"8!20@2;@5`]@#!).J^]P!OU_#!)'/2*0@1_@_S#@/Y"! > +M(^!^`+0"`GX!D($BX'T`M`0"?0'M3G`E[\,3,.`"(9X2=*R0@2/@M`P&Y/U_ > +M"(`*D($CX+0$!N3]_Q)'/2+3$*\!P\#0D('+$D4?$A^D_Y"!'O"_`1*0@<L2 > +M11:0``$2'[UD`6`A@!V0@<L211:0``$2'[UD`6`/D($?X"#@!N3_<0Z``C&> > +MT-"2KR+3$*\!P\#0D($BX)""%O!O<`*!!.\48#X48&(4<`)AN!1P`F'?)`1@ > +M`H$$D((6X/^T!`2108$$[[0"!)%0@020@A;@_[0#!)%4@03O9`%@`H$$D4.! > +M!)""%N#_M`0$D?.!!.^T`@216($$D((6X/^T`P21Z($$[W!]D2N`>9""%N"T > +M!`42=&"`;9""%N"T`021(8!BD((6X+0#!1)T<8!6D((6X'!0D1^`3)""%N#_ > +MM`0%$G1,@#_OM`$$D32`-^^T`@21WX`OD((6X'`ID3*`)9""%N#_M`,%$G1[ > +M@!COM`$$D0N`$.^T`@2Q!H`(D((6X'`"D0G0T)*O(I$KD`4B=&_PD`4GX%2_ > +M\)"!(G0$\"*1*Q))W9"!(G0"\"*0@2)T`?`BD2N0!2)T__"0@2)T`_`BD?.0 > +M!2?@5+_PY)"!(O`BD5B`[Y'H@.N199`%(N3PD($B!/`BTQ"O`</`T)`!`>!$ > +M`O"0`0!T__"0!K=T"?"0!K1TAO!_?'X($BU<[%1__)""`1(@SI""`1)$V9"% > +MNQ(@SG]\?@@2+J*0A;L2(-K,P`#`?XQ^"!(NHI"%NQ(@V@#``!1_<'X.$BZB > +MD('Y$B#:``,^8.3]_[$<T-"2KR*199"!(G0#\"*0!2+D\)"!(@3P(I`%(N3P > +MD`4GX$1`\)"!(G0!\"*199`%(G1O\)`%)^!4O_"0@2)T!/`BTQ"O`</`T,`' > +MP`60@?D21-F0@>42(,[0!=`'$F#UT-"2KR*0@<@211_O$D4H57$`57H!58," > +M58L#590$59P@5:0A5:TC5;4D5;XE5<<F5<_```!5V)"!R!)%%@)JL)"!R!)% > +M%@)E@9"!R!)%%D'`D('($D46`G78D('($D46@$20@<@211;!2Y"!R!)%%@)J > +M^)"!R!)%%N'AD('($D46`DILD('($D46`FL^D('($D46@#Z0@<@2118":TZ0 > +M`<#@1`'P(A):2Q(?I/]4`?Z0@47@5/Y.\._#$S#@%)```1(?O9"!1O"0``(2 > +M'[V0@4?P(A(?I/]4`?Z0@3_@5/Y.\)```1(?O?Z0!53@PYZ0@4#P[R#@!Y%E > +MD`4BY/"0@3_@5`&0`;SPD(%`X)`!O?`B$A^D_U1_D($G\._$$Q,35`&C\)`` > +M`1(?O?]4\,14#_Z0@2;@5/!.\)```Q(?O50!)>#^D($DX%3]3O#O5`_$5/#_ > +MD($FX%0/3_"0``02'[V0@2GPT<:0`;ET`?"0`;CPD($GX)`!NO"0@2G@D`&[ > +M\)"!)N!4#Y`!OO`BD('+$D4?$G*SD($GX/\23#Z0@2?@8!F0@<L211:0``$2 > +M'[U4#_^0``(2'[W]$G+$(L#@P/#`@\""P-!UT`#``,`!P`+``\`$P`7`!L`' > +MD`'$=/?P=%:C\!)LI>5),.$#$F]YY4DPX@+QI>5),.,#$F^-Y4HPX`,2;\GE > +M2C#D`Q)P(N5+,.$"47CE2S#@`C'_Y4LPXP+QX.5,,.$%?P,21"?E3##D`Q). > +MQ.5,,.4#$G`XY4PPY@,2<,YT]P20`<3P=%:C\-`'T`;0!=`$T`/0`M`!T`#0 > +MT-""T(/0\-#@,I"!)^!@-)`&DN`PX"/D]1V0@3K@PQ-4?_4>Y/O]?UA^`1$% > +MD`%;=`7PD`:2=`'P(I"!).!4]_`21RHB(A(?I)"!,?`BD`'(Y/"C\*/P>P%Z > +M@7E1?__^$BLGOP$)D(%1X&0#8`,B`:ODD(%6\)"!5N#_PY0"0`(!YL-T_I__ > +MY)0`_GL!>H%Y4A(K)^]D`7!WD(%2X/]4P/Y@!>]4#'`6D(%2X/]4,&!G[U0# > +M8&*0@5-T`?"`!>20@5/PD(%3X)"!4G`6X/_N$Q-4/Y"!5/#O5`P3$U0_H_"` > +M#>#^5#"0@53P[E0#H_"0@53@9#!P5*/@9`)P3I``]>!40)"!5_#@<$&C=`+P > +M@!"0@5AT`?"`")"!5N`$\`$1D`'$=.GP=%>C\)"!6."0`<CPD(%2X)`!R?"0 > +M@5/@D`'*\.3]?Q\2,AZ`U2*0`/?@(.<)X'\!(.8,?P(BD`#WX##F`G\#(A'G > +MD(`\[_`Q$Y`!9'0!\`(MIS&!,;$Q0#%?Y/4U]3;U-_4XK35_4!(R'JTV?U$2 > +M,AZM-W]2$C(>K3A_4P(R'G4]$.3U/G4_!W5``I`!,.4]\*/E/O"CY3_PH^5` > +M\")U10YU1@%#1A!U1P-U2&*0`3CE1?"CY4;PH^5'\*/E2/`BD`$PY/"C\*/P > +MH_"0`3CPH_"C\*/P_7]0$C(>Y/U_41(R'N3]?U(2,A[D_7]3`C(>D`$T=/_P > +MH_"C\*/PD`$\\*/PH_"C\/U_5!(R'GW_?U42,AY]_W]6$C(>??]_5P(R'I`` > +M@.!$@/U_@!(R'I#]`.!4O_`25^E1=Q(R=U')45Y_`1)#%9"!070"\/\20Q60 > +M@4'@!/!_`Q)#%9"!0>`$\#$!43^0`(#@1$#]?X`2,AYU(/]1:%'Y47_D_P)# > +MGE%B46]1IW%/48I1E9"!1>!4_O"C=`/PH_#DH_"C\"+D]4TBY)"`WO`B=>@# > +M=:B$(N20@-CPH_`BD`&4X$0!\"*0`>1T"_"C=`'P(I"!/^!4_O#DH_`BD(%" > +MX%3^\%1_\*-T"O#DH_`BD($?X%3^\%3]\%3[\%3W\%3O\%3?\.2C\*/PH_"C > +M=`SP(I`!`>!$!/"0`9QT?O"C=)+PHW2@\*-T)/"0`9MT2?"0`9ITX/"0`9GD > +M\)`!F`3P(N20@5'PH_"0`9C@?P`PY`)_`>]D`6`^PY"!4N"4B)"!4>"4$T`( > +MD`'!X$00\"*0@5'D=?`!$D2I?Q1^`!(RJM.0@5+@E#*0@5'@E`!`N9`!QN`P > +MX[(BY)"!)_"C\)"!)N!4#_!4\/"0@23@5/WP5/?P5._PD($M=`'PH_"0@23@ > +M5/OPH^!4^_#DD($P\)"!+W0'\)"!,N3PHW0"\.20@2OPD($DX%3^\)"!*70, > +M\)"!).!4W_"0@2IT#/"0@23@5+_P5'_PH^!4_O!4_?!4]_"0@302(-H````` > +MD(`\X+0!")"!,729\(`2D(`\X)"!,;0#!720\(`#=$#PD($X=`'PHW0%\*/@ > +M5`%$*/"C=`7PY*/PH^!4_?!4^_!4]_!4[_!4W_!4O_#DH_`BY)"!6?"0@5G@ > +M9`'P)"20`<3P=%RC\)"!*N#_D($IX&]@`Q)'*M$(OP$"D5^Q\A(RGK\!`K%G > +M$D)-@,K3$*\!P\#0D($DX##@))"!'^#_,.`:PQ,PX`>Q^[\!$H`*D($CX/]@ > +M`[0(!I&6@`*1IM#0DJ\BTQ"O`</`T+$BD;K0T)*O(I"!*N!P#=$OOP$(D9:0 > +M`>7@!/`BL?.0``C@5._]?P@2,A[D_X]0Y)"!6O"C\)`!">!_`##G`G\![V50 > +M8#[#D(%;X)2(D(%:X)030`B0`<#@1!#P(I"!6N1U\`$21*E_%'X`$C*JTY"! > +M6^"4,I"!6N"4`$"YD`'&X##@LB*0@3'@_7^3$C(>D($HX&`2D`$OX##G!700 > +M\(`&D`$O=)#PD``(X$00_7\($C(>?P&1RI``D.!$`?U_D!(R'G\4?@`",JK3 > +M$*\!P\#0$BVGY/52$C*>[V!S8U(!Y5(D9Y`!Q/!T7:/PD`"(X/50]5%4#V#? > +MY5`PX`L@Y`,2*<534>Z`/^50,.$6(.4.$A&][W`#0U$@D`$&Y/!34?V`).50 > +M,.(+(.8#$F<&4U'[@!3E4##C#R#G"1)A;N]P`T-1@%-1]ZU1?X@2,AZ`A]#0 > +MDJ\B(I``D.`@X/DBD($BX&0"?P%@`G\`(G\"D(%!X/[OPYY0&.\EX"2!^.8P > +MY`N0`;AT"/"C\'\`(@^`WG\!(I`"A^!@")`!N'0!\(`7D`*&X"#A")`!N'0$ > +M\(`(D`&XY/!_`2*0`;ET"/!_`"+D^_K]?P$21$Z0@;WO\&#PT7&`[-,0KP'# > +MP-"0`<S@5`^0@;[PD(&^X/UP`N&<D(()X/]T`7X`J`<(@`7#,\XSSMCY_^]= > +M<`+AE9""">!U\`20`=`210K@D(&_\'43`744@745OW46`7L!>H%YP!(K[9"" > +M">!U\`20`=$210K@D('!\)""">!U\`20`=(210K@D('"\)""">!U\`20`=,2 > +M10K@D('#\)""">!U\`20`?`210K@D('$\)""">!U\`20`?$210K@D('%\)"" > +M">!U\`20`?(210K@D('&\)""">!U\`20`?,210K@D(''\)"!ON#_D(()X/YT > +M`:@&"(`"PS/8_/1?D(&^\)""">#_=`&H!PB``L,SV/R0`<SPD('`X/][`7J! > +M><$253^0@@G@!/#@5`/PP8*0`<#@1`+PT-"2KR+D^_K]?P$21$Z0@=#O\&#P > +M$FP9@.N0@=3O\*/M\*,2(-H`````Y)"!XO!_)'X($BU<D(':$B#.D('4X/MP > +M")"!VA)$V8`6ZW7P"*0D8O6"Y#2']8/@_J/@_Q(M7)"!WA(@SI"!U>#_Y/S] > +M_G@7$B"[J`2I!:H&JP>0@=X21-GM5'_][%2`_!)$S.Q$@/R0@=X2(,Z0@=H2 > +M1-GL5'_\D(6[$B#.?R1^"!(NHI"!U.!U\`BD)&+U@N0TA_6#X/ZCX/_`!L`' > +MD('>$D39D(6[$B#.T`?0!A(NHI"!VA)$V>Q$@/R0A;L2(,Y_)'X($BZBD('4 > +MX'`$?R"`"9"!U."T`19_*'X($BU<>`@2(*CO5`'_Y)"!XN_PD('BX)"!U&`. > +MX'7P"*0D9O6"Y#2'@`S@=?`(I"1D]8+D-(?U@^#^H^#_$BU<[50/_>3\D('6 > +M$B#.D('6`D39D('C[_"K!9"!Z1(@V@````"O`^3\_?YX%!(@NZ@$J06J!JL' > +MD('E$D39[50/_>3\$D3,[%0/_)"!Z1(@SI"!X^!U\`BD)&#U@N0TA_6#X/ZC > +MX/_`!L`'D('I$D39D(6[$B#.T`?0!@(NHM,0KP'#P-`27[;0T)*O(G@0=`'R > +MD`()X'@`\@AT(/(8XO\PX`4(XB2`\N_#$Y#]$/!X`>(D`/6"Y#3\]8/@>`/R > +M9`1@#>+_9`A@!^]D#&`"8=[D>`+R>`/B_QCBPY]0+>+]&.(MD(%:\.#_)`#U > +M@N0T_/6#X/YT!"WX[O+OM/\&D/T0X`3P>`+B!/*`R7@$XG@2\O]X!>)X$?)X > +M!N)X$_)X!^)X%/)X".)X,_)X">)X-/)X"N)X-?)X"^)X-O)X#.)X-_)X#>)X > +M./)X#N)X.?)X#^)X.O+D>!7R[R3X8'4D_&!L)`A@`F'`>!'BM`$%$BG%8<5X > +M$>*T`@42$;UAQ7@1XK0#!/$&8<5X$>*T$!=X%.+^&.+][?]X%N[R_@CO\O\2 > +M,JIAQ7@1XK01%W@4XOX8XOWM_W@6[O+^"._R_Q(R!F'%>!'B]&`"8<48\F'% > +M>!5T`?)X$>)D!V`"8:IX-.+_Y/S]_G@($B"[P`2I!:H&JP=X,^+_Y/S]_M`` > +M$D3,P`3`!<`&P`=X->+_Y/S]_G@0$B"[T`/0`M`!T``21,QX&!)$_G@5XG`" > +M89,8XO\8XOTQ7W@<$D3^>#CB_^3\_?YX"!(@N\`$J06J!JL'>#?B_^3\_?[0 > +M`!)$S,`$P`7`!L`'>#GB_^3\_?YX$!(@N]`#T`+0`=``$D3,>"`21/YX(!)$ > +MY1(@FW@<$D3Q$D2_P`3`!<`&P`=X&!)$Y7@@$D3Q$D2_T`/0`M`!T``21,QX > +M&!)$_G@8$D3ED('Y$B#.>!/B_0CB_Q)5'(`;>!/B_PCB_7@1XOMX%>*0@;SP > +M<>&`!7@0=`+R>!#B_\.4`E`0[V`*>`+B_QCB+_(AD'\!(G\`(JP'[:T$>"3R > +M[0CRZ[0$!W@G=`'R@`[K>">T!05T`O*``W0$\M-X)>*4_QCBE`!08^1X)O)X > +M)^+_&.+^PY]``J%_=#,N^.)X*/*0@;S@8"UT-R[XXG@R\N[_>"7B+_\8XC0` > +MCX+U@^!X*?)X,N+_]/YX*>)>_ACB_>]=3O)X)`CB_PCB+_]X*.+]$C(>>";B > +M!/*`H=-X)>*4_QCBE`=0:>1X)O)X)^+_&.+^PY]``J%_=#,N^.)X*/*0@;S@ > +M8"UX)N+__1CB+?T8XC0`C8+U@^!X*?)T-R_XXG@R\N+_]/YX*>)>_ACB_>]= > +M3O)X*.+_>";B_1CB+?T8XC0`C8+U@^_P>";B!/*`FY"!O.!@#W@DXOX(XO\2 > +M+5QX+A)$_N1X)O)X)^+_&.+^PY]0770S+OCB>"CRD(&\X&`K>"X21.5X)N+[ > +M=?`(I/GX$B"H>"GO\G0W*_CB>#+RXO[T7_]X*.+][EU/\G@HXO]X)N+]PW0# > +MG?WDE`#\>_YT*BWY=(`\^N\2'^KB!/*`F'@J$D3ED(6[$B#.>"3B_@CB_Q(N > +MHB(BD('+$D4?D``!$A^]__X2'Z3]PQ,PX!*0@<L211:0``(2'[V0@<_P@`60 > +M@<_O\)"!SN[PD('/X/Z0@<[@_].>4#B0@<L21182'Z14`?YTWB_U@N0T@/6# > +M[O!TWB_U@N0T@/6#X'`$T26`!Y"!SN#_L8"0@<[@!/"`NI"`WN!P))"!*N!P > +M!/\229.0@2K@9`Q@`M$FD($DX%3W\%3O\%2_\%1_\"(BD`8$X%1_\)`%(N3P > +MD($J=`SP(I"![>_PH^WPK0.L`N20@?7PH_"0`<1T.?!T9J/P[%0__)`!0.WP > +MK@3NH_"0@>W@)(%@-"3:8!PD/'!!D('NX,0S,S-4@)"!\O"C=&GPHW2`\(`L > +MD('NX%0!D('R\*-TI?"C=`'P@!B0@>[@Q%00D('R\*-T?_"C=!#P@`-_`"*0 > +M@?/@D`$&\)"!\N!@#I`!0O"0@?'@D`%#\(`-D`%#Y/"0@?+@D`%"\)"!].#_ > +MD`%"X%__D('RX&]@[G0Y!)`!Q/!T9J/PD`%#Y/!_`2+DD(%J\)"'7^"0@6GP > +MY)"!=O"0@6;PD(%FX/_#E$!0%71Y+_6"Y#2!]8-T__"0@6;@!/"`X>20@6;P > +MD(%IX/^0@6;@_L.?0`,":!)TWR[YY#2&=1,!]12)%746"GL!>H%Y6Q(K[9"! > +M7.#_$B\G[P20@7;PD(%;X/^CX/T2,>KO),B0@7CP=?`(I/"0@5S@5`^0@7?P > +MY)"!9?"0@6?PD(%GX/_#E`105Y"!=^#^J`<(@`+#$]C\(.`^D(%GX"7@_Y"! > +M>.`O)'GYY#2!^GL!P`/``9"!9>!U\`*D)%WY=($U\(L3]12)%746`M`!T`,2 > +M*^V0@67@!/"0@6?@!/"`GY"!=N#_D(%FX"_P`F=`Y)"!:O"0@6K@PY1`0`)! > +MK^#_)'GU@N0T@?6#X)"!;/#@_E3PQ%0/_9"!:_#N5`_^H_!T>B_U@N0T@?6# > +MX)"!;?#\[O[L^^O_D(%R[O"C[_#M$D4H:(L`:,(!:7,":J`#:8X$::\%::\& > +M::\'::\(:C,):FD*``!JKY"!:N#])'SU@N0T@?6#X/YT>RWU@N0T@?6#X/WM > +M_Y"!=.[P_*/O\)"!;>#_$B^6D(%H=`+P0:"0@6K@)'SU@N0T@?6#X/_D_/W^ > +M>`@2(+NH!*D%J@:K!Y"!:N`D>_6"Y#2!]8/@_^3\_?X21,S`!,`%P`;`!Y"! > +M:N`D??6"Y#2!]8/@_^3\_?YX$!(@N]`#T`+0`=``$D3,P`3`!<`&P`>0@6K@ > +M)'[U@N0T@?6#X/_D_/W^>!@2(+O0`]`"T`'0`!)$S)"!;A(@SI"!;A)$V9"% > +MEA(@SI"!<N#^H^#_$B[DD(%H=`3P0:"0@6W@_9"!:N`D>_6"Y#2!]8/@^^3_ > +M$C#'@!F0@6W@_9"!:N`D>_6"Y#2!]8/@^^3_$C!JD(%H=`'P0:"0@6AT`O"0 > +M@6K@)'SU@N0T@?6#X/_D_/W^>`@2(+NH!*D%J@:K!Y"!:N`D>_6"Y#2!]8/@ > +M_^3\_?X21,S`!,`%P`;`!Y"!;.#_Y/S]_G@0$B"[T`/0`M`!T``21,R0@6X2 > +M(,Z0@6O@)/O_P`>0@6X21-F0@?D2(,Z0@6W@_=`'$E4<@&V0@6AT`?"0@6K@ > +M)'OYY#2!=1,!]12)%746`7O^>H!Y,Q(K[9"!;>#_D(%LX/WDD(&\\'L$@#20 > +M@6AT!/"0@6K@)'OYY#2!=1,!]12)%746!'O^>H!Y,Q(K[9"!;>#_D(%LX/WD > +MD(&\\'L&$F/AD(%HX"0"_Y"!:N`O\`$7(I`"">#]$A^D_J\%[2Z0@#WPD``! > +M$A^]_^TOD(`^\)```A(?O?_M+Y"`/_"0``,2'[W_[2^0@$#PD``$$A^]_ZX% > +M[2^0@$'P(I```A(?O?\PX"82'Z20@3CPD``!$A^]D($Y\.]4_O^CX%0!3_"0 > +M``,2'[V0@3OP(I"!.'0!\*-T!?"CX%0!1"CPHW0%\"(2'Z20@3[PD($^X)`! > +MY_`B$A^DD(%*\)```1(?O9"!2_`BTQ"O`</`T)"!_>[PH^_PY*/PH_"0@?W@ > +M_J/@]8*.@^!@+<.0@@#@E.B0@?_@E`-`"Y`!P.!$@/!_`(`5D('_Y'7P`1)$ > +MJ7\*?@`2,JJ`Q7\!T-"2KR+3$*\!P\#0D('1$D4?D((*X/\$\)```>\2'_Q_ > +MKWX!<6#O8#J0@=$211:+$XH4B160``X2'[TD`O46>P%Z`7F@$BOMD('1$D46 > +MD``.$A^]D`&N\*-T__"0`<O@9(#PT-"2KR+3$*\!P\#0Y/^0@-G@_I"`V.#] > +MM08$?@&``GX`[F0!8#*0`:_@<!/M=?`/I"1"^72`-?#Z>P%QMG\![V`6D(#8 > +MX`3PX'\`M`H"?P'O8`7DD(#8\-#0DJ\BCPTBCPXB(I`!-.!5/?5!H^!5/O5" > +MH^!5/_5#H^!50/5$D`$TY4'PH^5"\*/E0_"CY43P(I`!/.!51?5)H^!51O5* > +MH^!51_5+H^!52/5,D`$\Y4GPH^5*\*/E2_"CY4SP4Y'?(I"!'^`PX`7DH_"C > +M\"*0@-[@9`%P&9"!)^!@$Y`!5^3PD`$\=`(23_20`5=T!?`BD(#>X&0!<":0 > +M@2?@8""0`5?D\)`!/'0"\)"!).!4^_"0@2O@5/WP5`=P`Q)'*B*0@-[@M`$4 > +MD($GX&`.D($FX%0/9`)@`H`#T7\BD`0=X'`3D(`^X/_D_;%ICDZ/3Y`$'W0@ > +M\"+3$*\!P\#0D((.[?"0@@WO\.3]_/$W?`"M!Y""#>"0!"7PD((.X&`.=`\O > +M]8+D-/SU@^!$@/"O!70(+_6"Y#3\]8/D\'0)+_6"Y#3\]8/@5/#P="$M]8+D > +M-/SU@^!4]_"N!*\%T-"2KR*/3O%+OP$8D(!`X/]]`;%IK0>L!J].$D^"D`0? > +M="#P(I`&J>"0@4SPX/U4P'`)D($KX%3^\(!R[3#F2Y"!)^!D`G`JD($DX/_# > +M$R#@"9"!*^!$`?"`*)"!)N!4#V0!<"V0@2O@1`3P?P&QTH`@D($KX$0!\)"! > +M)N!4#V0"8`2Q3X`+T7^`!Y"!*^!4_O"0@4S@D($K,.<1$D_QD`%7=`7PD($D > +MX$0$\"+@5/WP(I`!7^3PD`$\=`CPY/4=D($ZX,,35'_U'N3[_7]<?@$24`60 > +M`5]T!?"0!I)T`O"0@23@1!#PD($JX&0,8`SD_7\,$D<]Y/\23PTBY)"!3/"0 > +M!JG@D(%,\.!4P'`-D($KX%3^\%3]\`)'*I"!3.`PYB&0@2?@9`%P()"!*^!$ > +M`?"0@2;@5`]D`F`$L4^`"]%_@`>0@2O@5/[PD(%,X)"!*S#G$1)/\9`!5W0% > +M\)"!).!$!/`BX%3]\"+D_N_#$_WO,.`"?H"0_1#M\*\&(M,0KP'#P-"0!!W@ > +M8!J0!2+@5)!@!Y`!P.!$"/"0`<;@,.'D?P"``G\!T-"2KR*0@2?@8`,2<^&0 > +M@3_@,.`#$DG=(I"!)^!@-9`&DN`PX23D]1V0@3K@PQ-4?_4>Y/O]?UQ^`1)0 > +M!9`!7W0%\)`&DG0"\"*0@23@5._P$D<J(A)Q2)"!3>_PD($D,.`&X$0!\(`$ > +MX%3^\)"!3>`PYA&0`2_@,.<$Y/"`!I`!+W2`\)"!).`PX!J0@3+D\*-T!_"0 > +M@3*CX)`%6/"0!.S@5-WP(I`$[.!$(O`BD(%*X&`/Y/"0!5/@1`'PD`7]X`3P > +M(I"!).#_Q!,35`,PX"?O5+_PD`3@X)"!)3#@!N!$`?"`$.!4_O"0`;ET`?"0 > +M`;AT!/`21RKD_Y"!1>`PX$B0@4G@_6!!=`%^`*@'"(`%PS/.,\[8^?^0!.#@ > +M^^];8`;DD(%)\"*0@4?@TYU0$)`!QW00\!&^D(%%X%3^\"(23PN0@4G@!/`B > +MD(`\X&0"8`>0!I#@1`'P(I"!).#_Q!,3$U0!,.`L[U1_\)`$X."0@24PX0;@ > +M1`+P@`_@5/WPD`&Y=`'PD`&X!/"0@2?@8`,21RI_`0%NP^Z4`4`*#>T3D/T0 > +M\.0O_R+#[I0!0"20_1'@;7`:D`$7X+4%#9`!Y'1W\)#]$>3P@`;M!)#]$?#D > +M+_\BY)"!3O"C\*/PD`"#X)"!3O"0`(/@_I"!3N#_M08!(L.0@5#@E&20@4_@ > +ME`!`#9`!P.!$0/"0@4[@_R*0@4_D=?`!$D2I@,)T12_XYO[M]%[^]G0X+_6" > +MY#0!]8/N\"+3$*\!P\#0D((2[?"0@A'O\-.4!U!PX/]T`:@'"(`"PS/8_/3_ > +MD`!'X%_]?T<2,AZ0@A'@_W0!J`<(@`+#,]C\_Y``1N!/_7]&$C(>D((2X&`8 > +MD((1X/]T`:@'"(`"PS/8_/^0`$7@3X`7D((1X/]T`:@'"(`"PS/8_/3_D`!% > +MX%_]?T6`?I""$>`D^/#@)`3_=`&H!PB``L,SV/ST_Y``0^!?_7]#$C(>D((1 > +MX/]T`:@'"(`"PS/8_/^0`$/@3_U_0Q(R'I""$N!@'9""$>`D!/]T`:@'"(`" > +MPS/8_/^0`$+@3_U_0H`<D((1X"0$_W0!J`<(@`+#,]C\]/^0`$+@7_U_0A(R > +M'M#0DJ\BD($DX%3[\.20@3#PD($K\"+O)/Y@#`1P*)"!+70!\*/P(NUP"I"! > +M.^"0@2WP@`60@2WM\)"!+>"C\)"!)>!$"/`B$DZK[V0!8`B0`;AT`?"`9Y"! > +M*^#_5`-@")`!N'0"\(!6D($IX/[DPYY0")`!N'0$\(!$[S#B")`!N'0(\(`X > +MD($KX##D")`!N'00\(`ID($EX!,35#\@X`B0`;AT(/"`%I"!/N!@")`!N'2` > +M\(`(D`&XY/!_`2*0`;ET!/!_`"+O8$*0@-[@9`%P.I"!)>!4_O"0!2)T#_"0 > +M!@3@5+_PY/\23PV_`1*0@23@1$#PD($J=`;PD($C\"*0`;ET`?"0`;AT"/`B > +MD`4B=&_PD`4GX%2_\)"!*G0"\)"!(_`B$E1ED($J=`SPD($C\"*0@23@_Q,3 > +M5#\PX!'O5/OPD($KX%3]\%0'<$*`/9"!,.`$\)"!*^!4[_"0@3#@_[0!`H`$ > +M[[0"!I`%6.`$\)"!..#_D($PX-.?0`^0@-[@M`$+D($EX%3[\"(21RHB(I`% > +M*^!_`##G`G\!(I`%(G3_\)`%)^!$0/"0@2)T`_`BD`4GX$1`\!))W9"!(G0" > +M\"(22>.0@2)T`O`BD`4B=&_PD`4GX%2_\)"!(G0$\"*N!Q)1<[\!$I"!(^!D > +M`F`*KP9]`1)'/7\!(G\`(I`!5^!@2.3PD`$\=`+PD($DX/\3$U0_,.`,[U3[ > +M\)"!*^!4_?`BD($PX`3PD($KX%3O\)"!..#_D($PX-.?0`Z0@-[@M`$'D($E > +MX%3[\"*0@#_@_WT!$FUICE2/5:U5K%2O4Q)/@J]5KE20!(#@5`_]K`=T$2SU > +M@N0T_/6#X$0!\'01+/6"Y#3\]8/@5/OPK`=T%BSU@N0T_/6#X$3Z\'05+/6" > +MY#3\]8/@1!_PK`=T!BSU@N0T_/6#X$0/\)`$4^3PD`12\)`$473_\)`$4'3] > +M\'04+/6"Y#3\]8/@5,!-_704+_6"Y#3\]8/M\"*K!ZH&[2O[Y#KZPY"`V^"; > +MD(#:X)I0$Z/@)`'_D(#:X#0`_L/KG_OJGOKJD/T1\*\#=``O]8+D-/OU@^#_ > +M(A(?I/]4`?Z0@4+@5/Y.\._#$S#@"I```1(?O9"!0_`BD(%%X##@+9"!2.`$ > +L\.#_D(%&X+4''I`&DN!4''`+$D\+D(%)X`3P@`:0!I)T'/#DD(%(\"(`NXX` > +` > +end > > Modified: head/sys/dev/usb/usbdevs > ============================================================================== > --- head/sys/dev/usb/usbdevs Fri Apr 25 04:49:27 2014 (r264911) > +++ head/sys/dev/usb/usbdevs Fri Apr 25 08:01:22 2014 (r264912) > @@ -3677,6 +3677,7 @@ product RATOC REXUSB60F 0xb020 USB seri > /* Green House and CompUSA OEM this part */ > product REALTEK DUMMY 0x0000 Dummy product > product REALTEK USB20CRW 0x0158 USB20CRW Card Reader > +product REALTEK RTL8188ETV 0x0179 RTL8188ETV > product REALTEK RTL8188CTV 0x018a RTL8188CTV > product REALTEK USBKR100 0x8150 USBKR100 USB Ethernet > product REALTEK RTL8188CE_0 0x8170 RTL8188CE > > Modified: head/sys/dev/usb/wlan/if_urtwn.c > ============================================================================== > --- head/sys/dev/usb/wlan/if_urtwn.c Fri Apr 25 04:49:27 2014 (r264911) > +++ head/sys/dev/usb/wlan/if_urtwn.c Fri Apr 25 08:01:22 2014 (r264912) > @@ -2,6 +2,7 @@ > > /*- > * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> > + * Copyright (c) 2014 Kevin Lo <kevlo@FreeBSD.org> > * > * Permission to use, copy, modify, and distribute this software for any > * purpose with or without fee is hereby granted, provided that the above > @@ -20,7 +21,7 @@ > __FBSDID("$FreeBSD$"); > > /* > - * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU. > + * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188EU/RTL8188RU/RTL8192CU. > */ > > #include <sys/param.h> > @@ -88,11 +89,13 @@ SYSCTL_INT(_hw_usb_urtwn, OID_AUTO, debu > /* various supported device vendors/products */ > static const STRUCT_USB_HOST_ID urtwn_devs[] = { > #define URTWN_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) } > +#define URTWN_RTL8188E_DEV(v,p) \ > + { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, URTWN_RTL8188E) } > +#define URTWN_RTL8188E 1 > URTWN_DEV(ABOCOM, RTL8188CU_1), > URTWN_DEV(ABOCOM, RTL8188CU_2), > URTWN_DEV(ABOCOM, RTL8192CU), > URTWN_DEV(ASUS, RTL8192CU), > - URTWN_DEV(ASUS, USBN10NANO), > URTWN_DEV(AZUREWAVE, RTL8188CE_1), > URTWN_DEV(AZUREWAVE, RTL8188CE_2), > URTWN_DEV(AZUREWAVE, RTL8188CU), > @@ -147,6 +150,10 @@ static const STRUCT_USB_HOST_ID urtwn_de > URTWN_DEV(TRENDNET, RTL8188CU), > URTWN_DEV(TRENDNET, RTL8192CU), > URTWN_DEV(ZYXEL, RTL8192CU), > + /* URTWN_RTL8188E */ > + URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV), > + URTWN_RTL8188E_DEV(REALTEK, RTL8188EU), > +#undef URTWN_RTL8188E_DEV > #undef URTWN_DEV > }; > > @@ -191,15 +198,19 @@ static uint16_t urtwn_read_2(struct urt > static uint32_t urtwn_read_4(struct urtwn_softc *, uint16_t); > static int urtwn_fw_cmd(struct urtwn_softc *, uint8_t, > const void *, int); > -static void urtwn_rf_write(struct urtwn_softc *, int, uint8_t, > - uint32_t); > +static void urtwn_r92c_rf_write(struct urtwn_softc *, int, > + uint8_t, uint32_t); > +static void urtwn_r88e_rf_write(struct urtwn_softc *, int, > + uint8_t, uint32_t); > static uint32_t urtwn_rf_read(struct urtwn_softc *, int, uint8_t); > static int urtwn_llt_write(struct urtwn_softc *, uint32_t, > uint32_t); > static uint8_t urtwn_efuse_read_1(struct urtwn_softc *, uint16_t); > static void urtwn_efuse_read(struct urtwn_softc *); > +static void urtwn_efuse_switch_power(struct urtwn_softc *); > static int urtwn_read_chipid(struct urtwn_softc *); > static void urtwn_read_rom(struct urtwn_softc *); > +static void urtwn_r88e_read_rom(struct urtwn_softc *); > static int urtwn_ra_init(struct urtwn_softc *); > static void urtwn_tsf_sync_enable(struct urtwn_softc *); > static void urtwn_set_led(struct urtwn_softc *, int, int); > @@ -208,6 +219,7 @@ static int urtwn_newstate(struct ieee80 > static void urtwn_watchdog(void *); > static void urtwn_update_avgrssi(struct urtwn_softc *, int, int8_t); > static int8_t urtwn_get_rssi(struct urtwn_softc *, int, void *); > +static int8_t urtwn_r88e_get_rssi(struct urtwn_softc *, int, void *); > static int urtwn_tx_start(struct urtwn_softc *, > struct ieee80211_node *, struct mbuf *, > struct urtwn_data *); > @@ -215,13 +227,16 @@ static void urtwn_start(struct ifnet *) > static void urtwn_start_locked(struct ifnet *, > struct urtwn_softc *); > static int urtwn_ioctl(struct ifnet *, u_long, caddr_t); > -static int urtwn_power_on(struct urtwn_softc *); > +static int urtwn_r92c_power_on(struct urtwn_softc *); > +static int urtwn_r88e_power_on(struct urtwn_softc *); > static int urtwn_llt_init(struct urtwn_softc *); > static void urtwn_fw_reset(struct urtwn_softc *); > +static void urtwn_r88e_fw_reset(struct urtwn_softc *); > static int urtwn_fw_loadpage(struct urtwn_softc *, int, > const uint8_t *, int); > static int urtwn_load_firmware(struct urtwn_softc *); > -static int urtwn_dma_init(struct urtwn_softc *); > +static int urtwn_r92c_dma_init(struct urtwn_softc *); > +static int urtwn_r88e_dma_init(struct urtwn_softc *); > static void urtwn_mac_init(struct urtwn_softc *); > static void urtwn_bb_init(struct urtwn_softc *); > static void urtwn_rf_init(struct urtwn_softc *); > @@ -234,6 +249,9 @@ static void urtwn_write_txpower(struct > static void urtwn_get_txpower(struct urtwn_softc *, int, > struct ieee80211_channel *, > struct ieee80211_channel *, uint16_t[]); > +static void urtwn_r88e_get_txpower(struct urtwn_softc *, int, > + struct ieee80211_channel *, > + struct ieee80211_channel *, uint16_t[]); > static void urtwn_set_txpower(struct urtwn_softc *, > struct ieee80211_channel *, > struct ieee80211_channel *); > @@ -352,6 +370,8 @@ urtwn_attach(device_t self) > device_set_usb_desc(self); > sc->sc_udev = uaa->device; > sc->sc_dev = self; > + if (USB_GET_DRIVER_INFO(uaa) == URTWN_RTL8188E) > + sc->chip |= URTWN_CHIP_88E; > > mtx_init(&sc->sc_mtx, device_get_nameunit(self), > MTX_NETWORK_LOCK, MTX_DEF); > @@ -383,10 +403,15 @@ urtwn_attach(device_t self) > sc->ntxchains = 1; > sc->nrxchains = 1; > } > - urtwn_read_rom(sc); > + > + if (sc->chip & URTWN_CHIP_88E) > + urtwn_r88e_read_rom(sc); > + else > + urtwn_read_rom(sc); > > device_printf(sc->sc_dev, "MAC/BB RTL%s, RF 6052 %dT%dR\n", > (sc->chip & URTWN_CHIP_92C) ? "8192CU" : > + (sc->chip & URTWN_CHIP_88E) ? "8188EU" : > (sc->board_type == R92C_BOARD_TYPE_HIGHPA) ? "8188RU" : > (sc->board_type == R92C_BOARD_TYPE_MINICARD) ? "8188CE-VAU" : > "8188CUS", sc->ntxchains, sc->nrxchains); > @@ -638,7 +663,10 @@ urtwn_rx_frame(struct urtwn_softc *sc, u > > /* Get RSSI from PHY status descriptor if present. */ > if (infosz != 0 && (rxdw0 & R92C_RXDW0_PHYST)) { > - rssi = urtwn_get_rssi(sc, rate, &stat[1]); > + if (sc->chip & URTWN_CHIP_88E) > + rssi = urtwn_r88e_get_rssi(sc, rate, &stat[1]); > + else > + rssi = urtwn_get_rssi(sc, rate, &stat[1]); > /* Update our average RSSI. */ > urtwn_update_avgrssi(sc, rate, rssi); > /* > @@ -1056,14 +1084,31 @@ urtwn_fw_cmd(struct urtwn_softc *sc, uin > return (0); > } > > -static void > +static __inline void > urtwn_rf_write(struct urtwn_softc *sc, int chain, uint8_t addr, uint32_t val) > { > + > + sc->sc_rf_write(sc, chain, addr, val); > +} > + > +static void > +urtwn_r92c_rf_write(struct urtwn_softc *sc, int chain, uint8_t addr, > + uint32_t val) > +{ > urtwn_bb_write(sc, R92C_LSSI_PARAM(chain), > SM(R92C_LSSI_PARAM_ADDR, addr) | > SM(R92C_LSSI_PARAM_DATA, val)); > } > > +static void > +urtwn_r88e_rf_write(struct urtwn_softc *sc, int chain, uint8_t addr, > +uint32_t val) > +{ > + urtwn_bb_write(sc, R92C_LSSI_PARAM(chain), > + SM(R88E_LSSI_PARAM_ADDR, addr) | > + SM(R92C_LSSI_PARAM_DATA, val)); > +} > + > static uint32_t > urtwn_rf_read(struct urtwn_softc *sc, int chain, uint8_t addr) > { > @@ -1143,22 +1188,8 @@ urtwn_efuse_read(struct urtwn_softc *sc) > uint8_t off, msk; > int i; > > - reg = urtwn_read_2(sc, R92C_SYS_ISO_CTRL); > - if (!(reg & R92C_SYS_ISO_CTRL_PWC_EV12V)) { > - urtwn_write_2(sc, R92C_SYS_ISO_CTRL, > - reg | R92C_SYS_ISO_CTRL_PWC_EV12V); > - } > - reg = urtwn_read_2(sc, R92C_SYS_FUNC_EN); > - if (!(reg & R92C_SYS_FUNC_EN_ELDR)) { > - urtwn_write_2(sc, R92C_SYS_FUNC_EN, > - reg | R92C_SYS_FUNC_EN_ELDR); > - } > - reg = urtwn_read_2(sc, R92C_SYS_CLKR); > - if ((reg & (R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M)) != > - (R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M)) { > - urtwn_write_2(sc, R92C_SYS_CLKR, > - reg | R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M); > - } > + urtwn_efuse_switch_power(sc); > + > memset(&sc->rom, 0xff, sizeof(sc->rom)); > while (addr < 512) { > reg = urtwn_efuse_read_1(sc, addr); > @@ -1188,12 +1219,37 @@ urtwn_efuse_read(struct urtwn_softc *sc) > } > #endif > } > +static void > +urtwn_efuse_switch_power(struct urtwn_softc *sc) > +{ > + uint32_t reg; > + > + reg = urtwn_read_2(sc, R92C_SYS_ISO_CTRL); > + if (!(reg & R92C_SYS_ISO_CTRL_PWC_EV12V)) { > + urtwn_write_2(sc, R92C_SYS_ISO_CTRL, > + reg | R92C_SYS_ISO_CTRL_PWC_EV12V); > + } > + reg = urtwn_read_2(sc, R92C_SYS_FUNC_EN); > + if (!(reg & R92C_SYS_FUNC_EN_ELDR)) { > + urtwn_write_2(sc, R92C_SYS_FUNC_EN, > + reg | R92C_SYS_FUNC_EN_ELDR); > + } > + reg = urtwn_read_2(sc, R92C_SYS_CLKR); > + if ((reg & (R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M)) != > + (R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M)) { > + urtwn_write_2(sc, R92C_SYS_CLKR, > + reg | R92C_SYS_CLKR_LOADER_EN | R92C_SYS_CLKR_ANA8M); > + } > +} > > static int > urtwn_read_chipid(struct urtwn_softc *sc) > { > uint32_t reg; > > + if (sc->chip & URTWN_CHIP_88E) > + return (0); > + > reg = urtwn_read_4(sc, R92C_SYS_CFG); > if (reg & R92C_SYS_CFG_TRP_VAUX_EN) > return (EIO); > @@ -1230,8 +1286,69 @@ urtwn_read_rom(struct urtwn_softc *sc) > > sc->regulatory = MS(rom->rf_opt1, R92C_ROM_RF1_REGULATORY); > DPRINTF("regulatory type=%d\n", sc->regulatory); > - > IEEE80211_ADDR_COPY(sc->sc_bssid, rom->macaddr); > + > + sc->sc_rf_write = urtwn_r92c_rf_write; > + sc->sc_power_on = urtwn_r92c_power_on; > + sc->sc_dma_init = urtwn_r92c_dma_init; > +} > + > +static void > +urtwn_r88e_read_rom(struct urtwn_softc *sc) > +{ > + uint8_t *rom = sc->r88e_rom; > + uint16_t addr = 0; > + uint32_t reg; > + uint8_t off, msk, tmp; > + int i; > + > + urtwn_efuse_switch_power(sc); > + > + /* Read full ROM image. */ > + memset(&sc->r88e_rom, 0xff, sizeof(sc->r88e_rom)); > + while (addr < 1024) { > + reg = urtwn_efuse_read_1(sc, addr); > + if (reg == 0xff) > + break; > + addr++; > + if ((reg & 0x1f) == 0x0f) { > + tmp = (reg & 0xe0) >> 5; > + reg = urtwn_efuse_read_1(sc, addr); > + if ((reg & 0x0f) != 0x0f) > + off = ((reg & 0xf0) >> 1) | tmp; > + addr++; > + } else > + off = reg >> 4; > + msk = reg & 0xf; > + for (i = 0; i < 4; i++) { > + if (msk & (1 << i)) > + continue; > + rom[off * 8 + i * 2 + 0] = > + urtwn_efuse_read_1(sc, addr); > + addr++; > + rom[off * 8 + i * 2 + 1] = > + urtwn_efuse_read_1(sc, addr); > + addr++; > + } > + } > + > + addr = 0x10; > + for (i = 0; i < 6; i++) > + sc->cck_tx_pwr[i] = sc->r88e_rom[addr++]; > + for (i = 0; i < 5; i++) > + sc->ht40_tx_pwr[i] = sc->r88e_rom[addr++]; > + sc->bw20_tx_pwr_diff = (sc->r88e_rom[addr] & 0xf0) >> 4; > + if (sc->bw20_tx_pwr_diff & 0x08) > + sc->bw20_tx_pwr_diff |= 0xf0; > + sc->ofdm_tx_pwr_diff = (sc->r88e_rom[addr] & 0xf); > + if (sc->ofdm_tx_pwr_diff & 0x08) > + sc->ofdm_tx_pwr_diff |= 0xf0; > + sc->regulatory = MS(sc->r88e_rom[0xc1], R92C_ROM_RF1_REGULATORY); > + IEEE80211_ADDR_COPY(sc->sc_bssid, &sc->r88e_rom[0xd7]); > + > + sc->sc_rf_write = urtwn_r88e_rf_write; > + sc->sc_power_on = urtwn_r88e_power_on; > + sc->sc_dma_init = urtwn_r88e_dma_init; > } > > /* > @@ -1349,13 +1466,26 @@ static void > urtwn_set_led(struct urtwn_softc *sc, int led, int on) > { > uint8_t reg; > - > + > if (led == URTWN_LED_LINK) { > - reg = urtwn_read_1(sc, R92C_LEDCFG0) & 0x70; > - if (!on) > - reg |= R92C_LEDCFG0_DIS; > - urtwn_write_1(sc, R92C_LEDCFG0, reg); > - sc->ledlink = on; /* Save LED state. */ > + if (sc->chip & URTWN_CHIP_88E) { > + reg = urtwn_read_1(sc, R92C_LEDCFG2) & 0xf0; > + urtwn_write_1(sc, R92C_LEDCFG2, reg | 0x60); > + if (!on) { > + reg = urtwn_read_1(sc, R92C_LEDCFG2) & 0x90; > + urtwn_write_1(sc, R92C_LEDCFG2, > + reg | R92C_LEDCFG0_DIS); > + urtwn_write_1(sc, R92C_MAC_PINMUX_CFG, > + urtwn_read_1(sc, R92C_MAC_PINMUX_CFG) & > + 0xfe); > + } > + } else { > + reg = urtwn_read_1(sc, R92C_LEDCFG0) & 0x70; > + if (!on) > + reg |= R92C_LEDCFG0_DIS; > + urtwn_write_1(sc, R92C_LEDCFG0, reg); > + } > + sc->ledlink = on; /* Save LED state. */ > } > } > > @@ -1421,11 +1551,12 @@ urtwn_newstate(struct ieee80211vap *vap, > reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x20); > urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(0), reg); > > - reg = urtwn_bb_read(sc, R92C_OFDM0_AGCCORE1(1)); > - reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x20); > - urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(1), reg); > + if (!(sc->chip & URTWN_CHIP_88E)) { > + reg = urtwn_bb_read(sc, R92C_OFDM0_AGCCORE1(1)); > + reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x20); > + urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(1), reg); > + } > } > - > /* Make link LED blink during scan. */ > urtwn_set_led(sc, URTWN_LED_LINK, !sc->ledlink); > > @@ -1441,10 +1572,11 @@ urtwn_newstate(struct ieee80211vap *vap, > reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x32); > urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(0), reg); > > - reg = urtwn_bb_read(sc, R92C_OFDM0_AGCCORE1(1)); > - reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x32); > - urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(1), reg); > - > + if (!(sc->chip & URTWN_CHIP_88E)) { > + reg = urtwn_bb_read(sc, R92C_OFDM0_AGCCORE1(1)); > + reg = RW(reg, R92C_OFDM0_AGCCORE1_GAIN, 0x32); > + urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(1), reg); > + } > urtwn_set_chan(sc, ic->ic_curchan, NULL); > break; > case IEEE80211_S_RUN: > @@ -1497,7 +1629,11 @@ urtwn_newstate(struct ieee80211vap *vap, > urtwn_write_1(sc, R92C_T2T_SIFS + 1, 10); > > /* Intialize rate adaptation. */ > - urtwn_ra_init(sc); > + if (sc->chip & URTWN_CHIP_88E) > + ni->ni_txrate = > + ni->ni_rates.rs_rates[ni->ni_rates.rs_nrates-1]; > + else > + urtwn_ra_init(sc); > /* Turn link LED on. */ > urtwn_set_led(sc, URTWN_LED_LINK, 1); > > @@ -1543,19 +1679,21 @@ urtwn_update_avgrssi(struct urtwn_softc > pwdb = 100; > else > pwdb = 100 + rssi; > - if (rate <= 3) { > - /* CCK gain is smaller than OFDM/MCS gain. */ > - pwdb += 6; > - if (pwdb > 100) > - pwdb = 100; > - if (pwdb <= 14) > - pwdb -= 4; > - else if (pwdb <= 26) > - pwdb -= 8; > - else if (pwdb <= 34) > - pwdb -= 6; > - else if (pwdb <= 42) > - pwdb -= 2; > + if (!(sc->chip & URTWN_CHIP_88E)) { > + if (rate <= 3) { > + /* CCK gain is smaller than OFDM/MCS gain. */ > + pwdb += 6; > + if (pwdb > 100) > + pwdb = 100; > + if (pwdb <= 14) > + pwdb -= 4; > + else if (pwdb <= 26) > + pwdb -= 8; > + else if (pwdb <= 34) > + pwdb -= 6; > + else if (pwdb <= 42) > + pwdb -= 2; > + } > } > if (sc->avg_pwdb == -1) /* Init. */ > sc->avg_pwdb = pwdb; > @@ -1592,6 +1730,57 @@ urtwn_get_rssi(struct urtwn_softc *sc, i > return (rssi); > } > > +static int8_t > +urtwn_r88e_get_rssi(struct urtwn_softc *sc, int rate, void *physt) > +{ > + struct r92c_rx_phystat *phy; > + struct r88e_rx_cck *cck; > + uint8_t cck_agc_rpt, lna_idx, vga_idx; > + int8_t rssi; > + > + if (rate <= 3) { > + cck = (struct r88e_rx_cck *)physt; > + cck_agc_rpt = cck->agc_rpt; > + lna_idx = (cck_agc_rpt & 0xe0) >> 5; > + vga_idx = cck_agc_rpt & 0x1f; > + switch (lna_idx) { > + case 7: > + if (vga_idx <= 27) > + rssi = -100 + 2* (27 - vga_idx); > + else > + rssi = -100; > + break; > + case 6: > + rssi = -48 + 2 * (2 - vga_idx); > + break; > + case 5: > + rssi = -42 + 2 * (7 - vga_idx); > + break; > + case 4: > + rssi = -36 + 2 * (7 - vga_idx); > + break; > + case 3: > + rssi = -24 + 2 * (7 - vga_idx); > + break; > + case 2: > + rssi = -12 + 2 * (5 - vga_idx); > + break; > + case 1: > + rssi = 8 - (2 * vga_idx); > + break; > + case 0: > + rssi = 14 - (2 * vga_idx); > + break; > + } > + rssi += 6; > + } else { /* OFDM/HT. */ > + phy = (struct r92c_rx_phystat *)physt; > + rssi = ((le32toh(phy->phydw1) >> 1) & 0x7f) - 110; > + } > + return (rssi); > +} > + > + > static int > urtwn_tx_start(struct urtwn_softc *sc, struct ieee80211_node *ni, > struct mbuf *m0, struct urtwn_data *data) > @@ -1619,6 +1808,8 @@ urtwn_tx_start(struct urtwn_softc *sc, s > * Software crypto. > */ > wh = mtod(m0, struct ieee80211_frame *); > + type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; > + > if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) { > k = ieee80211_crypto_encap(ni, m0); > if (k == NULL) { > @@ -1633,7 +1824,7 @@ urtwn_tx_start(struct urtwn_softc *sc, s > wh = mtod(m0, struct ieee80211_frame *); > } > > - switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) { > + switch (type) { > case IEEE80211_FC0_TYPE_CTL: > case IEEE80211_FC0_TYPE_MGT: > xfer = sc->sc_xfer[URTWN_BULK_TX_VO]; > @@ -1657,20 +1848,24 @@ urtwn_tx_start(struct urtwn_softc *sc, s > R92C_TXDW0_OWN | R92C_TXDW0_FSG | R92C_TXDW0_LSG); > if (IEEE80211_IS_MULTICAST(wh->i_addr1)) > txd->txdw0 |= htole32(R92C_TXDW0_BMCAST); > - > - type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; > if (!IEEE80211_IS_MULTICAST(wh->i_addr1) && > type == IEEE80211_FC0_TYPE_DATA) { > if (ic->ic_curmode == IEEE80211_MODE_11B) > raid = R92C_RAID_11B; > else > raid = R92C_RAID_11BG; > - txd->txdw1 |= htole32( > - SM(R92C_TXDW1_MACID, URTWN_MACID_BSS) | > - SM(R92C_TXDW1_QSEL, R92C_TXDW1_QSEL_BE) | > - SM(R92C_TXDW1_RAID, raid) | > - R92C_TXDW1_AGGBK); > - > + if (sc->chip & URTWN_CHIP_88E) { > + txd->txdw1 |= htole32( > + SM(R88E_TXDW1_MACID, URTWN_MACID_BSS) | > + SM(R92C_TXDW1_QSEL, R92C_TXDW1_QSEL_BE) | > + SM(R92C_TXDW1_RAID, raid)); > + txd->txdw2 |= htole32(R88E_TXDW2_AGGBK); > + } else { > + txd->txdw1 |= htole32( > + SM(R92C_TXDW1_MACID, URTWN_MACID_BSS) | > + SM(R92C_TXDW1_QSEL, R92C_TXDW1_QSEL_BE) | > + SM(R92C_TXDW1_RAID, raid) | R92C_TXDW1_AGGBK); > + } > if (ic->ic_flags & IEEE80211_F_USEPROT) { > if (ic->ic_protmode == IEEE80211_PROT_CTSONLY) { > txd->txdw4 |= htole32(R92C_TXDW4_CTS2SELF | > @@ -1684,7 +1879,10 @@ urtwn_tx_start(struct urtwn_softc *sc, s > txd->txdw4 |= htole32(SM(R92C_TXDW4_RTSRATE, 8)); > txd->txdw5 |= htole32(0x0001ff00); > /* Send data at OFDM54. */ > - txd->txdw5 |= htole32(SM(R92C_TXDW5_DATARATE, 11)); > + if (sc->chip & URTWN_CHIP_88E) > + txd->txdw5 |= htole32(0x13 & 0x3f); > + else > + txd->txdw5 |= htole32(SM(R92C_TXDW5_DATARATE, 11)); > } else { > txd->txdw1 |= htole32( > SM(R92C_TXDW1_MACID, 0) | > @@ -1882,9 +2080,16 @@ urtwn_alloc_tx_list(struct urtwn_softc * > return (0); > } > > -static int > +static __inline int > urtwn_power_on(struct urtwn_softc *sc) > { > + > + return sc->sc_power_on(sc); > +} > + > +static int > +urtwn_r92c_power_on(struct urtwn_softc *sc) > +{ > uint32_t reg; > int ntries; > > @@ -1968,12 +2173,73 @@ urtwn_power_on(struct urtwn_softc *sc) > } > > static int > +urtwn_r88e_power_on(struct urtwn_softc *sc) > +{ > + uint8_t val; > + uint32_t reg; > + int ntries; > + > + /* Wait for power ready bit. */ > + for (ntries = 0; ntries < 5000; ntries++) { > + val = urtwn_read_1(sc, 0x6) & 0x2; > + if (val == 0x2) > + break; > + DELAY(10); > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAC_-zweFNGKaQxuibhTNS7b=0WmBX2s16X3VRPjmKT8B91UpHg>