From afdcd2bedd419497fdd6c233842e8e6e75548839 Mon Sep 17 00:00:00 2001
From: artart78 <artart78@80855669-be73-4f5e-9bfa-13ee22678a59>
Date: Thu, 10 May 2012 20:52:46 +0000
Subject: [PATCH] Fixed codec (building & working), some work on ctrl debugging

---
 include/lowio_gpio.h              |   9 ++++++++
 include/lowio_i2c.h               |   6 +++++
 include/lowio_sysreg.h            |   2 ++
 include/threadman_kernel.h        |   1 +
 lib/build.mak                     |   2 +-
 lib/libsceDdr_driver.a            | Bin 14878 -> 14878 bytes
 lib/libsceDmac.a                  | Bin 2982 -> 2982 bytes
 lib/libsceDmacplus_driver.a       | Bin 20230 -> 20230 bytes
 lib/libsceGpio_driver.a           | Bin 16880 -> 16778 bytes
 lib/libsceI2c_driver.a            | Bin 8062 -> 8020 bytes
 lib/libsceLcdc_driver.a           | Bin 20890 -> 20890 bytes
 lib/libsceNand_driver.a           | Bin 37272 -> 37272 bytes
 lib/libscePwm_driver.a            | Bin 7084 -> 7084 bytes
 lib/libsceSysreg_driver.a         | Bin 177324 -> 177324 bytes
 src/audio/audio.c                 |   2 +-
 src/codec/Makefile                |   2 ++
 src/codec/codec.c                 |  13 +++++++++--
 src/codec/exports.exp             |   4 ++--
 src/ctrl/ctrl.c                   |  37 ++++++++++++++++++++----------
 src/ctrl/ctrl_custom_VB_handler.c |   2 +-
 src/iofilemgr/iofilemgr.c         |  14 +++++++++++
 21 files changed, 75 insertions(+), 19 deletions(-)
 create mode 100644 include/lowio_gpio.h
 create mode 100644 include/lowio_i2c.h

diff --git a/include/lowio_gpio.h b/include/lowio_gpio.h
new file mode 100644
index 0000000..683b097
--- /dev/null
+++ b/include/lowio_gpio.h
@@ -0,0 +1,9 @@
+/* Copyright (C) 2011, 2012 The uOFW team
+   See the file COPYING for copying permission.
+*/
+
+int sceGpioPortSet(int);
+int sceGpioPortClear(int);
+int sceGpioSetPortMode(int, int);
+int sceGpioDisableTimerCapture(int, int);
+
diff --git a/include/lowio_i2c.h b/include/lowio_i2c.h
new file mode 100644
index 0000000..f30885f
--- /dev/null
+++ b/include/lowio_i2c.h
@@ -0,0 +1,6 @@
+/* Copyright (C) 2011, 2012 The uOFW team
+   See the file COPYING for copying permission.
+*/
+
+int sceI2cMasterTransmit(int reg, void *buf, int bufSize);
+
diff --git a/include/lowio_sysreg.h b/include/lowio_sysreg.h
index f195827..f25f6d3 100644
--- a/include/lowio_sysreg.h
+++ b/include/lowio_sysreg.h
@@ -47,6 +47,8 @@ int sceSysregAudioClkSelect(int, int);
 int sceSysregAudioBusClockEnable(int);
 int sceSysregAudioIoEnable(int);
 int sceSysregAudioIoDisable(int);
+int sceSysregAudioClkoutClkEnable(void);
+int sceSysregAudioClkoutClkDisable(void);
 int sceSysregAudioClkoutClkSelect(int);
 int sceSysregAudioClkoutIoEnable(void);
 int sceSysregAudioClkoutIoDisable(void);
diff --git a/include/threadman_kernel.h b/include/threadman_kernel.h
index a4c2600..5dfd714 100644
--- a/include/threadman_kernel.h
+++ b/include/threadman_kernel.h
@@ -56,6 +56,7 @@ int sceKernelCreateMutex(char *, int, int, int);
 int sceKernelTryLockMutex(int, int);
 int sceKernelLockMutex(int, int, int);
 int sceKernelUnlockMutex(int, int);
+int sceKernelDeleteMutex(int);
 
 /* Event flags */
 
diff --git a/lib/build.mak b/lib/build.mak
index 46af939..707a7ee 100644
--- a/lib/build.mak
+++ b/lib/build.mak
@@ -16,7 +16,7 @@ EXPORT_OBJ=$(patsubst %.exp,%.o,$(PRX_EXPORTS))
 
 ifdef DEBUG
 CFLAGS += -DDEBUG
-LIBS := -ldebug -lpspdebug $(LIBS) -lSysclibForKernel -lsceDisplay -lsceGe_user -lIoFileMgrForUser -lsceSyscon_driver
+LIBS := -ldebug -lpspdebug $(LIBS) -lSysclibForKernel -lsceDisplay -lsceGe_user -lIoFileMgrForKernel -lsceSyscon_driver
 endif
 
 MODULE_STUBS=$(foreach mod,$(MODULES), $($(mod)_STUBS))
