summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Image.gz49011
-rw-r--r--braun.dtb133
-rw-r--r--lib/firmware/video/gx_h264_enc.bin221
-rw-r--r--lib/firmware/video/video_ucode.bin8288
-rw-r--r--lib/mali.ko942
-rw-r--r--lib/modules/8189es.ko20594
-rw-r--r--lib/modules/8822bu.ko4784
-rw-r--r--lib/modules/aml_hardware_ci.ko820
-rw-r--r--lib/modules/aml_hardware_dmx.ko2089
-rw-r--r--lib/modules/aml_hardware_fe.ko780
-rw-r--r--lib/modules/aml_hardware_pcmcia.ko301
-rw-r--r--lib/modules/aml_hardware_spi.ko781
-rw-r--r--lib/modules/amvdec_avs.ko969
-rw-r--r--lib/modules/amvdec_h264.ko650
-rw-r--r--lib/modules/amvdec_h264_4k2k.ko498
-rw-r--r--lib/modules/amvdec_h264mvc.ko492
-rw-r--r--lib/modules/amvdec_h265.ko2372
-rw-r--r--lib/modules/amvdec_mh264.ko2247
-rw-r--r--lib/modules/amvdec_mjpeg.ko417
-rw-r--r--lib/modules/amvdec_mmjpeg.ko415
-rw-r--r--lib/modules/amvdec_mmpeg4.ko416
-rw-r--r--lib/modules/amvdec_mpeg12.ko419
-rw-r--r--lib/modules/amvdec_mpeg4.ko395
-rw-r--r--lib/modules/amvdec_real.ko371
-rw-r--r--lib/modules/amvdec_vc1.ko413
-rw-r--r--lib/modules/amvdec_vp9.ko1870
-rw-r--r--lib/modules/bcmdhd.ko712
-rw-r--r--lib/modules/decoder_common.ko2857
-rw-r--r--lib/modules/dhd.ko16058
-rw-r--r--lib/modules/encoder.ko793
-rw-r--r--lib/modules/firmware.ko761
-rw-r--r--lib/modules/media_clock.ko951
-rw-r--r--lib/modules/stream_input.ko2683
-rw-r--r--tdk/optee.ko893
-rw-r--r--tdk/optee_armtz.ko676
35 files changed, 72583 insertions, 54489 deletions
diff --git a/lib/modules/amvdec_mh264.ko b/lib/modules/amvdec_mh264.ko
index df8ecfe..33e36c7 100644
--- a/lib/modules/amvdec_mh264.ko
+++ b/lib/modules/amvdec_mh264.ko
@@ -1,4 +1,4 @@
-ELF
+ELF
@
@
@@ -105,22 +105,21 @@ H4
@
@!X@"@b!
-@dhGg
+@dhGg
@
-@C
-@BX@D@bdB
-@jGg
-@"C
-@@9 R
-
-t
+@C
+@BX@C@cB
+@jGg
+@"C
+@@9 R
+
@
-@"CK`
-@ Rb
-@*
+@"C
+@ R
+@*"

