From f8b3efff9cade04fd9e8ebceca74645bc3b9d413 Mon Sep 17 00:00:00 2001
From: joel16 <joel16@iastate.edu>
Date: Mon, 18 Jan 2021 12:42:41 -0500
Subject: [PATCH] usbacc: Use known function names for sceUsbBus_driver_*

---
 lib/libsceUsbBus_driver.a | Bin 16106 -> 15910 bytes
 src/usbacc/usbacc.c       |  15 ++++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/libsceUsbBus_driver.a b/lib/libsceUsbBus_driver.a
index 33c436c9ed4e3658e195248bf6a4aab6aea27d04..e9936b20eca19a999212c68211686458fb0e3c24 100644
GIT binary patch
delta 1062
zcmah|L2DC17=1A%jY(`JN<lH{1RAK2wp(|*P3)-@Qre5Kp;)Dd?q<i@vP9fnJhk>0
zG$;dlGD3u2RR%nJ7W)(0g9i_S2%bcwxY_MYB1Lu%!^~rN-+S--=G)%k?z0<Ctv0LA
zX@n@Gw+44Y)LJz}3E9j5xC|sa!0-nkYXBp^fqWMjTLrHD1PX1SG!0CA0w#BWN(z`c
z1k^g9e*tbkWyR6*Mawqm;|6Wn&p$re4=)C7K7rSyYo2A<OAa;N`bzzdL=3vM?fKM|
zz*@`w7h0x%!#8~@Uj!AF%vO^+i;i<1lt?4*oAQA{J>PVFp1<%XkqT3}#jg(KhsL8b
zA+w4S#3OfI3sS4<8vCBT$2;luL}H!2zVs%s#onfx>@@SL@07jE7SAYIPV@M3ZYC*8
z?2dNDnN`v*e{n?-cm8>-n~ch<1BD|IqC7vi{{BCud%3b-g<=dvHFVG}1`akt2iw9y
zcAy=sQz9`$8b2;cEe{1rrq|=BgKVW-h~bFDoRp=Q9l?{c?0)0fkIC^ECXG+slxiLb
zmb91^_OcSk5NVm7l3E<WG7`?M95J@2#QNfUN}%R^z;aaCS2Z@^pi}qxzIInMoC-n1
imL2>6$6@XHSQ36TFLUV=oQ*%z7f3XkD&JUWC;tLGG%}h1

delta 953
zcmZ2h^Qv}&Opb-Axv{yWf`Wkp2q2RR3MQ5izJfvm7Xt%>00RT_F9rq<AqEEST?`ET
zNem3aKyk563=C3H3=DEi3=E2^7#LK87#K8w>U0({Fc^3-Fc^PgU@)J>z+mk(Igwp{
za;=achmo<XsiBL7+r(}8^-iV5@hL@_WvNB+mWIZz&W5Hg48_T*p~XqaGNy)(MkdbA
zm@-a=W+o<1uI89B&W5f=j;1CCSY(WVnoJ!{Kr$()7CD=`ni`u~m}1f7Y-;Z6Y>CBj
zu4bktCWg+2n0j1Y94#CTj0`5($!xyF_<)fO9NK1+FR+VkKF9or8NnByyxuB$vlB-I
z<K}w;8yLA@A;iEi*@IgSqRt$s52EfKw*gcyLadD+Q%p}7Q|y`;rdXX6&|W=>jf}dm
z7yw2$2r#iTFz6ean}QPulrS_iGywYpVYieVOg}81Alf1NjSOJP2y6lt{ks&Q{^o{9
zC(z>uRb<gU9;OOa$O(_#$?+QU5M>td@cE_zR|bpf$-lKRlugosSqqPLptW=Lq1GbI
zGctfG<Zy<jg2`6K3h1_8GKQ&wrHIMb%rI2tnL}0S!BPh_tRR79j3cnYj@i84s+<`B
Dqd5l&

diff --git a/src/usbacc/usbacc.c b/src/usbacc/usbacc.c
index 987be0e..73f6d67 100644
--- a/src/usbacc/usbacc.c
+++ b/src/usbacc/usbacc.c
@@ -6,6 +6,7 @@ SCE_MODULE_INFO("sceUSB_Acc_Driver", SCE_MODULE_KERNEL | SCE_MODULE_ATTR_EXCLUSI
 SCE_SDK_VERSION(SDK_VERSION);
 
 // Error codes are derived from -> https://github.com/xerpi/psp-uvc-usb-video-class/blob/master/include/usb.h
+#define SCE_ERROR_USB_INVALID_ARGUMENT        0x80243002
 #define SCE_ERROR_USB_DRIVER_NOT_FOUND        0x80243005
 #define SCE_ERROR_USB_BUS_DRIVER_NOT_STARTED  0x80243007
 
@@ -124,16 +125,16 @@ struct UsbdDeviceReq
 	void *link;
 };
 
-int sceUsbBus_driver_B1644BE7(struct UsbDriver *drv);     // sceUsbbdRegister
-int sceUsbBus_driver_C1E2A540(struct UsbDriver *drv);     // sceUsbbdUnregister
-int sceUsbBus_driver_23E51D8F(struct UsbdDeviceReq *req); // sceUsbbdReqSend
+int sceUsbbdRegister(struct UsbDriver *drv);    // sceUsbBus_driver_B1644BE7
+int sceUsbbdUnregister(struct UsbDriver *drv);  // sceUsbBus_driver_C1E2A540
+int sceUsbbdReqSend(struct UsbdDeviceReq *req); // sceUsbBus_driver_23E51D8F
 int sceUsbBus_driver_8A3EB5D2(void);
 
 // Globals
 struct UsbDriver g_drv;     // 0x00000CC4
 u8 unk0;                    // 0x00000D53
-u16 unk1;                   // 0x00000D60
-u8 unk2;                    // 0x00000D62
+u16 unk1;                   // 0x00000D50
+u8 unk2;                    // 0x00000D52
 struct UsbdDeviceReq g_req; // 0x00000CAC
 
 // Subroutine sceUsbAccGetAuthStat - Address 0x00000000 - Aliases: sceUsbAcc_79A1C743, sceUsbAcc_driver_79A1C743
@@ -199,7 +200,7 @@ s32 sceUsbAccUnregisterType(u16 type)
 s32 module_start(SceSize args __attribute__((unused)), void *argp __attribute__((unused)))
 {
     s32 ret = 0;
-    if ((ret = sceUsbBus_driver_B1644BE7(&g_drv)) >= 0) {
+    if ((ret = sceUsbbdRegister(&g_drv)) >= 0) {
         unk1 = 0;
         unk2 = 0;
     }
@@ -210,6 +211,6 @@ s32 module_start(SceSize args __attribute__((unused)), void *argp __attribute__(
 // Subroutine module_stop - Address 0x00000558 -- Done
 s32 module_stop(SceSize args __attribute__((unused)), void *argp __attribute__((unused)))
 {
-    int ret = sceUsbBus_driver_C1E2A540(&g_drv);
+    int ret = sceUsbbdUnregister(&g_drv);
     return (ret < 0)? 1 : 0;
 }