diff --git a/lib/libsceDdr_driver.a b/lib/libsceDdr_driver.a
index fc8b51dfde24d02ee4115a2f957940d9900fc5e9..eb0a1a474743a8e9df59fe2a754feaeea02577b7 100644
GIT binary patch
delta 229
zcmbPNGOuKU44avmshO$8Mx_8|D06cKGaCz(Jy}AdX!AFA4VWC5KaCreZ^n<xzb1sr
wFB3!Mi%FsKx5=XN!xZ8C%`GZ@FuONPXv~7McW5Kn5&8)B4<iJ7hFKdk0DY4?!T<mO

delta 229
zcmbPNGOuKU44Z+4ftk7SMx_8|2-9eD1v489ls#EOqiFLtb`6*um_Lmhm2bw6%D*Or
z$}bZ`<%>z7^0&#t_{L!K!xZ8C%`GZ@P`iycOK8l3vv+7C*b({&_75WjdxlvXGXNyx
BI{E+r

diff --git a/lib/libsceDmac.a b/lib/libsceDmac.a
index d7d6966eabba0a18cd6fab150d3c1ab285953d9b..528efc2dbab22f2a4bc9bb409e9bcdd9589d6764 100644
GIT binary patch
delta 51
pcmZ1`zD#_A44avmshO$yM5P)iYvYnn%uwd$IV@dpwhl)XGXQw|4hR4M