-r
+r
@
@Ru
@\As
@@ -147,27 +146,25 @@ H4
@
@
-@*
-
+@*
+
-
+
R@|
@@
@$
-@*
-
-@
-@
+@*
+7J@@
+@
+@
@`
-
-
-@N
-@C
-
-
-
+
+
+@N
+@C
+@
@
@
@
@@ -212,7 +209,7 @@ H4
Ga?
@
-PRNR NRnLRKR
+ZR,YRKXRVRUR
@C
@
{
@@ -242,7 +239,7 @@ Ga?
By
-@
+@
@
PPP
@@ -308,12 +305,11 @@ k
@

@
-@
-FR DR
-@
-@R
+@
+@
+@R

-
+
@
@R
@R
@@ -329,17 +325,18 @@ D
@
9?
@
-R
+R
@
@B
-@
-
+@
+

@
G*
@
Gߚ
-R
+
+R
a@C
@
@@ -348,22 +345,22 @@ Gߚ
*B
@
@R{
-@R3@
-@
+@R3@
+@
@
-@R
-a
+@R
+a
!


-eR
-@
-@c
+$R
+@
+@c
@
@R
-/R
-R
-
+h9R
+(R
+;R
@
@R9
@
@@ -376,31 +373,31 @@ Gߚ
@
@c<@
@R7
-@#R
-@%
-@$,R
-@%
+@,R
+@%
+@5R
+@%
9@
@
@
-@
-@c
+@
+@c
@
@Rc8@
-@
-@c
+@
+@c
@
@R
@
-@dBR
-@
+@LR
+@
9t#

-@
- 7 G
+@
+ 7 G
-@
+@
disp_vframe_valve_level
force_enable_mmu
@@ -474,7 +471,7 @@ amvdec_h264 fixed_frame_rate_mode
ammvdec_h264 start_decode_buf_level
ammvdec_h264 h264_debug_flag
-
+
@@ -608,7 +605,10 @@ ammvdec_h264 mmu alloc failed!
-
+
+
+
+
@@ -689,7 +689,8 @@ ammvdec_h264 init failed.
-
+
+
s8
u8
u16
@@ -699,136 +700,144 @@ s64
u64

-
+




-
-
-"
-/
-[9
-
-
+
+
+"
+-
+-
+-
+-
+c/
+;9
+J
+J
+
+
+J
+L
2
2
2
-2
-
-
-V
-h
-
-
-~l
+2
+Q
+
+Q
+
+L
+W
+f
+h
+
+
+l


-
-
-{
-+
-
-
-5
-
-
-
-
-
-
-
-
-+
-b
-
-2
-2
-
-
+
+
++
+
+i
+
+
+
+
+
+
+
+
++
+p
+
+2
+2
+
+
)
-+
-A2
++
+A2
C2
-X+
-X2
-+
-+
-+
-+
+X+
+X2
++
++
++
++
++
+
-+
-+
-
-
-
++
+
+
+
-+
++
-b
-+
+b
++
+
)
)
2
-N
-
-5
-+
-
-
-
-
-
-
+
+
+
++
+h
+
+
+
)
-N
-
+
+
+
-+
-2
-B
-v
-@
-~
++
+2
+
+
+
+
b
p
-I
-@
-@
-/
-
- +
- +
- 
-
-
->
-r
+
+
+
+
+5
+ +
+
+
+
+
+
+
+
+
+
b
-D
-I
->
+
+
+
+
-b
-
-+
-
-C
-
- +
- +
-
-Z
-r
-b
-v
-b
-y
-|
-
-+
-<
+b
+5
++
+*
+
+*5
+
+ O
+
+bb
+bb
+x
+
+
++
+<



@@ -839,724 +848,693 @@ v



-
-
-
-
-A
-A
+
+
+s
+s
M
M
M
c
-!A
+!s
M
-$
+$
%F
-&
-(
-*c
+&
+(
+*c

-
-
--
-.
+
+
+-M
+.R
/y
0y
1
2
-
-P
-"
-+G
-3
-n
-
-P
-n
-0
-0
-0
-
-
-
-
-
-
-I
-
-*
-
-
-
-
-@
-A
+M
+
+""
++y
+3
+
+
+
+
+S
+
+
+
+P
+
+
+L
+
+{
+
+\
+
+2
+7
+r
+s
y
-
-
-
-
-
-
-
-L
-!
-"
-"
+
+
+
+
+
+
+
+
+~
+
+
+
+
+
+
+
y
-"
-"
- #
-!
-!#
-e#
-K#
-$
-$
-$
-$
-$
-%
-%
-u(
-(
-
- )
-@)
-n)
-)
-)
-*
-*
-,
-,
--
--
-P.
-)
-.
--
-.
-.
-*
-.
-
-/
-0
-0
-10
-M0
-0
-0
-3
-3
-
-7
-5
-
-&6
-5
-
-;:
-R
-k:
-:
-M;
-h;
-;
-<
-e=
-p=
-=
-?
->
-?
-?
-?
-?
-oA
-SA
-EC
-yD
-B
-F
- G
-
-G
-H
-H
-I
-0I
-OI
-dI
-yI
-I
-I
-I
-I
-I
+
+
+=
+8
+S
+
+}
+
+
+ !
+ !
++!
+6!
+
+!
+
+
+$
+%
+'
+R%
+r%
+%
+%
+
+%
+I&
+&
+(
+')
+)
+)
+
+*
+&
+*
+)
+*
+*
+C&
+*
+
+
+
+
+C+
+G,
+c,
+,
+/
+/
+
+
+3
+1
+
+
+H2
+1
+
+M6
+
+}6
+6
+_7
+z7
+7
+8
+w9
+9
+9
+;
+:
+;
+;
+;
+;
+=
+
+e=
+>
+
+?
+F
+@
+?
+}B
+rC
+
+MD
+=E
+]E
+wE
+E
+E
+E
+E
+F
+E
+F
+!F
+6F



-
- O
-(O
-3O
-P
-6S
-T
-T
-T
-U
-U
-U
-V
-V
-*V
-5V
-@V
-K
-I
-WV
-bV
-mV
-xV
-V
-V
-V
-2
-V
-V
-V
-V
-V
-O
-V
-TX
-W
-5X
-*Y
- Y
-X
-$Y
-Y
-Y
-Z
-'Z
-dZ
-Z
-Z
- [
-'[
-[
-2[
-\
-\
-[
-\
-G[
-4\
-d\
-
-_
-b
-b
-b
- d
-+d
-d
- e
-e
-
-f
-f
- j
-j
-m
-Nm
-e
-4m
-m
-_m
-m
-m
-m
-m
-m
-m
-n
-n
-In
-n
-cn
-n
-n
-n
-n
-n
-Wo
-
-o
-p
-tq
-%
-q
+
+
+sK
+K
+K
+vL
+O
+yP
+P
+Q
+?R
+DR
+OR
+R
+R
+R
+R
+R
+H
+GF
+R
+R
+R
+R
+R
+R
+R
+.
+S
+S
+&S
+GS
+LS
+K
+]S
+T
+-T
+T
+U
+qU
+eU
+U
+U
+%V
+nV
+V
+V
+ W
+\W
+sW
+W
+xW
+W
+X
+X
+\X
+{X
+W
+X
+X
+(\
+^
+_
+
+
+B_
+`
+`
+Na
+sa
++b
+
+b
+Lc
+qf
+
+
+
+vf
+i
+i
+b
+i
+i
+i
+i
+ j
+j
+/j
+Ej
+dj
+j
+ij
+j
+j
+j
+ k
+j
+Qk
+\k
+k
+k
+
+
+l
+l
+m
+A!
+n
+o
+o
B
-r
-
-t
-[u
-u
- v
-s
- v
-v
-v
-w
-w
-s
-v
-zs
-w
-y
-z
-x
--z
-6w
-Rz
-wz
-x
-z
-z
-z
-
-Z{
-|
-|
-|
-|
-|
-}
+o
+
+p
+
+p
+p
+p
+p
+p
+p
+p
+p
+p
+Pq
+q
+Wr
+qr
+?p
+r
+6s
+Ps
+
+p
+as
+o
+|s
+u
+Uv
+yv
+Bu
+v
+s
+v
+v
+
+u
+v
+"w
+'w
+
+
+
+w
+y
+x
+y
+9y
+Sy
+hy
w
-&}
-_}
-}
-}
-}
-}
- ~
-}
-~
-;~
-U~
+y
+y
+y
+z
+-z
+Gz
+rz
+Xz
+}z
+z
+z
Q
-t~
-~
-~
+z
+z
+4{

-~
-~
-~
-~
-
-
-
-
-
-
-
-
-y
-
-)
-
-ׅ
-
-
-
-,
-A
-`
-M
-
-ˆ
-(
-
-
-
-,
-W
-b
-m
-}
-
-
-
-
-p
-
-K
-x
-
-
-ߋ
-
-
-
-=
-W
-q
-
-
-Ό
-
-
-0
-Y
-
-
-
-Ѝ
-
-
-=
-f
-tq
-
-
-Ď
-
-
-
-@
-_
-y
-
-
-ۏ
-q
-
-$
-W
-C
-h
-Ê
-
-
-А
-
-
-2
-C
-Y
-s
-
-
-ȑ
-
-ӑ
-
-
-,
-F
-e
-
-r
-
-Ғ
-
-
-/
-
-
-
-
-
-u
-
-B
-
-
-
-
-
-p
-
-М
-ʝ
-
-
-0
-ʜ
-
-
-+
-K
-[
-`
-̟
-3
-z
-
-e
+{
+E{
+\{
+a{
+l{
+w{
+|
+|
+
+g}
+
+ 
+w
+y
+a
+
+#
+=
+R
+g
+x
+
+
+Ƃ
+M
+
+1
+
+
+
+L
+
+
+Ȇ
+ӆ
+
+
+
+
+
+Fm
+
+
+އ
+
+!
+E
+y
+_
+
+
+
+׈
+
+
+4
+S
+
+
+
+q
+
+
+6
+L
+z
+
+̊
+m
+
+
+*
+I
+c
+
+
+ŋ
+ߋ
+
+
+A
+Sn
+j
+
+S
+
+Ό
+)
+
+
+6
+d
+
+
+
+
+ٍ
+
+
+.
+
+9
+X
+|
+
+
+ˎ
+
+o
+
+8
+W
+q
+
+
+
+h
+s
+
+
+ۑ
+
+
+d
+U
+f
+f
+|
+֘
+
+6
+0
+q
+w
+
+0
+|
+w
+
+
+
+ƛ
+2
+
+
+
+˝
0
-
-
-
-ס
-
-
-/
-S
-r
-
-!
-Ϣ
-
+
+
+&
+=
+R
+q
+
+
+؞
+$
+
+5
+!
c
-
-
-
-
-
-
-#
-"
-'
-
-(
-s
-
-
-
-
-D
-
-I
-ϩ
-
-Z
-P4
-
-
-o
-
-
-0
-J
-z
-_
-
-
-
-1
-y
-c
-¹
-5
-
-K
-+
-
-
-,
-
-+
-y
-
-\
-
-y
-y
-
-
-R
-
-
-
-
-
-
-
-
-
-
-
-
-L
-
-L
-
-
-
-
-y
-y
-y
-
-
-
-y
-
-
-
-y
-y
-y
-
-]
-
-
-
-
-
-
-
-
-
-
-
-
-
-b
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-+
-
-y
-
-
-y
-
-
-]
-
-y
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8
-3
-9
+
+R
+]
+h
+s
+~
+
+
+
+
+-%
+٢
+
+
+S
+#
+
+U
+
+5
+$
+
+0
+ՠ
+\
+|
+
+
+
+ũ
+
+
+
+
+O
+
+y
+ɴ
+(
+
+!
+
+
+i
+
+y
+
+y
+y
+
+L
+
+y
+
+
+|
+
+
+y
+l
+
+=
+&
+L
+
+y
+
+ p
+
+
+'
+L
+
+y
+p
+y
+
+
+L
+y
+
+:
+x
+"
+
+
+/
+5


f
D
-EK
-F
+E;L
+F
(

j
-
+

b
!
-!
-)
-)
-
-q
-+
- 3
-<
-=
-+>
-Q>
+!
+)
+)
+
+q
+3
+N
+>=
+q>
+>
+>



-
-$
-Q
- Y
-3Y
-!
+
+$
+R
+Y
+Y
+!

-
+
-'
-
-.~<M>0o..KoJ uJ<x. #h
-f'+!
-t n  h  i.& i."! y -#!#&#v  2BVf!N ttp  f  v q.<x  =!$ <
- ##*3Ox.}Jk.XJ/
+'
+
+.~<M>0o..KoJ uJ<x. #h
+f'+!
+t n  h  i.& i."! y -#!#&#v  2BVf!N ttp  f  v q.<x  =!$ <
+ ##*3Ox.}Jk.XJ/
<>;?#!3Ot!4##/0!<!^ <@ 
t
- y. .b %$<c &>L 0v.=Ny #.s "3%
+ y. .b %$<c &>L 0v.=Ny #.s "3%
<v 
v 
-<v =2 q ":#0 t
-.v 3#$
-j X
-.T ,  J>$$! hJ?
-<
- !jLZ2?+?
- v t  j !.y j "Z1
-XL d. J q r  r  !d  b.<-"5&1a.5</<"!
-<!n<M>0L0"/<ztb.a. jI
-Ja  Xs  s. <?=0,">0"/ !!s.[=0,">0"s.<( !!.?./z.?a.<n?=0,">0"/ 0cX<0bJ.b. #f!!d./]0y. X <">~.K!
-,0,!"cJ1%G=00
-$< "!X"/[J
-$< "[@!f2$42/[J5</#J/"/!"/!$/" \t) K/0yf/y.[.5</#Jy.=^J@vt|..|..&tK=$%L /$ \ # !
- !u !//////x (#.[ \f# 3U#B00!v!> ,J./t\wXZ"&$)!!$"! ^.!  \ #  ^ ! ! \ #  ^.!  \ # ""&1\<<g $%A\<<g # 0\J#<K&&Nw  #[i\*#[[[XY$\.5<"$\.</ <0h=! #!// "!/p !! ~ !!Y 1v./!/`.|  2&</=!U 5</<1$!!/!\<..%O\<$.`@!_. J!%[.5<""[.</ ._  f!& .!/\ #J#  V<).x !!!!_. X"%G._J|  2|<$.JyJ=/./
-
-
- #
+<v =2 q ":#0 t
+.v 3#$
+j X
+.T ,  J>$$! hJ?
+<
+ !jLZ2?+?
+ v t  j !.y j "Z1
+XL d. J q r  r  !d  b.<-"5&1a.5</<"!
+<!n<M>0L0"/<ztb.a. jI
+Ja  Xs  s. <?=0,">0"/ !!s.[=0,">0"s.<( !!.?./z.?a.<n?=0,">0"/ 0bX<0bJ.b. #f!!d./]0y. X <">~.K!
+,0,!"cJ1%G=00
+$< "!X"/[J
+$< "[@!f2$42/ZJ5</#J/"/!"/!$/"=/1 \f) K/0yf/y.[.5</#Jy.=^J@vt|..|..&tK=$%L /$ \ # !
+ !u !//////x (#.[ \f# 3U#B00!v!> ,J./t\wXZ"&$)!!$"! ^.!  \ #  ^ ! ! \ #  ^.!  \ # ""&1\<<g $%A\<<g # 0\J#<K&&Nw  #[i\*#[[[[*.Y%[.5<"$[.</ <0h=! #!// "!/p !! ~ !!X 1v./!/`.|  2'</=!T 5</<1v.%R$!!/!\<$.`@!_. J!%[.5<#"[.</ ._  f!& .!/[ $J#  V<).x !!!!.0\J#<Z4?!#/Z!0/[J
+$< "i@ f_.- .o./O</\<#.
+
+ #
.N>-(!2"%0~<6N?-
- 01$
- #"
-fw %r  =/06f!/4 .20?/0/ .//f!//!!/"$~  ~ i0
-< !/
-X
-JvO>4J`.<v 
- %o  6 .<B %:fB -%%10"7f
- &o$&. .<E &6fE -&z &2 .0!../[c !<!Y<.{ t{04 \"=y$#-"
- w .310 <=/0=/5!%# ~  * .w "&?;!//100L!
-X/^fm |)XCy &
-<?K! <<L!!?<>/
-.w a.!<:
-Jj/"/N&z &!00=/
- u 
-<stn ! !2828Z/&=/##s  s.<mJ #// <t< .=/=!/ <y
- v =0#$" /4 J#J%0?/!a %[%*$*v/&=/1O(h .!h <2^." 8Z/&=0u  u.<RM-"@|./s/4.].!i!.""k.Jf !"! Y>$%!z )  <4 a  a <!"?1@/x.Z/ X[LO%O-F#!LYI!-A@$KIM??",J=iYI!-Abf//"./`<m..f<[1.s n 3/M'>6/?"6/X .XL!.t y %040@"40e Z/].u.5. ..+..i ! !N*28Z/&Z0%As<l..l.j|</`@f$!z !!4M+1@/Lv.Z/~<_2*28Z/&Z0$@t<<j?~..@/Lv.Z/~.]P#%L>&-""#MYI!-AhMgI!-AJ!=M#!-P>B>3>.l
-./` J`. <0!1=-!0/-!<O3!,!$K-/#\usA>>]A'y 5&u #!!j$tYWMNx$z
+ 01$
+ #"
+ %q  =/06f!/4 .20?/0/ .//f!//!!/"$~  ~ i0
+< !/
+X
+JvP>4J^.<v 
+ &zt
+   ..< &?f -&z &10"<f
+ 'zt$'..<A '9fA -'y '2 .0!../[a !<!W<.{ t{06 \"
+ w .310 <=/0=/5!%# ~  * .w "&?;!//100L!
+X/^fm |)XCy &
+<@K! <<L!!?<?/
+.w `."<:
+Jj/"/N&z &!00=/
+ u 
+<stn ! !2828Z/&=/##s  s.<mJ #// <t< .=/=!/ <y
+ v =0#$" /5 J$J%0?/!a %[%*$*v/&=/1O(h .!h <2^." 8Z/&=0u  u.< JM-"@|./s/4.].!i!.""k.Jf !"! Y>$%!z * <4 a  a <!"?1@/x.Z/ X[LO%O-F#!LYI!-A@$KIM??",J=iYI!-Aaf//"./_<m..f<[1.s n 3/M'>6/?"6/X .XL!.t y %040@"40e Z/].u.5. ..+..i ! !N*28Z/&Z0&z Br<k..l.j|</_@f$!z !!4M+1@/Lv.Z/~<`2*28Z/&Z0$@t<<j?~..@/Lv.Z/~.]P#%L>&-""#MYI!-AhMgI!-AJ!=M#!-P>B>3>.n
+./_  J_. <0!1=-!0/-!<O3!,!$K-/#\usA>>]A'y 5&u #!!j$ tYWMNx$z
A 
B 
A 
@@ -1602,9 +1580,9 @@ Jj/"/N&z &!00=/
S
BAAAA
BAAAA
-AA 
+AA 
F
-AAAAA 
+AAAAA 
AAAAA 
AA
V
@@ -1615,10 +1593,10 @@ Jj/"/N&z &!00=/
EAAAAA
n
BAAAAA
-AA 
-AAA 
- l
-AAAAA 
+AA 
+AAA 
+ l
+AAAAA 
A 
l
AAAAA 
@@ -1675,7 +1653,7 @@ Jj/"/N&z &!00=/
A 
A 
A 
-A 
+A 
@@ -1692,249 +1670,230 @@ Jj/"/N&z &!00=/
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-(
-v
-S
-
-
-
-
-
-
-
-
-
-
-M
-P
-
-^
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-G
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-*
-2
-S
-U
->
-d
-i
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-&
-
-h
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-;
-s
->
- 
-#
-
-
-
-
-
-:
-
-
-
-
-k
-i
-
-
-
-
-i
-
-t
-
-
-i
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2
+
+
+D
+
+j
+
+
+@
+
+G
+
+P
+}
+
+
+U
+
+
+
+
+}
+U
+
+
+
+
+
+
+
+
+P
+*
+
+
+
+
+
+
+
+
+
+k
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8
+H
+Y
+n
+z
+|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+W
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+X
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+H
+$
+
+T
+2
+
+
+
+
+
+
+
+E
+M
+O
+X
+[
+S
+O
+
+t
+y
+
+
+
+
+
+
+
+
+
+
+
+
+q
+
+
+
+
+
+
+
+
+
+q
+
+
+
+
+
+
+
@@ -1981,10 +1940,10 @@ i
-$
-3
-9
->
+$
+3
+9
+>
@@ -2007,7 +1966,7 @@ $
-
+
@@ -2035,18 +1994,18 @@ $
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2062,46 +2021,44 @@ $
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+