Compare commits

...

1 Commits

Author SHA1 Message Date
coah
b16f07287c cleanup(AOSSLink): name sleep/IP helpers and NCD config BSS
- AOSS_813FD17C → AOSSi_SleepAlarmHandler
- AOSS_813FD18C → AOSSi_SleepMs
- AOSS_813FD25C → AOSSi_StoreIpv4Octets
- AOSS_810BD4A8 → AOSSi_NcdIfConfig
- AOSS_810BD608 → AOSSi_NcdIpConfig

DOL sha1 unchanged.
2026-10-01 18:44:34 -05:00
2 changed files with 25 additions and 25 deletions

View File

@@ -81,8 +81,8 @@ usbapStack = .bss:0x810BC460; // type:object size:0x1000
usbapMessageQ = .bss:0x810BD460; // type:object size:0x20
usbapNickname = .bss:0x810BD480; // type:object size:0x18
m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
AOSS_810BD4A8 = .bss:0x810BD4A8; // type:object size:0x160 data:byte
AOSS_810BD608 = .bss:0x810BD608; // type:object size:0x7C8 data:4byte
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x160 data:byte
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C8 data:4byte
RakuRakuThread_810BDDD0 = .bss:0x810BDDD0; // type:object size:0x10
RakuRakuThread_810BDDE0 = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
RakuRakuThread_810BDED4 = .bss:0x810BDED4; // type:object size:0x24
@@ -5133,11 +5133,11 @@ cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x5
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
printInfo__Q33ipl5scene10AOSSThreadFv = .text:0x813FD16C; // type:function size:0x4
AOSSi_Cancel = .text:0x813FD170; // type:function size:0xC
AOSS_813FD17C = .text:0x813FD17C; // type:function size:0x10
AOSS_813FD18C = .text:0x813FD18C; // type:function size:0x88
AOSSi_SleepAlarmHandler = .text:0x813FD17C; // type:function size:0x10
AOSSi_SleepMs = .text:0x813FD18C; // type:function size:0x88
AOSSi_Alloc = .text:0x813FD214; // type:function size:0x24
AOSSi_Free = .text:0x813FD238; // type:function size:0x24
AOSS_813FD25C = .text:0x813FD25C; // type:function size:0x2C
AOSSi_StoreIpv4Octets = .text:0x813FD25C; // type:function size:0x2C
AOSSi_SetNCDIPAddr = .text:0x813FD288; // type:function size:0x7C
AOSSi_InitLocal = .text:0x813FD304; // type:function size:0x68
AOSSi_EndLocal = .text:0x813FD36C; // type:function size:0x34

View File

@@ -12,8 +12,8 @@ static u8 secondaryDns[4];
static void* (*allocateMemory)(u32, s32);
static void (*releaseMemory)(u32, void*, s32);
static void (*statusCallback)(void);
static NCDIfConfig AOSS_810BD4A8;
static NCDIpConfig AOSS_810BD608;
static NCDIfConfig AOSSi_NcdIfConfig;
static NCDIpConfig AOSSi_NcdIpConfig;
struct AOSSRate {
u16 mask;
@@ -60,11 +60,11 @@ void AOSSi_Cancel(void) {
AOSSi_cancel_flag = 1;
}
void AOSS_813FD17C(OSAlarm* alarm, OSContext* context) {
void AOSSi_SleepAlarmHandler(OSAlarm* alarm, OSContext* context) {
OSSendMessage((OSMessageQueue*)alarm->tag, NULL, 0);
}
void AOSS_813FD18C(u32 milliseconds) {
void AOSSi_SleepMs(u32 milliseconds) {
OSMessage storage;
OSMessage message;
OSMessageQueue queue;
@@ -72,7 +72,7 @@ void AOSS_813FD18C(u32 milliseconds) {
OSInitMessageQueue(&queue, &storage, 1);
OSCreateAlarm(&alarm);
OSSetAlarmTag(&alarm, (u32)&queue);
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSS_813FD17C);
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSSi_SleepAlarmHandler);
OSReceiveMessage(&queue, &message, 1);
}
@@ -89,7 +89,7 @@ void AOSSi_Free(void* block) {
}
}
void AOSS_813FD25C(u8* destination, u32 address) {
void AOSSi_StoreIpv4Octets(u8* destination, u32 address) {
int index;
for (index = 0; index < 4; ++index) {
*destination++ = address >> ((3 - index) * 8);
@@ -97,11 +97,11 @@ void AOSS_813FD25C(u8* destination, u32 address) {
}
int AOSSi_SetNCDIPAddr(u32 address, u32 netmask, u32 gateway, u32 dns1, u32 dns2) {
AOSS_813FD25C(ipAddress, address);
AOSS_813FD25C(ipNetmask, netmask);
AOSS_813FD25C(ipGateway, gateway);
AOSS_813FD25C(primaryDns, dns1);
AOSS_813FD25C(secondaryDns, dns2);
AOSSi_StoreIpv4Octets(ipAddress, address);
AOSSi_StoreIpv4Octets(ipNetmask, netmask);
AOSSi_StoreIpv4Octets(ipGateway, gateway);
AOSSi_StoreIpv4Octets(primaryDns, dns1);
AOSSi_StoreIpv4Octets(secondaryDns, dns2);
return 0;
}
@@ -150,7 +150,7 @@ startup:
goto unlock;
}
++startupRetries;
AOSS_813FD18C(10);
AOSSi_SleepMs(10);
goto startup;
}
if (WD_GetInfo(&info) == 0) {
@@ -231,7 +231,7 @@ startup:
*output = list;
break;
}
AOSS_813FD18C(100);
AOSSi_SleepMs(100);
}
AOSSi_Free(buffer);
}
@@ -242,7 +242,7 @@ cleanup:
goto unlock;
}
++cleanupRetries;
AOSS_813FD18C(10);
AOSSi_SleepMs(10);
goto cleanup;
}
unlock:
@@ -252,7 +252,7 @@ unlock:
return -1;
}
++unlockRetries;
AOSS_813FD18C(10);
AOSSi_SleepMs(10);
goto unlock;
}
return result;
@@ -262,7 +262,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
int retries = 0;
int result = 0;
WD_Info info ATTRIBUTE_ALIGN(32);
NCDIfConfig* interfaceConfig = &AOSS_810BD4A8;
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
NCDIpConfig* ipConfig;
memset(interfaceConfig, 0, sizeof(*interfaceConfig));
interfaceConfig->selectedMedia = 1;
@@ -288,7 +288,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
ipConfig = &AOSS_810BD608;
ipConfig = &AOSSi_NcdIpConfig;
memset(ipConfig, 0, sizeof(*ipConfig));
ipConfig->adjust.maxTransferUnit = 1300;
ipConfig->adjust.tcpRetransTimeout = 100;
@@ -303,7 +303,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
if (NCDSetIpConfig(ipConfig) != 0) {
result = -1;
}
if (result == 0 && NCDSetIfConfig(&AOSS_810BD4A8) != 0) {
if (result == 0 && NCDSetIfConfig(&AOSSi_NcdIfConfig) != 0) {
result = -1;
}
if (result == 0) {
@@ -317,7 +317,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
break;
}
++retries;
AOSS_813FD18C(10);
AOSSi_SleepMs(10);
}
}
if (result == 0) {
@@ -335,7 +335,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
void AOSSi_Sleep(u32 milliseconds) {
AOSS_813FD18C(milliseconds);
AOSSi_SleepMs(milliseconds);
}
int AOSSi_Status(void) {