delta 51
pcmZ1`zD#_A44Z+4ftk7CM5P)iYvYnn%uwd$IV@dpwhl)XGXQhL4b%Vt

diff --git a/lib/libsceDmacplus_driver.a b/lib/libsceDmacplus_driver.a
index 13896d9816e641a0a74062ac8a5714f3dd2cef4c..b7c1529ce399a4659bc2fc2a0ec92b816da07620 100644
GIT binary patch
delta 319
zcmZph$JjQHae@q+nVG4Xsl`Sm304Txe6s_q7z>m=IYFdo^EplvW@LU9FDhS65YFG6
zAhHZaZJh*M4s4c|3@ZPcJe<E-Kp9o9o;q9(toN1{D!)w+&fk2%5LNFzQ@9*hZ<i%1
e-^>=y-(27T(`x}%+vft4gYd09Q2Eci6_^1(B~`2d

delta 319
zcmZph$JjQHae@q+frWvYxzR=?304TxaI*ue7z>m=IYFdo^EplvW@LU9FN|*lmRA#m
z^EW4mEQ6|r$kj=}<-lsSWKj9n<l+3y0?Md*_0-{VV7<4rQ2A|oaQ@~4hNyb)nZo73
gdb=!9`DV6o{^kM)RK0yJa5=DED-TruGj9cE0GYB>sQ>@~

diff --git a/lib/libsceGpio_driver.a b/lib/libsceGpio_driver.a
index 5906313d07726f7f16a309e70db1048d7b30837e..d5aba6269ae27a30bce1b4beb7161c7b9cfdb95f 100644
GIT binary patch
delta 966
zcmey+%-Ge;I6<b~%*@ox)LcQqKmi1hNd*NHLldy5f<gip0|SE~0|WCi1_t(R3=G^+
z3=DkV7#M^mF))bfF)&D8VqlQXV_;AOs#96Sz@TBrz@UALfkD5Dfx%defx!%@$0~?{
z!S-Ezd~r!>QhaWHN@-4NeDP#|Zc$;E%;LnPoYaua+|(lH#DbF2qST28B<&rO3rjPL
zQa$rZiWrKMQ{4+P^8-s$iz<-?T=UR%!j!sCPGl5g^UNztEh?Gp$!JyYo>~GmJRrZQ
z1f~pXH?o<*SQP@bgB1DZr=-I4LM%tq3RlFSuMZ79Fg010NqVvZ6Z>WhrWK5AkYJx&
zCnmP}5Azph1ixr=2FD*p#)8QcW&UFen91ebvM|;2G>SI!@TkCbgZL}>BN#WIQCq^u
zjTC&7w+o?Y@)3?;oD5X7n1hdz6CS3MBgN#QMsKbY%VT292RT9rGl(bulaxbt!xSl~
zos9023pGR}4b2RZeQs!MYzFl&$b}Yi5X%|ULB?}|A_E#rZi-08N^EXYtU~cxi7MQy
zo9AgvLz0tVw3y7#5xIGdP6Q)k%;bZdiy5;)hV!Au`Q%;tFbg){)5m7O8)Jk4n+w&M
z7`c&>%;aBYFzu5;9+_Yc3u>gaF?qffN>H0vBl}hlDainH6axbjJ1~<Nn_1uquN!t?
NYnC$#B9azVCjb{uC{h3b

delta 1116
zcmZuvJ#5oJ7=3Q41`>&cR8$a>%8`oHp`!jd|1?5HvGE}!hO%|S1rnr6EvcNAp-T{D
zfeCRNBVu6a=8dTX141BmMhGz>MrMQrc9Od|c5bl!eZKF#yZ7FUBkA{%^s?4hY{j%x
zSytqDC7-fP3~kVr<*fpM^FZ!1kpBi0p8%yAP&ok>+CcRTP(KD58^F>pVEGxaA_J=*
z0DTLvW`X8AVEwl5_x2C&`@7xt!A{5Tu`lN?^!;|Q{kRkOifcHU*P`e>=-k}f?rwC0
zeRrpGFW?QnQEgeeLNz7RcO0_jm`1v<nTkP)LNa|vvlX{W^vn-RsYY#wSyHpiS;-C0
zG;G&ped+QhZ?3t-rCt`grKuhvu9HUgs2ZJwW{yZ5*ET$hgg>OO(%jIM@FZ85<=?0I
zM>EncyI%M=&$)$O0J~GHk9M+hDF}ZSmvX#5%?IJr(x${-pM9G`5JE->&np5Uo>-hu
zPMDli<q~7KX7Z8Cs%ngaGI*)FZVqq2Vx;#Af2ARBg`)^Vz&>7DOdj-Zbt<hka4Irt
zg4T?JJ6<W;KlLQin0jO_@Twu0%cYCqwZ@^4ESB)<m9d0z{b_kz$JcteG8LbvBvN#5
zH9-)BbIK&Z8+|H(NEFzyDF9+d$4U-}7>KAvl((7_CVp=wCxnS2gh@4Z(;jOn%PBPv
O*ON#!ZX}Ow(wG0DYBje2

diff --git a/lib/libsceI2c_driver.a b/lib/libsceI2c_driver.a
index cae443d245905b595273bfb69cedb1b97a77f4c8..5777b48658f009c365a4f96af293a71ba7c47b86 100644
GIT binary patch
delta 804
zcmexocg1dkjE|X_shO#{f`Wkp2q2RR3PuJdU{M8y1TF>!1`Y-W#y<=UY(ScG1p@=G
z4+De13kC*}1_lNR1qKG`EtAi&%1oZe$yOhnS`v_-lara3?wg;I%21q~>S>hhn^;_u
zS`<>0m{**eSrU|*oSIpNDu*ftG{iY4KRFw#cBo)bYH?}_lnqqxlA2VS?vcoumy(lO
zRLr2SKiQB`b+Q8^=j1TP3v3XtZq{L9V}Y?P*z%YdGbiuo5TCq{<C!m-yMcZN0VZ|^
z27MD)P(VV&(Ad}v7IcON2EcHGlV%{L7Uo8qKXPtlWK5XM%(0lU0A@uX_E3OZV`c^o
zaU!iTGub?m7idic*qRKOHJ%V_U;zp@-ok=J;|(?&3IdG}0UMtTGhPQCHz1QC0c2<h
zNjy*s5COD#hX_g_qlN(30Js^(M#%0%n1K|$kf4SHvZ>kTLJ6Sr0>I8ofH_YCk}MET
aGewC!gt41{Narw1ArcNW-GJQ$igf_%CdX(1

delta 593
zcmca&_s?#EjE{kZftk6Xf`Wkp2q2RR3Pwg|U{M8y1TF>!1`Y-WCLsm}HaP|c&V39F
zym1T+0{<8oMCLItNZ2tjNZ*^hK|rZKKBXwLEVU@!#K6eF#o64Ip*T6!(<m7(Z0_XZ
z>gec*E^O&!Xlm(#uG-89Xo8`u37TpPXD1g6XJ<DwVHaalHyLL`a~E`RCs#uwXIB@7
z&HRjvjBF4uPd+CtwpoYi12ckOw0R2KAI8Zxa{mP2&V~A7@;pvCWQ8VN5sZ`HurC2A
zHi0XK`3)FYz_4OxV9+;%g&-s#4ULV>;MNyyzQKzyMG$TZEGQ=57m!7^vqTV~8ty<?
z2u&^%L2)3DD4I`TVK!Mz0!85(352O|H-JJC9FUV&OT*l-`J8kPvlPsgF0e3#`xO9R
Cm#N+W

diff --git a/lib/libsceLcdc_driver.a b/lib/libsceLcdc_driver.a
index d382c033c0b730b0dc27a8d33222129fab31c735..812d2af6e7b76ab50b945709f2da101f1bff36f3 100644
GIT binary patch
delta 335
zcmbQWm~qx(#tAZPW@e^lrWPBO*04aClP?I1ZGOe_g&Dyw+8oBIgTnvCgUX*L0OxPM
zAUqF6?K5$>9MJ5d&0W%{d_8$Me{+Hos@^g+xExrolol#~pDvug`GWzfUN%#>99Zuv
j3sk<J4V=HZ!5&rbG-tRRSg(~kD*v7roWEJXuZtM~s+MCa

delta 335
zcmbQWm~qx(#tAZP1{MZp=0+Qp*04aClP?I1ZGOe_g&Dyw+8oBIgTnvCgUX*L0OxPM
zAUqF6?K5$>9MJ5d&0W%{d_8$Me{+Hos@^g+xExrolol#~pDvug`GWzfUN%#>99Zuv
j3sk<J4V=HZ!5&rbG-tRRSg(~kD*v7roWEJXuZtM~?;>Ih

diff --git a/lib/libsceNand_driver.a b/lib/libsceNand_driver.a
index 35d2b818a9be7af021047fa1ab2681054ceafac0..cfa867430bca0cdd1692a123dd3864aca5673d30 100644
GIT binary patch
delta 599
zcmbQSm}$mhrU^1^W@e^lrWPBOy4a!2$#MK*n@_NRVMg$aHk<IM!1$Zv_@}|xK($4i
zbA;h?U_OU9g1=6qX!8;&4Y>MwNkyAo<aFSCko*fpguI@4(dG_S1(^KibsDqaY(Jev
zFgDnp3<HEcAa}5s!1<f?%qPLsg6y!cM%V#Td&3T{b~4CKB~A!8f%p<`2tG*t9#4dN
z5I@2fmH#CG&fhE-g0LH8mPQ1^EI*y1&1a$w;BEt%RT7WTJ1=P-Tn^;!EolgMgUkxa
zLYM{O|Hwt~LF(reBGiM-wkd_14Gyy#6$m~^e@P8OKS;eq1416e-_i`{Z@$-ta2qI|
QzI4IkX)=i4)5pUM00zdZ)&Kwi

delta 599
zcmbQSm}$mhrU^1^1{MZp=0+Qpy4a!2$#MK*n@_NRVMg$aHk<IM!1$Zv_@}|xK($4i
zbA;h?U_OU9g1=6qX!8;&4Y>MwNkyAo<aFSCko*fpguI@4(dG_S1(^KibsDqaY(Jev
zFgDnp3<HEcAa}5s!1<f?%qPLsg6y!cM%V#Td&3T{b~4CKB~A!8f%p<`2tG*t9#4dN
z5I@2fmH#CG&fhE-g0LH8mPQ1^EI*y1&1a$w;BEt%RT7WTJ1=P-Tn^;!EolgMgUkxa
zLYM{O|Hwt~LF(reBGiM-wkd_14Gyy#6$m~^e@P8OKS;eq1416e-_i`{Z@$-ta2qI|
QzI4IkX)=i4)5pUM0Il1p+W-In

diff --git a/lib/libscePwm_driver.a b/lib/libscePwm_driver.a
index a2661716e8655c2623cdfa67378adb4c19fd3012..4dc775264882f6f0cc609b19f70aa78aed691eca 100644
GIT binary patch
delta 101
zcmZ2uzQ%ll44avmshO$yMx{%PQ0C@ejBG40HXGY4W*B=JCxY$9i(o$!K(O0H5NtJx
GHf8{9x*EX%

delta 101
zcmZ2uzQ%ll44Z+4ftk7CMx{%PQ0C@ejBG40HXGY4W*B=JCxY$9i(o$!K(O0H5NtJx
GHf8`=FB(|@

diff --git a/lib/libsceSysreg_driver.a b/lib/libsceSysreg_driver.a
index 4abebff5528d35bb9191b8487f65035c173958df..f436b4c021a3d1456d8067f0ae417e308e26f9ae 100644
GIT binary patch
delta 2890
zcmZuzVQ5rG5avCbl7?DZxb_YjBG?dZP1Q>7Lf{k&2MuT{)DTh|1A!D0NLB6xgFWAm
zpd~HIHRTR2wAZw#*kF?bvkh}X4E_k1qODM^1R)2)2?-5HsHF`UuHD(~?(9DN_h#ms
zZ@!t?x9?4@)=aI|jMY9LiG(BJ=4;z$8suX*T@1g*)*CjrXxodk-d#JDoh?qd30Add
zmvZogIGfzJSJ|u>zNntl-cX!vv@~iPvAO*kE8?+t&3KTF#=f-hnO4GMe)O<ymyVE)
z^+t|rJ~rQBYgsy`W1@DlTiYz(V`CRT)-loJK)+ol@Cn7SZs8Q!sI%*|jel;?j!%B7
z<E-d?t$JqO(1dyxbu*u79Jhn%(bz{U`bCq%WQz`8$m-}G<zRJRQ6oHoEoW$;D6}+A
zLeL)0k*x|eey<A%5lfe}2=>wsw!r!ybu3$XlZ*K!uf=G^r)M-F%g+)43Rt*q3W&45
z8=8<!+%%ivQ(mB0`4&wrb=$-RS=(J|8n@AYPv>b(n-8=m^s%;wl!Ln3i=+$fjYqbf
zd#r8t>k9RR^-6104|7M>2|NG9#@_#ju$Y^CYTNbylFhl`j_YVLs8l%?8w6?`4bPSf
zP6BRhb#|!Jp_+%TR~+gdS*u?qR*jkp87Qs|I%|m?QrjGwI&w_D@eGc`I}8p)ZM^ji
zRBpF{!b+|CbfpM*VO=SLZ!V0tXb$O!?k5MFIH-pb;l0G+e2mCMeq*Zv?>^*XA3Q=)
zkzae%m%q?Ki0s61KIQ&njym=c;2t#@DWK3p1W@kvMXURb=z#%WwDXh^O(l$|nE4q}
zk}i57`17pe{l9Kmd&M*I>xPVce(GWQf}@VToMh>9laLQ@c+|+BA2af?{!+#VPmU8@
z46i<CIm8tPcfQm6mMRA?5eo8Gs7jU_3HbS{G2Y6wZ@+;VN*4Q_n<Z7i-vV`0L?AV1
z<YEJtZxU4Gwk{YBJUwf-40d#6ZW|8dh~A|XIPn{a$2SSyeqfBa=*6Mwp`*U25pjXT
z@5|Jl7+Ug?uSET0Dj^VyD};c`AHJ>v>ppnli2*PFZAiohs-GHgbWByq0sI?7#~Gs=
zRj#^%<o0qexa!uCj@VYifhlV*Qwr1tTy<;7L)R3ds93_%>pn+v8#y4q-4KKuS!|$k
zz`sJa+|X{y#f{)c6z1M>)eR^$^o1={9A0c8QZe$MqLxGQbR9H!P)l`;P;lTqU#IPd
ztSUkH_I;OLK+M1V0p+Ljvk7SHaMk}7zY0Ip%{7ZjjUU&9%|d0gN9RjNsn_Qi=`$R-
zoTdSbBM9eCYEiPv`Gkdt!_G6r0o`X^^@cS=<(#1qk9%myRmWWlDqJvf%flv|zb?}w
zR9pOS!t9tHfK=0&vDC;#Y-aT$WSPltj57SkRUJ7Q{p%t{#oTgNe2&;v!y(S_G?j(A
IYi?@Ge+}x1I{*Lx

delta 2890
zcmZuzZ)j6j6z4tH(Umzi$d<rL1y`z@ohH(n6{0u@te~AROX-{z3LUi2IY|VIi|<3x
z(Tz6iNFZg)x}oBNYXkOLP6oC3p`b%IVSl6u4G0xlRzjI$D_FAKd*6HaoO|(G&N;vH
zJHPYiy_c!gx~bK=@%m@OZ-w_oBiFXiG|8X)+A`(VSJ-;f<`!i;3D&o3r*G%VlXjBT
z?AhfzctU~|_J)0%m0K_RzcbEof^D=lD_dam`xREk<8RY=kd4K^(D2!I#EbmcVclLn
zg0`qPdQ|bT`7T|{;xQGIwNpLHX2o6|d;3EblRXX&=yd`gVO-QLokCmaJbqfoKQpAq
z3!kVsD?4BLJu_!`(*G^%W<OOpZU-}C@ef$+^A;bID_eXat7Ch72W$8e8{r9TDT@OY
zLYF5{h_FZUX!`}4zf%RIh{a1v1bg9oU0~x6DweCh&c*y(RAQ9k(=&>Y6=#t^2w3=$
z3P`a28;X!k-lWa&DKB8Gato)HzC&?A)^QJ;7Tf6jP30*~oA;F_;bR>SFh}U>ETb-A
zZ#>lP{3B(vUsk-HqG36(<u$J!w?*#gx`&O1+5BT2`}@C$6<SkIbi46Cv^f{twJk*k
z)f!7<gFv07;JHf4O2Un;)(-bNq&Rs(aQr39>)urewJ#&9KO&e45fs-3-Sx;0>1~!b
zb&sR)+EX|V?;spP|Hd0nLFIQ7l&I9cmsE0EjY<=3ghP<V_M-z%9yEq>K8|E!AJE)R
z;5~;7_Msyf73+lhqelKh7b0?#C-{^Hj#=K>N5jB9I2l1u>O}&m^cm6G0TMkhXhgeD
zk!U(eqN0<+8B~%fJ0bY%tmTk(Ct$@P`3=J)pI<#JU9h~f_m;T)871V}N5)A0{5Z)M
z^%t`SJT-xEIlRWa=5X)t?zhIihb|!sidV2ojvGn%=_(m-b=uf(U<Q-re&=RU74WCP
zdsFb$q~}PkXyEcqgv#9Z1>z9PTf0Trg(G{1I0Q%R9;U#_Us1exlHkqzWW;4B0WA+K
z?~57@%NIEOv4ri(p`{)gB^n=L35mG9f(WSoX>=7>H{hkm1YY@vNE8j!J|S@7n5v=!
z_%{a6SwuH#Z1oC~V)D<~>a8Ok@vX!mQr2F?6le(8{#z>|XWkN0QP;8fs^Lg&LkASM
zD?t%=7)`2N1o&6Tm+O*+c4IDwyB9bYvHdroi|TLHPziXx4M}B{>oLvYy-5!e9&sJD
zaYVs^cZ^Ou4{23`@Xfon{{XtZTz(JpGsW2?badI?|E*{QocE39CQfLC{1|&lz7VwB
zXE;Xti9;->Wl-Y?!nu!$D1kVi)DQ{Sc?LP4=dA5NVSN1Oh(dAhp<&xUcelgR1(I7C
zp>Y1VOpju1`F|5;$8iAiT)MNG8g~(!Ib#upuSpsH#}!XbOy%#37?s=2Uojl<tHdF1
NcpA$>!!<j-<$t&Hf+PR{

diff --git a/src/audio/audio.c b/src/audio/audio.c
index 1efa089..53dcbeb 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -855,7 +855,7 @@ int sceAudioInit()
 {
     //dbg_init(1, FB_AFTER_DISPLAY, FAT_AFTER_FATMS);
     //dbg_init(1, FB_NONE, FAT_AFTER_FATMS);
-    dbg_init(1, FB_NONE, FAT_HARDWARE);
+    dbg_init(1, FB_NONE, FAT_AFTER_FATMS);
     dbg_printf("Running %s\n", __FUNCTION__);
     memset(&g_audio, 0, sizeof(g_audio));
     // 1558
diff --git a/src/codec/Makefile b/src/codec/Makefile
index b84f5f3..0d7f765 100644
--- a/src/codec/Makefile
+++ b/src/codec/Makefile
@@ -4,5 +4,7 @@
 TARGET = codec
 OBJS = codec.o
 
+LIBS = -lThreadManForKernel -lsceSysEventForKernel -lsceI2c_driver -lsceSysreg_driver -lsceGpio_driver
+
 include ../../lib/build.mak
 
diff --git a/src/codec/codec.c b/src/codec/codec.c
index fbcc0ce..510cf3c 100644
--- a/src/codec/codec.c
+++ b/src/codec/codec.c
@@ -1,6 +1,11 @@
 #include "common.h"
 
+#include "codec.h"
+#include "lowio_gpio.h"
+#include "lowio_i2c.h"
+#include "lowio_sysreg.h"
 #include "sysmem_sysevent.h"
+#include "threadman_kernel.h"
 
 typedef struct
 {
@@ -66,6 +71,8 @@ SceSysEventHandler g_sysEv = {
 };
 
 PSP_MODULE_INFO("sceWM8750_Driver", PSP_MODULE_NO_STOP | PSP_MODULE_SINGLE_LOAD | PSP_MODULE_SINGLE_START | PSP_MODULE_KERNEL, 1, 7);
+PSP_MODULE_BOOTSTART("sceCodecInitEntry");
+PSP_MODULE_REBOOT_BEFORE("sceCodecStopEntry");
 PSP_SDK_VERSION(0x06060010);
 
 int sub_0000(int reg, int set)
@@ -466,8 +473,10 @@ void sceCodec_driver_376399B6(int enable)
         sceSysregAudioClkoutClkEnable();
 }
 
-int module_start()
+int sceCodecInitEntry()
 {
+    for (;;)
+        ;
     sub_0110();
     sub_0150(1);
     g_codec.mutexId = sceKernelCreateMutex("SceCodec", 1, 0, 0);
@@ -496,7 +505,7 @@ int sceCodec_driver_FC355DE0()
     return 0;
 }
 
-int module_reboot_before()
+int sceCodecStopEntry()
 {
     sub_01FC(-1, -1, -1, -1);
     sceKernelUnregisterSysEventHandler(&g_sysEv);
diff --git a/src/codec/exports.exp b/src/codec/exports.exp
index e2b148f..3ebc0a8 100644
--- a/src/codec/exports.exp
+++ b/src/codec/exports.exp
@@ -5,7 +5,7 @@ PSP_EXPORT_START(syslib, 0x0000, 0x8000)
 PSP_EXPORT_FUNC_HASH(module_start)
 PSP_EXPORT_FUNC_HASH(module_reboot_before)
 PSP_EXPORT_VAR_HASH(module_info)
-PSP_EXPORT_VAR_NID(syslib_11B97506, 0x11B97506)
+PSP_EXPORT_VAR_HASH(module_sdk_version)
 PSP_EXPORT_END
 
 PSP_EXPORT_START(sceCodec_driver, 0x0011, 0x0001)
@@ -22,7 +22,7 @@ PSP_EXPORT_FUNC_HASH(sceCodecInitEntry)
 PSP_EXPORT_FUNC_NID(sceCodecSetVolumeOffset, 0xD27707A8)
 PSP_EXPORT_FUNC_NID(sceCodecSelectVolumeTable, 0xE4456BC3)
 PSP_EXPORT_FUNC_NID(sceCodec_driver_E61A4623, 0xE61A4623)
-PSP_EXPORT_FUNC_NID(sceCodec_driver_EACF7284, 0xEACF7284)
+PSP_EXPORT_FUNC_NID(sceCodecSetSpeakerVolume, 0xEACF7284)
 PSP_EXPORT_FUNC_NID(sceCodec_driver_FC355DE0, 0xFC355DE0)
 PSP_EXPORT_FUNC_NID(sceCodec_driver_FCA6D35B, 0xFCA6D35B)
 PSP_EXPORT_END
diff --git a/src/ctrl/ctrl.c b/src/ctrl/ctrl.c
index d15b3d5..a083a01 100644
--- a/src/ctrl/ctrl.c
+++ b/src/ctrl/ctrl.c
@@ -1214,17 +1214,17 @@ static int _sceCtrlVblankIntr(int subIntNm __attribute__((unused)), void *arg __
     int suspendFlag;
     int retVal;
     
-    dbg_printf("In function: %s\n", __FUNCTION__);
+    //dbg_printf("In function: %s\n", __FUNCTION__);
     
     suspendFlag = sceKernelCpuSuspendIntr(); //0x00000454
     
     if (ctrl.btnCycle == 0) { //0x00000464
-        dbg_printf("sysconHwDataTransferBusy VALUE: %d in function: %s\n", ctrl.sysconHwDataTransferBusy, __FUNCTION__);
+        //dbg_printf("sysconHwDataTransferBusy VALUE: %d in function: %s\n", ctrl.sysconHwDataTransferBusy, __FUNCTION__);
         if (ctrl.sysconHwDataTransferBusy == FALSE) { //0x00000470
             if (ctrl.pollMode != PSP_CTRL_POLL_NO_POLLING) { //0x0000047C
                 ctrl.sysconHwDataTransferBusy = TRUE; //0x000004E0
 
-                dbg_printf("receiving SYSCON data: %s\n", __FUNCTION__);
+                //dbg_printf("receiving SYSCON data: %s\n", __FUNCTION__);
                 if ((ctrl.samplingMode[USER_MODE] | ctrl.samplingMode[KERNEL_MODE]) == PSP_CTRL_INPUT_DIGITAL_ONLY) { //0x000004E4
                     ctrl.sysPacket[0].tx_cmd = SYSCON_CTRL_TRANSFER_DATA_DIGITAL_ONLY; //0x000004E8
                 }
@@ -1233,35 +1233,35 @@ static int _sceCtrlVblankIntr(int subIntNm __attribute__((unused)), void *arg __
                 }
                 ctrl.sysPacket[0].tx_len = 2; //0x00000514
 
-                dbg_printf("calling sceSysconCmdExecAsync: %s\n", __FUNCTION__);
+                //dbg_printf("calling sceSysconCmdExecAsync: %s\n", __FUNCTION__);
                 retVal = sceSysconCmdExecAsync(&ctrl.sysPacket[0], 1, _sceCtrlSysconCmdIntr1, 0); //0x00000510
-                dbg_printf("called sceSysconCmdExecAsync returns: 0x%08X in function: %s\n", retVal, __FUNCTION__);
+                //dbg_printf("called sceSysconCmdExecAsync returns: 0x%08X in function: %s\n", retVal, __FUNCTION__);
                 if (retVal < 0) { //0x00000518
                     ctrl.sysconHwDataTransferBusy = FALSE; //0x0000051C
                 }
             }
             else {
-                dbg_printf("set alarm handler_1: %s\n", __FUNCTION__);
+                //dbg_printf("set alarm handler_1: %s\n", __FUNCTION__);
                 
                 //register an alarm occurring every 700 micro seconds
                 sceKernelSetAlarm(700, _sceCtrlDummyAlarm, NULL); //0x00000490
             }
         }
         else {
-            dbg_printf("set alarm handler_2: %s\n", __FUNCTION__);
+            //dbg_printf("set alarm handler_2: %s\n", __FUNCTION__);
             sceKernelSetAlarm(700, _sceCtrlDummyAlarm, NULL); //0x00000490
         }
     }
     if (ctrl.unk_Byte_2 != 0) { //0x000004A0
-        dbg_printf("calling sceKernelPowerTick: %s\n", __FUNCTION__);
+        //dbg_printf("calling sceKernelPowerTick: %s\n", __FUNCTION__);
         ctrl.unk_Byte_2 = 0; //0x000004A4
         sceKernelPowerTick(SCE_KERNEL_POWER_TICK_DEFAULT); //0x000004CC
     }
 
-    dbg_printf("resuming all interrupts: %s\n", __FUNCTION__);
+    //dbg_printf("resuming all interrupts: %s\n", __FUNCTION__);
     sceKernelCpuResumeIntr(suspendFlag); //0x000004A8
     
-    dbg_printf("returning from %s.\n", __FUNCTION__);
+    //dbg_printf("returning from %s.\n", __FUNCTION__);
     return -1;
 }
 
@@ -1964,6 +1964,7 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
         return SCE_ERROR_NOT_SUPPORTED;
     }
     oldK1 = pspShiftK1();
+    dbg_printf("%d\n", __LINE__);
 
     if (!pspK1PtrOk(pad)) { //0x00001EF0 -- protect kernel address from user mode
         pspSetK1(oldK1);
@@ -1980,9 +1981,12 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
             return SCE_ERROR_NOT_SUPPORTED;
         }
     }
+    dbg_printf("%d\n", __LINE__);
     //waiting for the VSYNC callback when using the "read" functions.
     if (mode & 2) { //0x00001F10 && 0x00001F28
+        dbg_printf("%d\n", __LINE__);
         res = sceKernelWaitEventFlag(ctrl.eventFlag, 1, SCE_EVENT_WAITOR, NULL, NULL); //0x00001F44
+        dbg_printf("%d\n", __LINE__);
         if (res < 0) { //0x00001F4C
             pspSetK1(oldK1); //0x00001F50
             return res;
@@ -1992,30 +1996,37 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
         
         /* Clear the event flag to wait for the VBlank interrupt the next call. */
         sceKernelClearEventFlag(ctrl.eventFlag, 0xFFFFFFFE); //0x00001F64
+        dbg_printf("%d\n", __LINE__);
 
         startBufIndex = intDataPtr->ctrlBufStartIndex; //0x00001F70
         readIntBufs = intDataPtr->ctrlBufIndex - startBufIndex; //0x00001F74
         if (readIntBufs < 0) { //0x00001F7C
             readIntBufs += 64; //0x00001F78 & 0x00001F80
         }
+        dbg_printf("%d\n", __LINE__);
         intDataPtr->ctrlBufStartIndex = intDataPtr->ctrlBufIndex; //0x00001F8C
         if (reqBufReads < readIntBufs) { //0x00001F88
+            dbg_printf("%d\n", __LINE__);
             startBufIndex = intDataPtr->ctrlBufIndex - reqBufReads; //0x00001F90
             startBufIndex = (startBufIndex < 0) ? startBufIndex + CTRL_INTERNAL_CONTROLLER_BUFFERS : startBufIndex; //0x00001F98 & 0x00001F9C
             readIntBufs = reqBufReads;
         }
     }
     else {
+        dbg_printf("%d\n", __LINE__);
         suspendFlag = sceKernelCpuSuspendIntr(); //0x0000216C
         bufIndex = intDataPtr->ctrlBufIndex; //0x00002174
 
         startBufIndex = bufIndex; //0x00002184
+        dbg_printf("%d\n", __LINE__);
         if (reqBufReads < 64) { //0x00002178
+            dbg_printf("%d\n", __LINE__);
             startBufIndex = bufIndex - reqBufReads; //0x0000218C
             startBufIndex = (startBufIndex < 0) ? startBufIndex + CTRL_INTERNAL_CONTROLLER_BUFFERS : startBufIndex; //0x00001F98 & 0x00001F9C
             readIntBufs = reqBufReads; //0x00001FA0
         }
     }
+    dbg_printf("%d\n", __LINE__);
     if (arg3 != 0) { //0x00001FA4
         ctrlBuf = (SceCtrlDataExt *)intDataPtr->sceCtrlBuf[arg3] + startBufIndex; //0x00002160
     }
@@ -2027,6 +2038,7 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
         pspSetK1(oldK1); //0x000020B0
         return readIntBufs;
     }
+    dbg_printf("%d\n", __LINE__);
     /* read internal data buffers. */
     while (reqBufReads-- > 0) { //0x0000209C & 0x000020A0
            pad->activeTime = ctrlBuf->activeTime; //0x00001FE4 & 0x00001FF0
@@ -2099,6 +2111,7 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
                }
            }
     }
+    dbg_printf("%d\n", __LINE__);
 
     sceKernelCpuResumeIntr(suspendFlag); //0x000020A8
     pspSetK1(oldK1); //0x000020B0
@@ -2110,11 +2123,11 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
  * Exported in syslib
  */
 int CtrlInit(void) {
-    dbg_init(1, FB_NONE, FAT_AFTER_SYSCON);
+    dbg_init(1, FB_AFTER_DISPLAY, FAT_NONE);
     
     dbg_printf("Ctrl_Start: %s\n", __FUNCTION__);
     
-    sceCtrlInit();
+    //sceCtrlInit();
     return SCE_ERROR_OK;
 }
 
diff --git a/src/ctrl/ctrl_custom_VB_handler.c b/src/ctrl/ctrl_custom_VB_handler.c
index 4c88781..bf0939b 100644
--- a/src/ctrl/ctrl_custom_VB_handler.c
+++ b/src/ctrl/ctrl_custom_VB_handler.c
@@ -2121,7 +2121,7 @@ static int _sceCtrlReadBuf(SceCtrlDataExt *pad, u8 reqBufReads, int arg3, u8 mod
  * Exported in syslib
  */
 int CtrlInit(void) {
-    dbg_init(1, FB_NONE, FAT_AFTER_SYSCON);
+    dbg_init(1, FB_AFTER_DISPLAY, FAT_NONE);
     
     dbg_printf("Ctrl_Start: %s\n", __FUNCTION__);
     
diff --git a/src/iofilemgr/iofilemgr.c b/src/iofilemgr/iofilemgr.c
index 2e4330e..1bc9fba 100644
--- a/src/iofilemgr/iofilemgr.c
+++ b/src/iofilemgr/iofilemgr.c
@@ -727,6 +727,19 @@ int sceIoDevctl(const char *dev, unsigned int cmd, void *indata, int inlen, void
 
 int sceIoAssign(const char *dev, const char *blockDev, const char *fs, int mode, void* unk1, int unk2)
 {
+    int oldIntr;
+    asm("mfic %0, $0" : "=r" (oldIntr));
+    asm("mtic $zero, $0");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
+    asm("nop");
     dbg_printf("Calling %s\n", __FUNCTION__);
     dbg_printf("Calling %s\n", __FUNCTION__);
     dbg_printf("Calling %s\n", __FUNCTION__);
@@ -739,6 +752,7 @@ int sceIoAssign(const char *dev, const char *blockDev, const char *fs, int mode,
     dbg_printf("Calling %s\n", __FUNCTION__);
     dbg_printf("Calling %s\n", __FUNCTION__);
     dbg_printf("Calling %s\n", __FUNCTION__);
+    asm("mtic %0, $0" : : "r" (oldIntr));
     return 0;
     char outDev[32];
     char blkAliasName[32];