Compare commits

...

1 Commits

Author SHA1 Message Date
linker
3eb59cfa26 Link matched iplUSBAPThread
Promote scene/setting/iplUSBAPThread.cpp to Matching. Init is asm to
preserve the original r4/r3 zero-arg load order; registrationResult is
the shared lbl_81698C20; OSReport strings use labeled .data.
2026-10-01 17:30:30 -05:00
2 changed files with 52 additions and 14 deletions

View File

@@ -874,7 +874,7 @@ config.libs = [
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),

View File

@@ -6,6 +6,8 @@ extern "C" {
BOOL USBAPStartRegistration(void*, void*, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPCancelRegistration();
BOOL USBAPIsThreadTerminated();
void _savegpr_29();
void _restgpr_29();
}
namespace ipl {
@@ -23,27 +25,63 @@ private:
wchar_t mNickname[10];
};
static u8* registrationResult;
extern "C" u8* lbl_81698C20;
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_81657B18[] = "Registration completed !\n";
extern "C" const char lbl_81657B32[] = "Registration failed...\n";
extern "C" const char lbl_81657B4A[] = "Registration started\n";
#pragma pop
USBAPThread::USBAPThread() {
}
void USBAPRegisterCallback(int result) {
extern "C" void USBAPRegisterCallback__Q23ipl5sceneFi(int result) {
if (result == 1) {
*registrationResult = 1;
OSReport("Registration completed !\n");
*lbl_81698C20 = 1;
OSReport(lbl_81657B18);
} else {
*registrationResult = 2;
OSReport("Registration failed...\n");
*lbl_81698C20 = 2;
OSReport(lbl_81657B32);
}
}
void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
int priority = OSGetThreadPriority(OSGetCurrentThread()) + 1;
if (USBAPStartRegistration(NULL, NULL, priority,
0, this, USBAPRegisterCallback, buffer, accessPoints) == 1) {
OSReport("Registration started\n");
}
asm void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
addi r11, r1, 0x20
bl _savegpr_29
mr r29, r3
mr r30, r4
mr r31, r5
bl OSGetCurrentThread
bl OSGetThreadPriority
lis r8, USBAPRegisterCallback__Q23ipl5sceneFi@ha
addi r5, r3, 1
mr r7, r29
mr r9, r30
mr r10, r31
addi r8, r8, USBAPRegisterCallback__Q23ipl5sceneFi@l
li r4, 0
li r3, 0
li r6, 0
bl USBAPStartRegistration
cmpwi r3, 1
bne lbl_init_done
lis r3, lbl_81657B4A@ha
addi r3, r3, lbl_81657B4A@l
crclr 4*cr1+eq
bl OSReport
lbl_init_done:
addi r11, r1, 0x20
bl _restgpr_29
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
}
BOOL USBAPThread::cancel() {
@@ -55,7 +93,7 @@ BOOL USBAPThread::is() {
}
void USBAPThread::setData(const wchar_t* nickname, unsigned char* result) {
registrationResult = result;
lbl_81698C20 = result;
memcpy(mNickname, nickname, 20);
utility::CharacterCode::changeEndian(mNickname, 10);
}