Compare commits

..

1 Commits

Author SHA1 Message Date
coah
027f8a48fa cleanup(usb_kbd): name USBKBDCmdLED device and ledBits
Rename unk_0x00/unk_0x04 to match USBKBDSetLED parameters.
2026-10-01 18:52:47 -05:00
23 changed files with 439 additions and 763 deletions

View File

@@ -27,7 +27,7 @@ BS2Allocator = .bss:0x8108B6E0; // type:object size:0x10 scope:global
BS2StateFlags = .bss:0x8108B6F0; // type:object size:0x20
Block = .bss:0x8108B720; // type:object size:0x30 align:32
PartitionInfoBuf = .bss:0x8108B760; // type:object size:0x800 align:32 data:4byte
CoverBlock = .bss:0x8108BF60; // type:object size:0x30 data:4byte
lbl_8108BF60 = .bss:0x8108BF60; // type:object size:0x30 data:4byte
BS2CacheFileInfo = .bss:0x8108BF90; // type:object size:0x8C
BS2NandBlock = .bss:0x8108C01C; // type:object size:0xBC
PartitionParams = .bss:0x8108C0E0; // type:object size:0x1DE00 scope:local align:32
@@ -37,7 +37,7 @@ GameTOCBuf = .bss:0x810A9F20; // type:object size:0x20 align:32
bi3 = .bss:0x810A9F40; // type:object size:0x2000 align:32 data:4byte
AppLoaderHdr = .bss:0x810ABF40; // type:object size:0x20 align:32 data:4byte
bi2 = .bss:0x810ABF60; // type:object size:0x2000 align:32 data:4byte
UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
lbl_810ADF60 = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
@@ -83,9 +83,9 @@ usbapNickname = .bss:0x810BD480; // type:object size:0x18
m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x160 data:byte
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C8 data:4byte
sRakuAllocator = .bss:0x810BDDD0; // type:object size:0x10
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x24
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
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
AOSS_810BE5B8 = .bss:0x810BE5B8; // type:object size:0x280
@@ -5146,62 +5146,62 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
RakuRakuThread_813FDA04__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
start__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDCC4; // type:function size:0x180
Run__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDE44; // type:function size:0xAC
RakuSocketAlloc = .text:0x813FDEF0; // type:function size:0xC scope:local
RakuSocketFree = .text:0x813FDEFC; // type:function size:0xC scope:local
RakuAtermAlloc = .text:0x813FDF08; // type:function size:0x10 scope:local
RakuAtermFree = .text:0x813FDF18; // type:function size:0x10 scope:local
RakuRakuThread_813FDEF0 = .text:0x813FDEF0; // type:function size:0xC scope:local
RakuRakuThread_813FDEFC = .text:0x813FDEFC; // type:function size:0xC scope:local
RakuRakuThread_813FDF08 = .text:0x813FDF08; // type:function size:0x10 scope:local
RakuRakuThread_813FDF18 = .text:0x813FDF18; // type:function size:0x10 scope:local
getState__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDF28; // type:function size:0x128
cancel__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FE050; // type:function size:0x14
finish__Q33ipl5scene14RakuRakuThreadFP11NCDApConfigPi = .text:0x813FE064; // type:function size:0x214
printInfo__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FE278; // type:function size:0x4
AOSSi_Init = .text:0x813FE27C; // type:function size:0x22C
AOSS_Init_old = .text:0x813FE4A8; // type:function size:0x18C0
AOSSValidateInitConfig = .text:0x813FFD68; // type:function size:0x36C
AOSS_813FFD68 = .text:0x813FFD68; // type:function size:0x36C
AOSS_CheckAP = .text:0x814000D4; // type:function size:0xE0
AOSSDispatchReceiveState = .text:0x814001B4; // type:function size:0x13C
AOSSHandleDiscoverReply = .text:0x814002F0; // type:function size:0x1E0
AOSSHandleAuthReply = .text:0x814004D0; // type:function size:0x1D4
AOSSHandleFinalReply = .text:0x814006A4; // type:function size:0x18C
AOSS_814001B4 = .text:0x814001B4; // type:function size:0x13C
AOSS_814002F0 = .text:0x814002F0; // type:function size:0x1E0
AOSS_814004D0 = .text:0x814004D0; // type:function size:0x1D4
AOSS_814006A4 = .text:0x814006A4; // type:function size:0x18C
AOSSDecryptMessage = .text:0x81400830; // type:function size:0x504
AOSSCheckAccessPointName = .text:0x81400D34; // type:function size:0xD8
AOSSParseNetworkSettings = .text:0x81400E0C; // type:function size:0x2F8
AOSSParseWepConfig = .text:0x81401104; // type:function size:0x180
AOSSParsePskConfig = .text:0x81401284; // type:function size:0x128
AOSSApplyAuthOptions = .text:0x814013AC; // type:function size:0x1C8
AOSSSendDiscoveryRequest = .text:0x81401574; // type:function size:0x204
AOSSSendHelloRequest = .text:0x81401778; // type:function size:0x444
AOSS_81400D34 = .text:0x81400D34; // type:function size:0xD8
AOSS_81400E0C = .text:0x81400E0C; // type:function size:0x2F8
AOSS_81401104 = .text:0x81401104; // type:function size:0x180
AOSS_81401284 = .text:0x81401284; // type:function size:0x128
AOSS_814013AC = .text:0x814013AC; // type:function size:0x1C8
AOSS_81401574 = .text:0x81401574; // type:function size:0x204
AOSS_81401778 = .text:0x81401778; // type:function size:0x444
AOSSBuildInterfaceOption = .text:0x81401BBC; // type:function size:0xE0
AOSSInitKeySchedule = .text:0x81401C9C; // type:function size:0x124
AOSSInitCrc32Table = .text:0x81401DC0; // type:function size:0xC0
AOSSXorBufferWithKey = .text:0x81401E80; // type:function size:0x24C
AOSSConnectAndAwaitHost = .text:0x814020CC; // type:function size:0xF0
ATERMStartNetworkStack = .text:0x814021BC; // type:function size:0x268
ATERMScanAccessPoints = .text:0x81402424; // type:function size:0x348
ATERMFindChangedApRecord = .text:0x8140276C; // type:function size:0x2B8
ATERMDiscoverAccessPoints = .text:0x81402A24; // type:function size:0x41C
ATERMBuildEncryptedMessage = .text:0x81402E40; // type:function size:0x180
ATERMParsePacket = .text:0x81402FC0; // type:function size:0x21C
ATERMBuildAssociationRequest = .text:0x814031DC; // type:function size:0x214
ATERMParseAssociationResponse = .text:0x814033F0; // type:function size:0x224
ATERMParseHexBytes = .text:0x81403614; // type:function size:0xC4
ATERMApplyScanSecuritySettings = .text:0x814036D8; // type:function size:0x1F0
ATERMRunConfigProtocol = .text:0x814038C8; // type:function size:0xEDC
ATERM_814021BC = .text:0x814021BC; // type:function size:0x268
ATERM_81402424 = .text:0x81402424; // type:function size:0x348
ATERM_8140276C = .text:0x8140276C; // type:function size:0x2B8
ATERM_81402A24 = .text:0x81402A24; // type:function size:0x41C
ATERM_81402E40 = .text:0x81402E40; // type:function size:0x180
ATERM_81402FC0 = .text:0x81402FC0; // type:function size:0x21C
ATERM_814031DC = .text:0x814031DC; // type:function size:0x214
ATERM_814033F0 = .text:0x814033F0; // type:function size:0x224
ATERM_81403614 = .text:0x81403614; // type:function size:0xC4
ATERM_814036D8 = .text:0x814036D8; // type:function size:0x1F0
ATERM_814038C8 = .text:0x814038C8; // type:function size:0xEDC
ATERMi_AutoConfigThread = .text:0x814047A4; // type:function size:0xA0
ATERMAesKeyWrap = .text:0x81404844; // type:function size:0x1D4
ATERMAesKeyUnwrap = .text:0x81404A18; // type:function size:0x1E4
ATERMAesExpandEncryptKey = .text:0x81404BFC; // type:function size:0x430
ATERMAesExpandDecryptKey = .text:0x8140502C; // type:function size:0x228
ATERMAesEncryptBlock = .text:0x81405254; // type:function size:0x43C
ATERMAesDecryptBlock = .text:0x81405690; // type:function size:0x43C
ATERMMd5Update = .text:0x81405ACC; // type:function size:0x240
ATERMMd5Transform = .text:0x81405D0C; // type:function size:0xB40
ATERMAlarmWakeQueue = .text:0x8140684C; // type:function size:0x10
ATERM_81404844 = .text:0x81404844; // type:function size:0x1D4
ATERM_81404A18 = .text:0x81404A18; // type:function size:0x1E4
ATERM_81404BFC = .text:0x81404BFC; // type:function size:0x430
ATERM_8140502C = .text:0x8140502C; // type:function size:0x228
ATERM_81405254 = .text:0x81405254; // type:function size:0x43C
ATERM_81405690 = .text:0x81405690; // type:function size:0x43C
ATERM_81405ACC = .text:0x81405ACC; // type:function size:0x240
ATERM_81405D0C = .text:0x81405D0C; // type:function size:0xB40
ATERM_8140684C = .text:0x8140684C; // type:function size:0x10
ATERMi_ApConfigStart = .text:0x8140685C; // type:function size:0x19C
ATERMi_ApConfigEnd = .text:0x814069F8; // type:function size:0x204
ATERMi_ApConfigGetState = .text:0x81406BFC; // type:function size:0x8C
@@ -21694,7 +21694,7 @@ Tick = .sdata:0x81696520; // type:object size:0x4 scope:local data:4byte
@2844 = .sdata:0x81696562; // type:object size:0x5 scope:local data:string
@2845 = .sdata:0x81696567; // type:object size:0x8 scope:local data:string
@3032 = .sdata:0x8169656F; // type:object size:0x8 scope:local data:string
TicketViews = .sdata:0x81696578; // type:object size:0x4 data:4byte
lbl_81696578 = .sdata:0x81696578; // type:object size:0x4 data:4byte
lbl_8169657C = .sdata:0x8169657C; // type:object size:0x8 data:string
lbl_81696584 = .sdata:0x81696584; // type:object size:0x7
lbl_8169658B = .sdata:0x8169658B; // type:object size:0x5 data:string
@@ -23349,60 +23349,60 @@ BS2BootType = .sbss:0x816989FC; // type:object size:0x4 scope:global data:4byte
BS2VideoMode = .sbss:0x81698A00; // type:object size:0x4 data:4byte
InvalidSram = .sbss:0x81698A04; // type:object size:0x4 data:4byte
State = .sbss:0x81698A08; // type:object size:0x4 scope:local data:4byte
DvdReadPending = .sbss:0x81698A0C; // type:object size:0x4 scope:local data:4byte
BannerAllocation = .sbss:0x81698A10; // type:object size:0x4 scope:local data:4byte
BannerBuffer = .sbss:0x81698A14; // type:object size:0x4 scope:local data:4byte
BannerAvailable = .sbss:0x81698A18; // type:object size:0x4 scope:local data:4byte
Allocator = .sbss:0x81698A1C; // type:object size:0x4 scope:local data:4byte
lbl_81698A0C = .sbss:0x81698A0C; // type:object size:0x4 scope:local data:4byte
lbl_81698A10 = .sbss:0x81698A10; // type:object size:0x4 scope:local data:4byte
lbl_81698A14 = .sbss:0x81698A14; // type:object size:0x4 scope:local data:4byte
lbl_81698A18 = .sbss:0x81698A18; // type:object size:0x4 scope:local data:4byte
lbl_81698A1C = .sbss:0x81698A1C; // type:object size:0x4 scope:local data:4byte
StartingGame = .sbss:0x81698A20; // type:object size:0x4 data:4byte
RestartRequested = .sbss:0x81698A24; // type:object size:0x4 scope:local data:4byte
PartitionOpen = .sbss:0x81698A28; // type:object size:0x4 scope:local data:4byte
CacheSeekComplete = .sbss:0x81698A2C; // type:object size:0x4 scope:local data:4byte
LoadingTitle = .sbss:0x81698A30; // type:object size:0x4 scope:local data:4byte
lbl_81698A24 = .sbss:0x81698A24; // type:object size:0x4 scope:local data:4byte
lbl_81698A28 = .sbss:0x81698A28; // type:object size:0x4 scope:local data:4byte
lbl_81698A2C = .sbss:0x81698A2C; // type:object size:0x4 scope:local data:4byte
lbl_81698A30 = .sbss:0x81698A30; // type:object size:0x4 scope:local data:4byte
FatalErrorFlag = .sbss:0x81698A34; // type:object size:0x4 data:4byte
RetryErrorFlag = .sbss:0x81698A38; // type:object size:0x4 data:4byte
UpdateErrorFlag = .sbss:0x81698A3C; // type:object size:0x4 data:4byte
AbortFlag = .sbss:0x81698A40; // type:object size:0x4 data:4byte
CacheFailed = .sbss:0x81698A44; // type:object size:0x4 data:4byte
RegionValid = .sbss:0x81698A48; // type:object size:0x4 data:4byte
NandPending = .sbss:0x81698A4C; // type:object size:0x4 scope:local data:4byte
CancelNand = .sbss:0x81698A50; // type:object size:0x4 scope:local data:4byte
LowReadResult = .sbss:0x81698A54; // type:object size:0x4 scope:local data:4byte
CacheCommandComplete = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
AudioBufferUnconfigured = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
ResetTime = .sbss:0x81698A60; // type:object size:0x8 scope:local data:4byte
SpinupDeadline = .sbss:0x81698A68; // type:object size:0x8 scope:local data:4byte
CoverPollTime = .sbss:0x81698A70; // type:object size:0x8 data:4byte
DriveWasReset = .sbss:0x81698A78; // type:object size:0x4 data:4byte
TitleTicketView = .sbss:0x81698A7C; // type:object size:0x4 scope:local data:4byte
CurrentTmd = .sbss:0x81698A80; // type:object size:0x4 scope:local data:4byte
TitleCode = .sbss:0x81698A84; // type:object size:0x4 data:4byte
RequiredIosHigh = .sbss:0x81698A88; // type:object size:0x4 data:4byte
RequiredIosLow = .sbss:0x81698A8C; // type:object size:0x4 data:4byte
GamePartition = .sbss:0x81698A90; // type:object size:0x4 data:4byte
UpdatePartition = .sbss:0x81698A94; // type:object size:0x4 data:4byte
PartitionCursor = .sbss:0x81698A98; // type:object size:0x4 data:4byte
DataToc = .sbss:0x81698A9C; // type:object size:0x4 data:4byte
GameToc = .sbss:0x81698AA0; // type:object size:0x8 data:4byte
CoverOpenTimeHigh = .sbss:0x81698AA8; // type:object size:0x4 data:4byte
CoverOpenTimeLow = .sbss:0x81698AAC; // type:object size:0x4 data:4byte
NandTransferred = .sbss:0x81698AB0; // type:object size:0x4 data:4byte
NandLength = .sbss:0x81698AB4; // type:object size:0x4 data:4byte
NandBuffer = .sbss:0x81698AB8; // type:object size:0x4 data:4byte
NandFile = .sbss:0x81698ABC; // type:object size:0x4 data:4byte
NandOperation = .sbss:0x81698AC0; // type:object size:0x4 data:4byte
NandCompletion = .sbss:0x81698AC4; // type:object size:0x4 data:4byte
LoaderOffset = .sbss:0x81698AC8; // type:object size:0x4 data:4byte
LoaderLength = .sbss:0x81698ACC; // type:object size:0x4 data:4byte
LoaderAddress = .sbss:0x81698AD0; // type:object size:0x4 data:4byte
CacheLength = .sbss:0x81698AD4; // type:object size:0x4 data:4byte
BannerLength = .sbss:0x81698AD8; // type:object size:0x4 scope:local data:4byte
DvdTransferLength = .sbss:0x81698ADC; // type:object size:0x4 scope:local data:4byte
DvdTransferred = .sbss:0x81698AE0; // type:object size:0x4 scope:local data:4byte
DvdProgress = .sbss:0x81698AE4; // type:object size:0x4 scope:local data:4byte
LoaderClose = .sbss:0x81698AE8; // type:object size:0x4 scope:local data:4byte
LoaderMain = .sbss:0x81698AEC; // type:object size:0x4 scope:local data:4byte
LoaderInit = .sbss:0x81698AF0; // type:object size:0x4 scope:local data:4byte
lbl_81698A44 = .sbss:0x81698A44; // type:object size:0x4 data:4byte
lbl_81698A48 = .sbss:0x81698A48; // type:object size:0x4 data:4byte
lbl_81698A4C = .sbss:0x81698A4C; // type:object size:0x4 scope:local data:4byte
lbl_81698A50 = .sbss:0x81698A50; // type:object size:0x4 scope:local data:4byte
lbl_81698A54 = .sbss:0x81698A54; // type:object size:0x4 scope:local data:4byte
lbl_81698A58 = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
lbl_81698A5C = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
lbl_81698A60 = .sbss:0x81698A60; // type:object size:0x8 scope:local data:4byte
lbl_81698A68 = .sbss:0x81698A68; // type:object size:0x8 scope:local data:4byte
lbl_81698A70 = .sbss:0x81698A70; // type:object size:0x8 data:4byte
lbl_81698A78 = .sbss:0x81698A78; // type:object size:0x4 data:4byte
lbl_81698A7C = .sbss:0x81698A7C; // type:object size:0x4 scope:local data:4byte
lbl_81698A80 = .sbss:0x81698A80; // type:object size:0x4 scope:local data:4byte
lbl_81698A84 = .sbss:0x81698A84; // type:object size:0x4 data:4byte
lbl_81698A88 = .sbss:0x81698A88; // type:object size:0x4 data:4byte
lbl_81698A8C = .sbss:0x81698A8C; // type:object size:0x4 data:4byte
lbl_81698A90 = .sbss:0x81698A90; // type:object size:0x4 data:4byte
lbl_81698A94 = .sbss:0x81698A94; // type:object size:0x4 data:4byte
lbl_81698A98 = .sbss:0x81698A98; // type:object size:0x4 data:4byte
lbl_81698A9C = .sbss:0x81698A9C; // type:object size:0x4 data:4byte
lbl_81698AA0 = .sbss:0x81698AA0; // type:object size:0x8 data:4byte
lbl_81698AA8 = .sbss:0x81698AA8; // type:object size:0x4 data:4byte
lbl_81698AAC = .sbss:0x81698AAC; // type:object size:0x4 data:4byte
lbl_81698AB0 = .sbss:0x81698AB0; // type:object size:0x4 data:4byte
lbl_81698AB4 = .sbss:0x81698AB4; // type:object size:0x4 data:4byte
lbl_81698AB8 = .sbss:0x81698AB8; // type:object size:0x4 data:4byte
lbl_81698ABC = .sbss:0x81698ABC; // type:object size:0x4 data:4byte
lbl_81698AC0 = .sbss:0x81698AC0; // type:object size:0x4 data:4byte
lbl_81698AC4 = .sbss:0x81698AC4; // type:object size:0x4 data:4byte
lbl_81698AC8 = .sbss:0x81698AC8; // type:object size:0x4 data:4byte
lbl_81698ACC = .sbss:0x81698ACC; // type:object size:0x4 data:4byte
lbl_81698AD0 = .sbss:0x81698AD0; // type:object size:0x4 data:4byte
lbl_81698AD4 = .sbss:0x81698AD4; // type:object size:0x4 data:4byte
lbl_81698AD8 = .sbss:0x81698AD8; // type:object size:0x4 scope:local data:4byte
lbl_81698ADC = .sbss:0x81698ADC; // type:object size:0x4 scope:local data:4byte
lbl_81698AE0 = .sbss:0x81698AE0; // type:object size:0x4 scope:local data:4byte
lbl_81698AE4 = .sbss:0x81698AE4; // type:object size:0x4 scope:local data:4byte
lbl_81698AE8 = .sbss:0x81698AE8; // type:object size:0x4 scope:local data:4byte
lbl_81698AEC = .sbss:0x81698AEC; // type:object size:0x4 scope:local data:4byte
lbl_81698AF0 = .sbss:0x81698AF0; // type:object size:0x4 scope:local data:4byte
pEntries = .sbss:0x81698AF8; // type:object size:0x4 scope:local data:4byte
EntriesCount = .sbss:0x81698AFC; // type:object size:0x4 scope:local data:4byte
pFlags = .sbss:0x81698B00; // type:object size:0x4 scope:local data:4byte

View File

@@ -309,8 +309,8 @@ namespace ipl {
return mbArrowVisible[i];
}
void setSuppressNewMailAnm(bool flag) {
mbSuppressNewMailAnm = flag;
void setUnk_0x105(bool flag) {
unk_0x105 = flag;
}
protected:
@@ -354,7 +354,7 @@ namespace ipl {
ANIM_MAX,
};
int mAnimWait;
int unk_0x54;
layout::Object* mpLayout; // 0x58
nand::LayoutFile* mpLayoutFile; // 0x5C
@@ -373,8 +373,8 @@ namespace ipl {
BOOL mbHovered[BTN_MAX]; // 0xD8
bool mbNewMailAnm;
bool mbSuppressNewMailAnm;
bool unk_0x104;
bool unk_0x105;
utility::timer mTimer; // 0x108
bool mbEnabled; // 0x110

View File

@@ -42,7 +42,7 @@ namespace ipl {
};
virtual BOOL isResetAcceptable() const {
return mbResetAcceptable;
return unk_0x7D;
}
virtual void prepare();
@@ -108,7 +108,7 @@ namespace ipl {
static const int mToFace_Duration = 20;
bool mbClosing; // 0x7C
bool mbResetAcceptable;
bool unk_0x7D;
wchar_t* mWCString; // 0x80

View File

@@ -64,8 +64,8 @@ typedef struct {
u16 mcuYCount; // 0x10
u16 mcuXCount2; // 0x12
u32 unk_0x14;
u8 remX; // 0x18
u8 remY; // 0x19
u8 unk_0x18;
u8 unk_0x19;
u8 compCount; // 0x1A
u8 scanCompCount; // 0x1B
u8 blockCount[4]; // 0x1C
@@ -143,8 +143,8 @@ struct TMCCJPEGDecWork_t {
u16 mcuYCount; // 0x1800
u16 mcuXCount2; // 0x1802
u32 unk_0x1804;
u8 remX; // 0x1808
u8 remY; // 0x1809
u8 unk_0x1808;
u8 unk_0x1809;
u8 compCount; // 0x180A
u8 scanCompCount; // 0x180B
u8 blockCount[4]; // 0x180C

View File

@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;

View File

@@ -562,8 +562,8 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
remX = p->frameWidth % p->mcuXCount;
remY = p->frameHeight % p->mcuXRem;
p->remX = remX;
p->remY = remY;
p->unk_0x18 = remX;
p->unk_0x19 = remY;
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
@@ -1919,8 +1919,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
remX = fw - mcuCountX * mcuX;
remY = fh - mcuCountY * mcuY;
work->remX = remX;
work->remY = remY;
work->unk_0x1808 = remX;
work->unk_0x1809 = remY;
{
u16 xr = (remX != 0) ? 1 : 0;

View File

@@ -16,8 +16,8 @@ typedef s32 CXStreamingResult;
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
typedef struct CXUncompContextRL {
u8* outData; // 0x00
int outDataLen; // 0x04
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
u32 size; // 0x08
u16 unk_0x0C; // 0x0C
u8 unk_0x0e; // 0x0E
@@ -25,8 +25,8 @@ typedef struct CXUncompContextRL {
} CXUncompContextRL;
typedef struct CXUncompContextLZ {
u8* outData; // 0x00
int outDataLen; // 0x04
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
u32 size; // 0x08
int unk_0x0C; // 0x0C
u8 unk_0x10; // 0x10

View File

@@ -5,8 +5,8 @@ static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
context->outData = data;
context->outDataLen = 0;
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x0e = 0;
context->unk_0x0C = 0;
context->unk_0x0f = 8;
@@ -14,8 +14,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
}
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
context->outData = data;
context->outDataLen = 0;
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x11 = 0;
context->unk_0x12 = 0;
context->unk_0x0C = 0;
@@ -54,27 +54,27 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
}
}
a = CXiReadHeader(&context->unk_0x0f, &context->outDataLen, pSrc, size, context->size);
a = CXiReadHeader(&context->unk_0x0f, &context->unk_0x04, pSrc, size, context->size);
pSrc += a;
size -= a;
if (!size) {
return !context->unk_0x0f ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
return !context->unk_0x0f ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
}
}
while (context->outDataLen > 0) {
while (context->unk_0x04 > 0) {
if (!(context->unk_0x0e & 0x80)) {
while (context->unk_0x0C) {
*context->outData++ = *pSrc++;
*context->unk_0x00++ = *pSrc++;
context->unk_0x0C--;
context->outDataLen--;
context->unk_0x04--;
size--;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
} else if (context->unk_0x0C) {
@@ -82,14 +82,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
size--;
while (context->unk_0x0C) {
*context->outData++ = b;
*context->unk_0x00++ = b;
context->unk_0x0C--;
context->outDataLen--;
context->unk_0x04--;
}
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
@@ -103,19 +103,19 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
context->unk_0x0C += 1;
}
if (context->unk_0x0C > context->outDataLen) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->size) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->unk_0x0C = context->outDataLen;
context->unk_0x0C = context->unk_0x04;
}
if (size) {
continue;
}
return context->outDataLen;
return context->unk_0x04;
}
if (!context->size && size > 32) {
@@ -174,27 +174,27 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
}
}
a = CXiReadHeader(&context->unk_0x13, &context->outDataLen, pSrc, size, context->size);
a = CXiReadHeader(&context->unk_0x13, &context->unk_0x04, pSrc, size, context->size);
pSrc += a;
size -= a;
if (!size) {
return !context->unk_0x13 ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
return !context->unk_0x13 ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
}
}
while (context->outDataLen > 0) {
while (context->unk_0x04 > 0) {
while (context->unk_0x12) {
s32 a;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
if (!(context->unk_0x11 & 0x80)) {
*context->outData++ = *pSrc++;
context->outDataLen--;
*context->unk_0x00++ = *pSrc++;
context->unk_0x04--;
size--;
@@ -240,7 +240,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
size--;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
@@ -251,23 +251,23 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
size--;
context->unk_0x10 = 3;
if (context->unk_0x0C > context->outDataLen) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->size) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->unk_0x0C = context->outDataLen;
context->unk_0x0C = context->unk_0x04;
}
while (context->unk_0x0C > 0) {
*context->outData = context->outData[-a];
context->outData++;
context->outDataLen--;
*context->unk_0x00 = context->unk_0x00[-a];
context->unk_0x00++;
context->unk_0x04--;
context->unk_0x0C--;
}
there:
if (!context->outDataLen) {
if (!context->unk_0x04) {
goto out;
}
@@ -276,7 +276,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
}
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
context->unk_0x11 = *pSrc++;

View File

@@ -322,8 +322,6 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
pf_u32 first_spare_clusters;
pf_u32 second_spare_clusters;
pf_u32 excess_clusters;
pf_s32 second_allocated_clusters;
pf_u32 capacity_clusters;
pf_u32 first_end_cluster;
pf_u32 first_spare_cluster;
pf_u32 second_spare_cluster;
@@ -372,10 +370,8 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
if (*p_second_iter->ffd.p_start_cluster != 0) {
second_spare_clusters = p_second_iter->ffd.last_cluster.max_chain_index + 1 - second_used_clusters;
}
second_allocated_clusters = second_used_clusters + second_spare_clusters;
capacity_clusters = -1U / cluster_size + 1;
if (capacity_clusters < first_used_clusters + second_allocated_clusters) {
excess_clusters = first_used_clusters + second_allocated_clusters - capacity_clusters;
if (-1U / cluster_size + 1 < (second_used_clusters + second_spare_clusters) + first_used_clusters) {
excess_clusters = (second_used_clusters + second_spare_clusters) + first_used_clusters - (-1U / cluster_size + 1);
err = PFFAT_TraceClustersChain(&p_second_iter->ffd, second_spare_cluster,
cluster_size * ((p_second_iter->ffd.last_cluster.max_chain_index + 1 - excess_clusters) - second_used_clusters),
&end_cluster, &spare_cluster);
@@ -538,7 +534,7 @@ pf_s32 PFCLUSTER_DivideFile(PFCLUSTER_ENT_ITER* p_source_iter, PFCLUSTER_ENT_ITE
pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 cluster_index, pf_u32 num_clusters, pf_u32* p_inserted_clusters) {
pf_u32 requested_size;
pf_s32 err;
pf_u32 previous_cluster;
pf_u32 next_cluster;
pf_u32 success_size;
@@ -548,7 +544,7 @@ pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 allocated_size;
pf_u32 first_cluster;
pf_u32 last_cluster;
pf_s32 err;
pf_u32 requested_size;
pf_u32 file_clusters;
pf_u32 remainder;
pf_u32 extra_size;

View File

@@ -43,7 +43,7 @@ typedef struct __sdCbArg {
SDCallbackFunc cb; // 0x00
void* cbArg; // 0x04
SDDev* dev; // 0x08
u32 cmd; // 0x0C
u32 unk_0x0C;
u32 SDDevRca;
u32* resp; // 0x14
u8* SDSectorSize;
@@ -70,7 +70,7 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSecto
IOSError __sdCb(s32 result, void* arg) {
__sdCbArg* data = (__sdCbArg*)arg;
switch (data->cmd) {
switch (data->unk_0x0C) {
case 4: {
if (result != 0) {
OSReport(__sdPathData, result);
@@ -196,7 +196,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
data->cb = cb;
data->cbArg = cbArg;
data->resp = resp;
data->cmd = cmd;
data->unk_0x0C = cmd;
data->SDSectorSize = (u8*)sdCmd;
ret = IOS_IoctlvAsync(fd, 7, readCount, writeCount, __sdVect, __sdCb, data);
@@ -243,7 +243,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
data->cb = cb;
data->cbArg = cbArg;
data->resp = resp;
data->cmd = cmd;
data->unk_0x0C = cmd;
data->SDDevRca = 1;
data->SDSectorSize = (u8*)sdCmd;

View File

@@ -54,9 +54,9 @@ typedef struct _CDBAttrBuf {
typedef struct _CDBAttr {
CDBAttrBuf buf; // 0x00
BOOL dirty; // 0x400
BOOL wiiIdDirty; // 0x404
BOOL wiiIdValid; // 0x408
BOOL unk_0x400; // 0x400
BOOL unk_0x404; // 0x404
BOOL unk_0x408; // 0x408
} CDBAttr;
#pragma pack(pop)

View File

@@ -55,9 +55,9 @@ CDBErr CDBAttrCheckAttrBuf(CDBAttr* attr) {
void CDBAttrInit(CDBAttr* attr) {
memset(&attr->buf, 0, sizeof(CDBAttrBuf));
attr->wiiIdValid = FALSE;
attr->dirty = FALSE;
attr->wiiIdDirty = FALSE;
attr->unk_0x408 = FALSE;
attr->unk_0x400 = FALSE;
attr->unk_0x404 = FALSE;
}
CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate) {
@@ -89,7 +89,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
err = CDB_ERROR_OK;
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
}
if (err != CDB_ERROR_OK) {
@@ -98,11 +98,11 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrLastModifiedDate = lastModifiedDate;
memcpy(&attr->buf.lastModifiedDate, &attrLastModifiedDate, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
attrModifiedCount = 0;
memcpy(&attr->buf.cdbID.modifiedCount, &attrModifiedCount, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
GenCDBIdNumber(&cdbNum);
attrCdbIDNum = cdbNum;
@@ -110,12 +110,12 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrWiiID = CDBGetWiiId();
memcpy(&attr->buf.wiiId, &attrWiiID, sizeof(u64));
attr->wiiIdValid = TRUE;
attr->unk_0x408 = TRUE;
err = CDB_ERROR_OK;
attr->dirty = TRUE;
attr->wiiIdDirty = TRUE;
attr->unk_0x400 = TRUE;
attr->unk_0x404 = TRUE;
return err;
}
@@ -123,7 +123,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
u32 value = modifiedDate;
memcpy(&attr->buf.lastModifiedDate, &value, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
return CDB_ERROR_OK;
}
@@ -131,7 +131,7 @@ CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
CDBErr CDBAttrSetModifiedCount(CDBAttr* attr, u32 modifiedCount) {
u32 value = modifiedCount;
memcpy(&attr->buf.cdbID.modifiedCount, &value, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
return CDB_ERROR_OK;
}
@@ -151,7 +151,7 @@ CDBErr CDBAttrGetIDNumber(CDBAttr* attr, CDBId* cdbID) {
CDBErr CDBAttrSetWiiId(CDBAttr* attr, u64 wiiId) {
u64 value = wiiId;
memcpy(&attr->buf.wiiId, &value, sizeof(u64));
attr->wiiIdDirty = TRUE;
attr->unk_0x404 = TRUE;
return CDB_ERROR_OK;
}

View File

@@ -21,7 +21,7 @@ CDBErr CDBRecordFileReadAttrBuf(CDBRecord* record) {
return err;
}
recordFile->attr.wiiIdValid = TRUE;
recordFile->attr.unk_0x408 = TRUE;
return CDB_ERROR_OK;
}
@@ -34,12 +34,12 @@ CDBErr CDBRecordFileWriteAttrBuf(CDBRecord* record) {
return CDB_ERROR_27;
}
if (recordFile->attr.dirty && !recordFile->attr.wiiIdDirty) {
if (recordFile->attr.unk_0x400 && !recordFile->attr.unk_0x404) {
err = CDBFWriteAttrOnlyLeadChunk(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;
}
} else if (recordFile->attr.dirty || recordFile->attr.wiiIdDirty) {
} else if (recordFile->attr.unk_0x400 || recordFile->attr.unk_0x404) {
err = CDBFWriteAttr(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;

View File

@@ -30,8 +30,8 @@ typedef struct AppLoaderHeader {
} AppLoaderHeader;
u8 TicketViewsBuf[OSRoundUp32B(sizeof(ESTicketView) * 64)] ALIGN32;
ESTicketView *TicketViews = (ESTicketView *)TicketViewsBuf;
DVDDiskID UpdateDiskID ALIGN32;
ESTicketView *lbl_81696578 = (ESTicketView *)TicketViewsBuf;
DVDDiskID lbl_810ADF60 ALIGN32;
OSBootInfo2 bi2 ALIGN32;
AppLoaderHeader AppLoaderHdr ALIGN32;
OSBootInfo3 bi3 ALIGN32;
@@ -41,66 +41,118 @@ DVDDiskID DiskID ALIGN32;
DVDPartitionParams PartitionParams ALIGN32;
NANDCommandBlock BS2NandBlock;
NANDFileInfo BS2CacheFileInfo;
DVDCommandBlock CoverBlock;
DVDCommandBlock lbl_8108BF60;
u8 PartitionInfoBuf[OSRoundUp32B(sizeof(DVDPartitionInfo) * 256)] ALIGN32;
DVDCommandBlock Block;
BS2State State = BS2_STT_BEGIN;
vu32 DvdReadPending = 0;
u32 BannerAllocation = 0;
u32 BannerBuffer = 0;
u32 BannerAvailable = 0;
u32 Allocator = 0;
vu32 lbl_81698A0C = 0;
u32 lbl_81698A10 = 0;
u32 lbl_81698A14 = 0;
u32 lbl_81698A18 = 0;
u32 lbl_81698A1C = 0;
BOOL StartingGame = FALSE;
u32 RestartRequested = 0;
u32 PartitionOpen = 0;
u32 CacheSeekComplete = 0;
u32 LoadingTitle = 0;
u32 lbl_81698A24 = 0;
u32 lbl_81698A28 = 0;
u32 lbl_81698A2C = 0;
u32 lbl_81698A30 = 0;
BOOL FatalErrorFlag = FALSE;
BOOL RetryErrorFlag = FALSE;
BOOL UpdateErrorFlag = FALSE;
BOOL AbortFlag = FALSE;
volatile int CacheFailed = 0;
volatile int RegionValid = 0;
volatile int NandPending = 0;
vu32 CancelNand = 0;
u32 LowReadResult = 0;
u32 CacheCommandComplete = 0;
u32 AudioBufferUnconfigured = 0;
u64 ResetTime = 0;
u64 SpinupDeadline = 0;
u64 CoverPollTime = 0;
u32 DriveWasReset = 0;
u32 TitleTicketView = 0;
u32 CurrentTmd = 0;
u32 TitleCode = 0;
u32 RequiredIosHigh = 0;
u32 RequiredIosLow = 0;
u32 GamePartition = 0;
u32 UpdatePartition = 0;
u32 PartitionCursor = 0;
u32 DataToc = 0;
u64 GameToc = 0;
u32 CoverOpenTimeHigh = 0;
u32 CoverOpenTimeLow = 0;
vu32 NandTransferred = 0;
vu32 NandLength = 0;
u8 *NandBuffer = NULL;
NANDFileInfo *NandFile = NULL;
vu32 NandOperation = 0;
volatile NANDCallback NandCompletion = NULL;
u32 LoaderOffset = 0;
vu32 LoaderLength = 0;
u32 LoaderAddress = 0;
vu32 CacheLength = 0;
vu32 BannerLength = 0;
vu32 DvdTransferLength = 0;
vu32 DvdTransferred = 0;
u32 *DvdProgress = 0;
u32 LoaderClose = 0;
u32 LoaderMain = 0;
u32 LoaderInit = 0;
volatile int lbl_81698A44 = 0;
volatile int lbl_81698A48 = 0;
volatile int lbl_81698A4C = 0;
vu32 lbl_81698A50 = 0;
u32 lbl_81698A54 = 0;
u32 lbl_81698A58 = 0;
u32 lbl_81698A5C = 0;
u64 lbl_81698A60 = 0;
u64 lbl_81698A68 = 0;
u64 lbl_81698A70 = 0;
u32 lbl_81698A78 = 0;
u32 lbl_81698A7C = 0;
u32 lbl_81698A80 = 0;
u32 lbl_81698A84 = 0;
u32 lbl_81698A88 = 0;
u32 lbl_81698A8C = 0;
u32 lbl_81698A90 = 0;
u32 lbl_81698A94 = 0;
u32 lbl_81698A98 = 0;
u32 lbl_81698A9C = 0;
u64 lbl_81698AA0 = 0;
u32 lbl_81698AA8 = 0;
u32 lbl_81698AAC = 0;
vu32 lbl_81698AB0 = 0;
vu32 lbl_81698AB4 = 0;
u8 *lbl_81698AB8 = NULL;
NANDFileInfo *lbl_81698ABC = NULL;
vu32 lbl_81698AC0 = 0;
volatile NANDCallback lbl_81698AC4 = NULL;
u32 lbl_81698AC8 = 0;
vu32 lbl_81698ACC = 0;
u32 lbl_81698AD0 = 0;
vu32 lbl_81698AD4 = 0;
vu32 lbl_81698AD8 = 0;
vu32 lbl_81698ADC = 0;
vu32 lbl_81698AE0 = 0;
u32 *lbl_81698AE4 = 0;
u32 lbl_81698AE8 = 0;
u32 lbl_81698AEC = 0;
u32 lbl_81698AF0 = 0;
#define DvdReadPending lbl_81698A0C
#define BannerAllocation lbl_81698A10
#define BannerBuffer lbl_81698A14
#define BannerAvailable lbl_81698A18
#define Allocator lbl_81698A1C
#define RestartRequested lbl_81698A24
#define PartitionOpen lbl_81698A28
#define CacheSeekComplete lbl_81698A2C
#define LoadingTitle lbl_81698A30
#define CacheFailed lbl_81698A44
#define RegionValid lbl_81698A48
#define NandPending lbl_81698A4C
#define CancelNand lbl_81698A50
#define LowReadResult lbl_81698A54
#define CacheCommandComplete lbl_81698A58
#define AudioBufferUnconfigured lbl_81698A5C
#define ResetTime lbl_81698A60
#define SpinupDeadline lbl_81698A68
#define CoverPollTime lbl_81698A70
#define DriveWasReset lbl_81698A78
#define TitleTicketView lbl_81698A7C
#define CurrentTmd lbl_81698A80
#define TitleCode lbl_81698A84
#define RequiredIosHigh lbl_81698A88
#define RequiredIosLow lbl_81698A8C
#define GamePartition lbl_81698A90
#define UpdatePartition lbl_81698A94
#define PartitionCursor lbl_81698A98
#define DataToc lbl_81698A9C
#define GameToc lbl_81698AA0
#define CoverOpenTimeHigh lbl_81698AA8
#define CoverOpenTimeLow lbl_81698AAC
#define NandTransferred lbl_81698AB0
#define NandLength lbl_81698AB4
#define NandBuffer lbl_81698AB8
#define NandFile lbl_81698ABC
#define NandOperation lbl_81698AC0
#define NandCompletion lbl_81698AC4
#define LoaderOffset lbl_81698AC8
#define LoaderLength lbl_81698ACC
#define LoaderAddress lbl_81698AD0
#define CacheLength lbl_81698AD4
#define BannerLength lbl_81698AD8
#define DvdTransferLength lbl_81698ADC
#define DvdTransferred lbl_81698AE0
#define DvdProgress lbl_81698AE4
#define LoaderClose lbl_81698AE8
#define LoaderMain lbl_81698AEC
#define LoaderInit lbl_81698AF0
#define CoverBlock lbl_8108BF60
#define UpdateDiskID lbl_810ADF60
#define TicketViews lbl_81696578
void BS2Report(const char *msg, ...) {
#ifdef ENABLE_BS2_REPORT

View File

@@ -185,7 +185,7 @@ namespace ipl {
};
// clang-format on
Button::Button(EGG::Heap* heap) : Base(heap), mAnimWait(0), mOptOutBtn(), mSdMenuBtn(), mbNewMailAnm(false), mbSuppressNewMailAnm(false), mReservedCmd() {
Button::Button(EGG::Heap* heap) : Base(heap), unk_0x54(0), mOptOutBtn(), mSdMenuBtn(), unk_0x104(false), unk_0x105(false), mReservedCmd() {
for (int i = 0; i < ARROW_BTN_MAX; i++) {
mbArrowVisible[i] = true;
}
@@ -293,7 +293,7 @@ namespace ipl {
}
void Button::calc() {
switch (mAnimWait) {
switch (unk_0x54) {
case 0: {
if (mReservedCmd.get_current_index() != 0) {
Command popped = mReservedCmd.get_popped_item();
@@ -312,7 +312,7 @@ namespace ipl {
if (!mpButtonAnim[ANIM_SCENE_CHANGE]->isPlaying() && !mpButtonAnim[ANIM_CALENDAR_EXIT]->isPlaying() &&
!mpButtonAnim[ANIM_COMMON_BUTTON]->isPlaying() && !mpButtonAnim[ANIM_TRASH_DELETE]->isPlaying() &&
!mOptOutBtn.mpLayout->isPlaying()) {
mAnimWait = 0;
unk_0x54 = 0;
}
break;
}
@@ -335,7 +335,7 @@ namespace ipl {
mpBalloons[i]->calc();
}
if (mbNewMailAnm && !mbSuppressNewMailAnm && mTimer()) {
if (unk_0x104 && !unk_0x105 && mTimer()) {
startNewMailAnm_();
}
}
@@ -457,7 +457,7 @@ namespace ipl {
bool Button::isActive() const {
bool result = false;
if (isSceneCreated() && mAnimWait != 1) {
if (isSceneCreated() && unk_0x54 != 1) {
result = true;
}
return result;
@@ -668,7 +668,7 @@ namespace ipl {
}
}
mAnimWait = 1;
unk_0x54 = 1;
}
void Button::initArrowAppearance(int arrowType, bool bAppear) {
@@ -752,8 +752,8 @@ namespace ipl {
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMinFrame(scLoopAnmFrame.start);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(scLoopAnmFrame.end);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(1.0f);
mbNewMailAnm = true;
if (!mbSuppressNewMailAnm) {
unk_0x104 = true;
if (!unk_0x105) {
startNewMailAnm_();
}
}
@@ -773,7 +773,7 @@ namespace ipl {
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(1.0f);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(0.0f);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->play();
mbNewMailAnm = false;
unk_0x104 = false;
}
void Button::enableBtn() {

View File

@@ -449,7 +449,7 @@ namespace ipl {
mpRsoExpHeaps[0] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
mpRsoExpHeaps[1] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
getButton()->setSuppressNewMailAnm(true);
getButton()->setUnk_0x105(true);
}
void ChannelTitle::calcCommon() {
@@ -931,7 +931,7 @@ namespace ipl {
System::getChannelManager()->resetChJumpLoad();
getButton()->setSuppressNewMailAnm(false);
getButton()->setUnk_0x105(false);
}
BOOL ChannelTitle::isResetAcceptable() const {

View File

@@ -71,7 +71,7 @@ namespace ipl {
mSelectedFaceId = -1;
mpNigaoe = NULL;
mbClosing = false;
mbResetAcceptable = true;
unk_0x7D = true;
mNwc24ErrCountdown = 0;
mbToFriend = false;
@@ -385,7 +385,7 @@ namespace ipl {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
mbResetAcceptable = false;
unk_0x7D = false;
// Copy letter contents
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
@@ -409,7 +409,7 @@ namespace ipl {
closeNWC24();
}
mbResetAcceptable = true;
unk_0x7D = true;
// Button animation
button->animation(Button::IDANIM_SELECT_CREATE_R);

View File

@@ -290,25 +290,25 @@ extern int SORecvFrom(int socket, void* buffer, int length, int flags, void* add
extern int SOSendTo(int socket, const void* buffer, int length, int flags, const void* address);
extern int SOBind(int socket, const void* address);
int AOSSValidateInitConfig(AOSSInitInput* input);
int AOSS_813FFD68(AOSSInitInput* input);
int AOSS_CheckAP(AOSSAccessPointRecord* list);
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSDecryptMessage(AOSSDecryptionMessage* message);
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress);
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
int AOSS_81400D34(u16 command, const u8* manufacturerAddress);
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength);
void AOSSInitCrc32Table(u32 seed, u32* table);
s16 AOSSBuildInterfaceOption(void* buffer);
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket);
int AOSSSendHelloRequest(void* packet, void* request, int socket);
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket);
int AOSS_81401778(void* packet, void* request, int socket);
int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength);
int AOSSConnectAndAwaitHost(void* settings, void* config);
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings);
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings);
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
int AOSSi_Init(AOSSInitInput* input) {
int result;
@@ -950,14 +950,14 @@ request_socket_cleanup_complete:
s_operationState = 2;
AOSSi_Status(2);
}
requestResult = AOSSSendDiscoveryRequest(networkAddresses,&requestRecords,requestResult);
requestResult = AOSS_81401574(networkAddresses,&requestRecords,requestResult);
break;
case 1:
if (s_operationState != 3) {
s_operationState = 3;
AOSSi_Status(3);
}
requestResult = AOSSSendHelloRequest(networkAddresses,&requestRecords,requestResult);
requestResult = AOSS_81401778(networkAddresses,&requestRecords,requestResult);
break;
case 2:
@@ -1089,7 +1089,7 @@ process_received_packet:
packetBuffer->socket = s_socket;
retryWait = SONtoHs(receivedLength);
packetBuffer->length = retryWait & 0xffff;
requestResult = AOSSDispatchReceiveState(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
requestResult = AOSS_814001B4(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
if (requestResult == 100) {
protocolResult = 0;
}
@@ -1391,7 +1391,7 @@ protocol_socket_cleanup_complete:
resultCode = 0xffffffff;
goto finish_initialization;
} else {
protocolResult = AOSSValidateInitConfig(input);
protocolResult = AOSS_813FFD68(input);
if (protocolResult == 0) goto configuration_success;
{
input->status = 6;
@@ -1414,7 +1414,7 @@ finish_initialization:
return (int)resultCode;
}
int AOSSValidateInitConfig(AOSSInitInput* input) {
int AOSS_813FFD68(AOSSInitInput* input) {
AOSSConfigRecord* config;
u8* output;
u8* cursor;
@@ -1599,7 +1599,7 @@ int AOSS_CheckAP(AOSSAccessPointRecord* list) {
return result;
}
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
u16 messageLength = SONtoHs(packet->message.messageLength);
u16 opcode;
@@ -1618,19 +1618,19 @@ int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, A
opcode = SONtoHs(packet->message.opcode);
switch (opcode) {
case 0x1010:
state = AOSSHandleDiscoverReply(state, packet, count, request);
state = AOSS_814002F0(state, packet, count, request);
break;
case 0x2010:
state = AOSSHandleAuthReply(state, packet, count, request);
state = AOSS_814004D0(state, packet, count, request);
break;
case 0x3010:
state = AOSSHandleFinalReply(state, packet, count, request);
state = AOSS_814006A4(state, packet, count, request);
break;
}
return state;
}
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
AOSSReplyPayload* reply;
AOSSRequestRecord* requestRecord;
size_t manufacturerLength;
@@ -1686,7 +1686,7 @@ int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AO
(*count)++;
return state;
}
parserResult = AOSSParseNetworkSettings(&reply->data.optionRecord, s_networkBuffer);
parserResult = AOSS_81400E0C(&reply->data.optionRecord, s_networkBuffer);
if (parserResult < 0) {
if (parserResult == -2) {
s_errorCode = 0x16;
@@ -1705,7 +1705,7 @@ int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AO
return 1;
}
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
size_t manufacturerLength;
int compareResult;
u16 packetSequence;
@@ -1756,7 +1756,7 @@ int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRe
} else {
memset(&s_configData, 0, sizeof(s_configData));
authType = SONtoHs(packet->message.authType);
operationResult = AOSSApplyAuthOptions(0, (const AOSSReplyOption*)reply, authType, &s_configData,
operationResult = AOSS_814013AC(0, (const AOSSReplyOption*)reply, authType, &s_configData,
s_networkBuffer);
if (operationResult < 0) {
*count = *count + 1;
@@ -1772,7 +1772,7 @@ int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRe
return state;
}
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int result = state;
size_t manufacturerLength;
int compareResult;
@@ -1857,7 +1857,7 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
return -100;
}
result = AOSSCheckAccessPointName(SONtoHs(message->command), manufacturerAddress);
result = AOSS_81400D34(SONtoHs(message->command), manufacturerAddress);
if (result != 0) {
return result;
}
@@ -1931,7 +1931,7 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
return 0;
}
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress) {
int AOSS_81400D34(u16 command, const u8* manufacturerAddress) {
u8* storedAddress = s_accessPointName;
int result = 0;
int hasAddress = 0;
@@ -1961,7 +1961,7 @@ int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress) {
return result;
}
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings) {
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record;
s32 length;
@@ -2027,7 +2027,7 @@ int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings) {
return 0;
}
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
u32 length;
@@ -2099,7 +2099,7 @@ int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config)
return 0;
}
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
u32 length;
@@ -2146,7 +2146,7 @@ int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config)
return 0;
}
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
u32 flags = 0;
const AOSSReplyOption* responseRecord;
AOSSConfigRecord* configRecord;
@@ -2190,19 +2190,19 @@ int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int respons
do {
switch (option->fields.type) {
case 3:
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep40Config);
result = AOSS_81401104((const AOSSOptionRecord*)option, wep40Config);
flags |= 1;
break;
case 4:
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep104Config);
result = AOSS_81401104((const AOSSOptionRecord*)option, wep104Config);
flags |= 2;
break;
case 5:
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, tkipConfig);
result = AOSS_81401284((const AOSSOptionRecord*)option, tkipConfig);
flags |= 4;
break;
case 6:
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, aesConfig);
result = AOSS_81401284((const AOSSOptionRecord*)option, aesConfig);
flags |= 8;
break;
case 10:
@@ -2234,7 +2234,7 @@ int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int respons
return 0;
}
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket) {
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
u8* responsePayload;
u8 accessPointName[8];
AOSSSocketAddress destination;
@@ -2302,7 +2302,7 @@ int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int sock
return result;
}
int AOSSSendHelloRequest(void* packet, void* request, int socket) {
int AOSS_81401778(void* packet, void* request, int socket) {
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
AOSSHelloPayload* payload;
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;

View File

@@ -540,20 +540,20 @@ AtermProgressCallback gAtermProgressCallback;
u32 gAtermResult;
s32 gAtermState;
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context);
s32 ATERMRunConfigProtocol(void);
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length);
void ATERM_8140684C(OSAlarm* alarm, OSContext* context);
s32 ATERM_814038C8(void);
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length);
extern u8 gAtermDigestFill[64];
extern u8* gAtermRequestOptions;
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits);
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits);
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
int ATERMParseAssociationResponse(u16* response);
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits);
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits);
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
int ATERM_814033F0(u16* response);
int ATERMStartNetworkStack(void) {
int ATERM_814021BC(void) {
int status;
int waitCount = 0;
u32 convertedHost;
@@ -605,7 +605,7 @@ int ATERMStartNetworkStack(void) {
OSCreateAlarm(&interfaceAlarm);
OSSetAlarmTag(&interfaceAlarm, (u32)&interfaceQueue);
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERMAlarmWakeQueue);
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERM_8140684C);
OSReceiveMessage(&interfaceQueue, &interfaceMessage, 1);
}
@@ -621,7 +621,7 @@ int ATERMStartNetworkStack(void) {
OSCreateAlarm(&hostAlarm);
OSSetAlarmTag(&hostAlarm, (u32)&hostQueue);
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
OSSetAlarm(&hostAlarm, timeoutTicks, ATERMAlarmWakeQueue);
OSSetAlarm(&hostAlarm, timeoutTicks, ATERM_8140684C);
OSReceiveMessage(&hostQueue, &hostMessage, 1);
}
} else {
@@ -631,7 +631,7 @@ int ATERMStartNetworkStack(void) {
return waitCount;
}
int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
int ATERM_81402424(u16* resultBuffer, u32 resultBufferLength) {
int lockId;
int result = -2;
u16* scanBuffer = resultBuffer;
@@ -678,7 +678,7 @@ int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
OSCreateAlarm(&startupAlarm);
OSSetAlarmTag(&startupAlarm, (u32)&startupQueue);
OSSetAlarm(&startupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&startupQueue, &startupMessage, 1);
} while (1);
@@ -719,7 +719,7 @@ int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
OSCreateAlarm(&scanAlarm);
OSSetAlarmTag(&scanAlarm, (u32)&scanQueue);
OSSetAlarm(&scanAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&scanQueue, &scanMessage, 1);
}
@@ -737,7 +737,7 @@ cleanup_driver:
OSCreateAlarm(&cleanupAlarm);
OSSetAlarmTag(&cleanupAlarm, (u32)&cleanupQueue);
OSSetAlarm(&cleanupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&cleanupQueue, &cleanupMessage, 1);
}
@@ -752,7 +752,7 @@ unlock_driver:
OSCreateAlarm(&unlockAlarm);
OSSetAlarmTag(&unlockAlarm, (u32)&unlockQueue);
OSSetAlarm(&unlockAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&unlockQueue, &unlockMessage, 1);
}
}
@@ -760,7 +760,7 @@ unlock_driver:
return result;
}
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
u32* changedIndex) {
u32 previousIndex;
u32 currentIndex = 0;
@@ -869,7 +869,7 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
return result;
}
int ATERMDiscoverAccessPoints(void) {
int ATERM_81402A24(void) {
s32 result = -1;
u32 scanBufferBytes;
u32 recordIndex;
@@ -912,7 +912,7 @@ int ATERMDiscoverAccessPoints(void) {
break;
}
result = ATERMScanAccessPoints((u16*)scanBuffer, scanBufferBytes);
result = ATERM_81402424((u16*)scanBuffer, scanBufferBytes);
if (result < 0) {
goto cleanup;
}
@@ -954,7 +954,7 @@ int ATERMDiscoverAccessPoints(void) {
currentRecords->count = result;
if (gAtermState != 1 &&
ATERMFindChangedApRecord(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
ATERM_8140276C(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
AtermApRecord* selectedRecord;
gAtermSelectedRecordIndex = progressInfo[0];
selectedRecord = &currentRecords->entries[progressInfo[0]];
@@ -1036,7 +1036,7 @@ cleanup:
return result;
}
int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
int ATERM_81402E40(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
void* encryptionKey) {
u8* end;
u8* cursor;
@@ -1045,7 +1045,7 @@ int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, s
memset(payload, 0, 8);
payload[0] = SOHtoNs((payloadLength - 8) & 0xFFFF);
if (encryptionKey != NULL) {
ATERMAesKeyWrap(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
ATERM_81404844(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
payloadLength += 8;
} else {
memcpy(messageBuffer + 3, payload, payloadLength);
@@ -1064,7 +1064,7 @@ int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, s
return (int)(end + sizeof(u16) - (u8*)messageBuffer);
}
int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
int ATERM_81402FC0(AtermPacket* packet, u32* setupType) {
u8* cursor;
u8* end;
u8* payload;
@@ -1142,7 +1142,7 @@ int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
return 0;
}
int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
int ATERM_814031DC(AtermAssociationRequest* request) {
u8 scanAddress[8];
u8 interfaceMacAddress[8];
char interfaceMacText[32];
@@ -1227,7 +1227,7 @@ int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
return 1;
}
int ATERMParseAssociationResponse(u16* response) {
int ATERM_814033F0(u16* response) {
u16* optionCursor = response + 4;
u8* optionValue;
u16* responseEnd;
@@ -1317,7 +1317,7 @@ int ATERMParseAssociationResponse(u16* response) {
return result;
}
int ATERMParseHexBytes(u8* destination, const char* source, s32 length) {
int ATERM_81403614(u8* destination, const char* source, s32 length) {
s32 value = 0;
s32 characterIndex = 0;
@@ -1349,7 +1349,7 @@ int ATERMParseHexBytes(u8* destination, const char* source, s32 length) {
return 1;
}
int ATERMApplyScanSecuritySettings(void) {
int ATERM_814036D8(void) {
s32 result = 1;
char* sourceKey;
char* outputKey;
@@ -1389,7 +1389,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 10:
gAtermConfigurationResult.setupMode = 1;
ATERMParseHexBytes((u8*)outputKey, keyString, 10);
ATERM_81403614((u8*)outputKey, keyString, 10);
break;
case 13:
gAtermConfigurationResult.setupMode = 2;
@@ -1397,7 +1397,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 26:
gAtermConfigurationResult.setupMode = 2;
ATERMParseHexBytes((u8*)outputKey, keyString, 0x1A);
ATERM_81403614((u8*)outputKey, keyString, 0x1A);
break;
case 16:
gAtermConfigurationResult.setupMode = 3;
@@ -1405,7 +1405,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 32:
gAtermConfigurationResult.setupMode = 3;
ATERMParseHexBytes((u8*)outputKey, keyString, 0x20);
ATERM_81403614((u8*)outputKey, keyString, 0x20);
break;
default:
result = -7;
@@ -1432,7 +1432,7 @@ int ATERMApplyScanSecuritySettings(void) {
return result;
}
s32 ATERMRunConfigProtocol(void) {
s32 ATERM_814038C8(void) {
OSMessageQueue waitQueue;
OSMessage waitBuffer[1];
OSMessage waitMessage;
@@ -1459,7 +1459,7 @@ s32 ATERMRunConfigProtocol(void) {
OSSetAlarmTag(&waitAlarm, (u32)&waitQueue);
OSSetAlarm(&waitAlarm,
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6) * 500,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&waitQueue, &waitMessage, 1);
switch (gAtermProtocolState) {
case 0:
@@ -1467,7 +1467,7 @@ s32 ATERMRunConfigProtocol(void) {
case 1:
{
AtermProgress progress;
result = ATERMDiscoverAccessPoints();
result = ATERM_81402A24();
if (result != 1) {
failed = 1;
break;
@@ -1485,7 +1485,7 @@ s32 ATERMRunConfigProtocol(void) {
break;
}
case 2:
result = ATERMStartNetworkStack();
result = ATERM_814021BC();
if (result != 1) {
failed = 1;
break;
@@ -1525,11 +1525,11 @@ s32 ATERMRunConfigProtocol(void) {
break;
}
peerAddress.length = 8;
ATERMBuildAssociationRequest((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
ATERM_814031DC((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
if (receivedLength > 0 &&
ATERMParsePacket((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
ATERM_81402FC0((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
AtermProgress progress;
gAtermDeadline = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 30000;
gAtermProtocolState = 5;
@@ -1588,7 +1588,7 @@ s32 ATERMRunConfigProtocol(void) {
longOption++;
}
optionEnd = (u8*)longOption;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 2,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 2,
(u16*)response->data, optionEnd - gAtermRequestOptions + 8, NULL);
sendAddress.length = 8;
sendAddress.family = 2;
@@ -1628,7 +1628,7 @@ s32 ATERMRunConfigProtocol(void) {
} else if (sequence != 3) {
payloadLength = 0;
} else if (gAtermConfigurationResult.connectionPrefix != NULL) {
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
payloadLength, gAtermConfigurationResult.connectionPrefix, 16);
payloadLength -= 8;
} else {
@@ -1660,7 +1660,7 @@ s32 ATERMRunConfigProtocol(void) {
digestContext.state[1] = 0xEFCDAB89;
digestContext.state[2] = 0x98BADCFE;
digestContext.state[3] = 0x10325476;
ATERMMd5Update(&digestContext, &authenticationTime, sizeof(authenticationTime));
ATERM_81405ACC(&digestContext, &authenticationTime, sizeof(authenticationTime));
digestLength[0] = digestContext.bitCountLow;
digestLength[1] = digestContext.bitCountLow >> 8;
digestLength[2] = digestContext.bitCountLow >> 16;
@@ -1670,9 +1670,9 @@ s32 ATERMRunConfigProtocol(void) {
digestLength[6] = digestContext.bitCountHigh >> 16;
digestLength[7] = digestContext.bitCountHigh >> 24;
digestBytes = (digestContext.bitCountLow >> 3) & 0x3F;
ATERMMd5Update(&digestContext, gAtermDigestFill,
ATERM_81405ACC(&digestContext, gAtermDigestFill,
digestBytes < 56 ? 56 - digestBytes : 120 - digestBytes);
ATERMMd5Update(&digestContext, digestLength, sizeof(digestLength));
ATERM_81405ACC(&digestContext, digestLength, sizeof(digestLength));
response->authentication.digest[0] = digestContext.state[0];
response->authentication.digest[1] = digestContext.state[0] >> 8;
response->authentication.digest[2] = digestContext.state[0] >> 16;
@@ -1724,7 +1724,7 @@ s32 ATERMRunConfigProtocol(void) {
memcpy(option->value, response->authentication.digest, 8);
gAtermReplyLength = (u8*)(option + 1) - response->data;
response->authentication.decoded.length = gAtermReplyLength - 8;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 4,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 4,
(u16*)response->data, gAtermReplyLength, gAtermConfigurationResult.connectionPrefix);
sendAddress.length = 8;
sendAddress.family = 2;
@@ -1758,14 +1758,14 @@ s32 ATERMRunConfigProtocol(void) {
} else if (sequence != 5) {
payloadLength = 0;
} else if (sessionKey != NULL) {
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
payloadLength, sessionKey, 16);
payloadLength -= 8;
} else {
memcpy(response->authentication.payload, payload, payloadLength);
}
gAtermReplyLength = payloadLength;
if (payloadLength != 0 && ATERMParseAssociationResponse((u16*)response->data)) {
if (payloadLength != 0 && ATERM_814033F0((u16*)response->data)) {
gAtermProtocolState = 9;
retries = 0;
gAtermMode = gScanSettings.ssid[0] != 0;
@@ -1795,7 +1795,7 @@ s32 ATERMRunConfigProtocol(void) {
memcpy(option->value, &gAtermMode, 1);
gAtermReplyLength = (u8*)(option + 1) - response->data;
response->authentication.decoded.length = gAtermReplyLength - 8;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 6,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 6,
(u16*)response->data, gAtermReplyLength, sessionKey);
if (NCDGetLinkStatus() != 5) {
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 1000;
@@ -1817,7 +1817,7 @@ s32 ATERMRunConfigProtocol(void) {
if (now >= lastSendTime + 1000) {
if (++retries >= 10) {
failed = 1;
result = ATERMApplyScanSecuritySettings();
result = ATERM_814036D8();
} else {
gAtermProtocolState = 9;
}
@@ -1840,7 +1840,7 @@ s32 ATERMRunConfigProtocol(void) {
u8 gAtermDigestFill[64] = { 0x80 };
s32 ATERMi_AutoConfigThread(void) {
s32 result = ATERMRunConfigProtocol();
s32 result = ATERM_814038C8();
AtermProgress progress;
u32 equalityMask;
s32 completedState;
@@ -1864,7 +1864,7 @@ s32 ATERMi_AutoConfigThread(void) {
return 0;
}
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
u32 expandedKey[80];
union { u32 words[4]; u8 bytes[16]; } block;
union { u64 value; u8 bytes[8]; } counter;
@@ -1889,7 +1889,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
return 0;
}
rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyLength << 3);
rounds = ATERM_81404BFC(expandedKey, key, keyLength << 3);
destinationBytes = (u8*)destination;
sourceBytes = (const u8*)source;
memcpy(destinationBytes + 8, sourceBytes, length);
@@ -1901,7 +1901,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
outputBlock = destinationBytes + blockOffset;
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
ATERM_81405254(expandedKey, rounds, stateBytes, stateBytes);
counter.value = (u64)(s64)blockIndex + passBase;
stateBytes[0] ^= counter.bytes[0];
stateBytes[1] ^= counter.bytes[1];
@@ -1918,7 +1918,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
return 1;
}
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
u32 expandedKey[80];
union { u32 words[4]; u8 bytes[16]; } block;
union { u64 value; u8 bytes[8]; } counter;
@@ -1942,7 +1942,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
return 0;
}
rounds = ATERMAesExpandDecryptKey(expandedKey, key, keyLength << 3);
rounds = ATERM_8140502C(expandedKey, key, keyLength << 3);
destinationBytes = (u8*)destination;
sourceBytes = (const u8*)source;
memcpy(block.words, sourceBytes, 8);
@@ -1963,7 +1963,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
stateBytes[6] ^= counter.bytes[6];
stateBytes[7] ^= counter.bytes[7];
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesDecryptBlock(expandedKey, rounds, stateBytes, stateBytes);
ATERM_81405690(expandedKey, rounds, stateBytes, stateBytes);
memcpy(outputBlock, stateBytes + 8, 8);
}
}
@@ -1986,7 +1986,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
((u32)keyBytes[(index) * 4 + 2] << 8) ^ \
keyBytes[(index) * 4 + 3])
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits) {
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits) {
const u8* keyBytes = (const u8*)key;
u32* roundKey = expandedKey;
@@ -2096,8 +2096,8 @@ int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits) {
(inverseTable0[byte0] ^ inverseTable1[byte1]); \
}
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits) {
int rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyBits);
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits) {
int rounds = ATERM_81404BFC(expandedKey, key, keyBits);
u32* roundKey;
s32 roundCount;
s32 firstIndex;
@@ -2145,7 +2145,7 @@ int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits) {
#undef ATERM_AES_TRANSFORM_KEY
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
u32 state0, state1, state2, state3;
u32 next0, next1, next2, next3;
s32 roundPairs;
@@ -2232,7 +2232,7 @@ void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u
output[15] = state3;
}
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
u32 state0, state1, state2, state3;
u32 next0, next1, next2, next3;
s32 roundPairs;
@@ -2319,9 +2319,9 @@ void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u
output[15] = state3;
}
void ATERMMd5Transform(u32 state[4], const u8 block[64]);
void ATERM_81405D0C(u32 state[4], const u8 block[64]);
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length) {
u8* data = (u8*)input;
u32 bufferIndex = (context->bitCountLow >> 3) & 0x3F;
u32 bytesToFill;
@@ -2338,9 +2338,9 @@ void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
for (copiedBytes = 0; copiedBytes < bytesToFill; copiedBytes++) {
context->buffer8[bufferIndex + copiedBytes] = data[copiedBytes];
}
ATERMMd5Transform(context->state, context->buffer8);
ATERM_81405D0C(context->state, context->buffer8);
for (copiedBytes = bytesToFill; copiedBytes + 63 < length; copiedBytes += 64) {
ATERMMd5Transform(context->state, data + copiedBytes);
ATERM_81405D0C(context->state, data + copiedBytes);
}
bufferIndex = 0;
} else {
@@ -2358,7 +2358,7 @@ void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
(A) += (B); \
} while (0)
void ATERMMd5Transform(u32 state[4], const u8 block[64]) {
void ATERM_81405D0C(u32 state[4], const u8 block[64]) {
u32 byteIndex;
u32 index;
const u8* inputWord;
@@ -2452,7 +2452,7 @@ void ATERMMd5Transform(u32 state[4], const u8 block[64]) {
}
#undef ATERM_MD5_STEP
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context) {
void ATERM_8140684C(OSAlarm* alarm, OSContext* context) {
OSMessageQueue* queue = (OSMessageQueue*)alarm->tag;
OSSendMessage(queue, NULL, 0);
}
@@ -2525,7 +2525,7 @@ int ATERMi_ApConfigEnd(void) {
OSSetAlarmTag(&cancelAlarm, (u32)&cancelQueue);
OSSetAlarm(&cancelAlarm,
OSMillisecondsToTicks(100),
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&cancelQueue, &cancelMessage, 1);
}
@@ -2534,7 +2534,7 @@ int ATERMi_ApConfigEnd(void) {
OSSetAlarmTag(&joinAlarm, (u32)&joinQueue);
OSSetAlarm(&joinAlarm,
OSMillisecondsToTicks(500),
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&joinQueue, &joinMessage, 1);
while (OSIsThreadTerminated(&sAtermThread) == 0) {
OSJoinThread(&sAtermThread, NULL);

View File

@@ -28,26 +28,26 @@ int ATERMi_ApConfigEnd();
namespace ipl {
namespace scene {
extern "C" MEMAllocator sRakuAllocator;
MEMAllocator sRakuAllocator;
extern "C" MEMAllocator RakuRakuThread_810BDDD0;
MEMAllocator RakuRakuThread_810BDDD0;
struct RakuStatus {
RakuProgress progress;
RakuConfiguration configuration;
};
extern "C" RakuStatus sRakuStatus;
RakuStatus sRakuStatus;
extern "C" OSMessageQueue sRakuMsgQueue;
OSMessageQueue sRakuMsgQueue;
extern "C" RakuStatus RakuRakuThread_810BDDE0;
RakuStatus RakuRakuThread_810BDDE0;
extern "C" OSMessageQueue RakuRakuThread_810BDED4;
OSMessageQueue RakuRakuThread_810BDED4;
static OSTime startTime;
static bool active;
static OSMessage messageSlot;
static int displayState = 1;
extern "C" {
static void* RakuSocketAlloc(u32, s32 size);
static void RakuSocketFree(u32, void* block, s32);
static void* RakuAtermAlloc(u32 size);
static void RakuAtermFree(void* block);
static void* RakuRakuThread_813FDEF0(u32, s32 size);
static void RakuRakuThread_813FDEFC(u32, void* block, s32);
static void* RakuRakuThread_813FDF08(u32 size);
static void RakuRakuThread_813FDF18(void* block);
}
struct RakuStack {
@@ -60,7 +60,7 @@ public:
virtual ~RakuRakuThread();
virtual void* Run();
virtual void unk_0x2C() = 0;
void syncRakuProgress();
void RakuRakuThread_813FDA04();
static void progressCallback(RakuProgress* progress);
void destroy();
int start();
@@ -78,15 +78,15 @@ private:
MEMHeapHandle mHeap;
};
void RakuRakuThread::syncRakuProgress() {
void RakuRakuThread::RakuRakuThread_813FDA04() {
BOOL interrupts = OSDisableInterrupts();
sRakuStatus.progress = *(RakuProgress*)this;
RakuRakuThread_810BDDE0.progress = *(RakuProgress*)this;
startTime = OSGetTime();
OSRestoreInterrupts(interrupts);
}
void RakuRakuThread::progressCallback(RakuProgress* progress) {
((RakuRakuThread*)progress)->syncRakuProgress();
((RakuRakuThread*)progress)->RakuRakuThread_813FDA04();
}
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
@@ -101,12 +101,12 @@ RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
active = false;
mFinished = 0;
mRunning = 0;
OSInitMessageQueue(&sRakuMsgQueue, &messageSlot, 1);
OSInitMessageQueue(&RakuRakuThread_810BDED4, &messageSlot, 1);
}
RakuRakuThread::~RakuRakuThread() {
if (mRunning) {
OSJamMessage(&sRakuMsgQueue, (OSMessage)2, 1);
OSJamMessage(&RakuRakuThread_810BDED4, (OSMessage)2, 1);
WaitForThreadExit();
}
destroy();
@@ -114,7 +114,7 @@ RakuRakuThread::~RakuRakuThread() {
void RakuRakuThread::destroy() {
if (active) {
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
u32 start = OSGetTick();
while ((u32)(OSGetTick() - start) / (OS_TIMER_CLOCK / 1000) < 2000) {
RakuProgress progress;
@@ -127,7 +127,7 @@ void RakuRakuThread::destroy() {
}
if (mHeap != NULL) {
MEMDestroyExpHeap(mHeap);
memset(&sRakuAllocator, 0, sizeof(MEMAllocator));
memset(&RakuRakuThread_810BDDD0, 0, sizeof(MEMAllocator));
mHeap = NULL;
}
}
@@ -139,19 +139,19 @@ int RakuRakuThread::start() {
BOOL interrupts = OSDisableInterrupts();
startTime = OSGetTime();
mHeap = MEMCreateExpHeapEx(mHeapBuffer, 0x40000, 2);
MEMInitAllocatorForExpHeap(&sRakuAllocator, mHeap, 32);
MEMInitAllocatorForExpHeap(&RakuRakuThread_810BDDD0, mHeap, 32);
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
active = true;
mFinished = 0;
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
memset(&RakuRakuThread_810BDDE0.configuration, 0, sizeof(RakuConfiguration));
memset(&RakuRakuThread_810BDDE0.progress, 0, sizeof(RakuProgress));
SOLibraryConfig socketConfig;
socketConfig.alloc = RakuSocketAlloc;
socketConfig.free = RakuSocketFree;
socketConfig.alloc = RakuRakuThread_813FDEF0;
socketConfig.free = RakuRakuThread_813FDEFC;
SOInit(&socketConfig);
ATERMi_ApConfigStart(mPriority, 200,
progressCallback,
RakuAtermAlloc, RakuAtermFree, 4096);
RakuRakuThread_813FDF08, RakuRakuThread_813FDF18, 4096);
if (!mRunning) {
mRunning = 1;
memset(mStack, 0, 4);
@@ -165,12 +165,12 @@ int RakuRakuThread::start() {
void* RakuRakuThread::Run() {
OSMessage message;
while (true) {
while (OSReceiveMessage(&sRakuMsgQueue, &message, 0)) {
while (OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 0)) {
if ((s32)message == 2) {
return this;
}
}
OSReceiveMessage(&sRakuMsgQueue, &message, 1);
OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 1);
if ((s32)message == 2) {
break;
}
@@ -184,17 +184,17 @@ void* RakuRakuThread::Run() {
return this;
}
static void* RakuSocketAlloc(u32, s32 size) {
return MEMAllocFromAllocator(&sRakuAllocator, size);
static void* RakuRakuThread_813FDEF0(u32, s32 size) {
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
}
static void RakuSocketFree(u32, void* block, s32) {
MEMFreeToAllocator(&sRakuAllocator, block);
static void RakuRakuThread_813FDEFC(u32, void* block, s32) {
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
}
static void* RakuAtermAlloc(u32 size) {
return MEMAllocFromAllocator(&sRakuAllocator, size);
static void* RakuRakuThread_813FDF08(u32 size) {
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
}
static void RakuAtermFree(void* block) {
MEMFreeToAllocator(&sRakuAllocator, block);
static void RakuRakuThread_813FDF18(void* block) {
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
}
int RakuRakuThread::getState() {
@@ -202,7 +202,7 @@ int RakuRakuThread::getState() {
return 0;
}
BOOL interrupts = OSDisableInterrupts();
switch (sRakuStatus.progress.state) {
switch (RakuRakuThread_810BDDE0.progress.state) {
case 1: displayState = 1; break;
case 2: displayState = 2; break;
case 3: displayState = 2; break;
@@ -214,14 +214,14 @@ int RakuRakuThread::getState() {
}
if (displayState != 6 && displayState != 7 &&
((u32)OSGetTime() - (u32)startTime) / (OS_TIMER_CLOCK / 1000) >= 90000) {
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
}
OSRestoreInterrupts(interrupts);
return displayState;
}
int RakuRakuThread::cancel() {
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
return OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
}
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
@@ -231,23 +231,23 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
return 1;
}
s32 state = sRakuStatus.progress.state;
s32 state = RakuRakuThread_810BDDE0.progress.state;
if ((u32)(state - 6) > 1) {
return 0;
}
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
ATERMi_ApConfigGetResult(&RakuRakuThread_810BDDE0.configuration);
printInfo();
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
return 0;
}
SOFinish();
active = false;
destroy();
if (config != NULL) {
RakuConfiguration* settings = &sRakuStatus.configuration;
RakuConfiguration* settings = &RakuRakuThread_810BDDE0.configuration;
memcpy(config->ssid, settings->ssid, 32);
config->ssidLength = strlen(settings->ssid);
if (settings->security == 1) {
@@ -273,7 +273,7 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
}
if (result != NULL) {
*result = sRakuStatus.progress.result;
*result = RakuRakuThread_810BDDE0.progress.result;
}
return 1;
}

View File

@@ -36,7 +36,7 @@ namespace ipl {
}
TextWriter::TextWriter(EGG::Heap* heap)
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), mbResetAcceptable(true),
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), unk_0x7D(true),
mNwc24ErrCountdown(0) {
setSceneParentFlags(SCN_PARENTFLAG_DRAW | SCN_PARENTFLAG_CALC);
}
@@ -87,7 +87,7 @@ namespace ipl {
mSelectedFaceId = -1;
mpNigaoe = NULL;
mbClosing = false;
mbResetAcceptable = true;
unk_0x7D = true;
mNwc24ErrCountdown = 0;
// Text balloon for Mii face
@@ -398,7 +398,7 @@ namespace ipl {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
mbResetAcceptable = false;
unk_0x7D = false;
// Copy memo contents
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
@@ -412,7 +412,7 @@ namespace ipl {
closeNWC24();
mbResetAcceptable = true;
unk_0x7D = true;
// Receive sent memo
System::receiveImmediately();

View File

@@ -1,213 +0,0 @@
"""Compare relocated switch destinations after checking instructions with ctxdiff.
Usage: python jump_table_diff.py <unit> <function> [--table <reference-symbol>]
Paths follow ctxdiff.py: build/43U/{src,obj}/<unit>.o. Requires pyelftools.
Exit 0: all selected tables match (or no tables); 1: mismatch; 2: invalid or
ambiguous input. This checks relative destinations, not behavioral equivalence.
Automatic selection covers local jumptable_* symbols whose R_PPC_ADDR32 entries
all target the selected function. External callback tables/vtables are not
covered. Source locations are inferred from corresponding function relocations,
never from an assumption that both data sections have the same layout.
"""
import argparse
from dataclasses import dataclass
from pathlib import Path
import sys
from elftools.common.exceptions import ELFError
from elftools.elf.elffile import ELFFile
@dataclass(frozen=True)
class Symbol:
name: str
section: object
value: int
size: int
kind: str = "STT_OBJECT"
@dataclass(frozen=True)
class Relocation:
offset: int
kind: int
symbol: int
addend: int
@dataclass
class ObjectInfo:
sections: dict
symbols: list
relocations: dict
def symbol(self, name):
found = [s for s in self.symbols if s.name == name
and isinstance(s.section, int) and s.size]
if len(found) != 1:
raise ValueError("expected one defined symbol: " + name)
symbol = found[0]
if (symbol.section not in self.sections or symbol.value < 0
or symbol.size <= 0
or symbol.value + symbol.size > self.sections[symbol.section][1]):
raise ValueError("symbol is outside its section: " + name)
return symbol
def location(self, relocation):
if not 0 <= relocation.symbol < len(self.symbols):
raise ValueError("relocation symbol index is out of range")
symbol = self.symbols[relocation.symbol]
if not isinstance(symbol.section, int):
return None
if symbol.section not in self.sections:
raise ValueError("relocation symbol has an invalid section")
return symbol.section, symbol.value + relocation.addend
def relocs(self, section):
return self.relocations.get(section, {})
def read_object(path):
with open(path, "rb") as stream:
elf = ELFFile(stream)
if (elf.elfclass != 32 or elf.little_endian
or elf["e_machine"] != "EM_PPC" or elf["e_type"] != "ET_REL"):
raise ValueError("expected a relocatable big-endian ELF32 PowerPC object")
symtab = elf.get_section_by_name(".symtab")
if symtab is None:
raise ValueError("object has no .symtab")
symbols = [Symbol(s.name, s["st_shndx"], s["st_value"], s["st_size"],
s["st_info"]["type"]) for s in symtab.iter_symbols()]
sections = {}
relocations = {}
for index, section in enumerate(elf.iter_sections()):
sections[index] = (section.name, section["sh_size"])
if section["sh_type"] == "SHT_REL":
raise ValueError("REL relocations are unsupported; expected RELA")
if section["sh_type"] != "SHT_RELA":
continue
if elf.get_section(section["sh_link"]).name != ".symtab":
raise ValueError("relocation uses a different symbol table")
entries = relocations.setdefault(section["sh_info"], {})
for r in section.iter_relocations():
if r["r_offset"] in entries:
raise ValueError("multiple relocations at the same offset")
entries[r["r_offset"]] = Relocation(
r["r_offset"], r["r_info_type"], r["r_info_sym"], r["r_addend"])
return ObjectInfo(sections, symbols, relocations)
def jump_target(obj, relocation, function):
if relocation is None or relocation.kind != 1: # R_PPC_ADDR32
return None
location = obj.location(relocation)
if location is None or location[0] != function.section:
return None
offset = location[1] - function.value
if offset < 0 or offset >= function.size or offset % 4:
return None
return offset
def reference_tables(obj, function, name=None):
candidates = [obj.symbol(name)] if name else [
s for s in obj.symbols if s.name.startswith("jumptable_") and s.size]
result = []
for table in candidates:
if not isinstance(table.section, int) or table.size % 4:
if name:
raise ValueError("invalid reference table extent")
continue
section_size = obj.sections[table.section][1]
if table.value < 0 or table.value + table.size > section_size:
raise ValueError("reference table is outside its section")
targets = [jump_target(obj, obj.relocs(table.section).get(offset), function)
for offset in range(table.value, table.value + table.size, 4)]
if targets and all(target is not None for target in targets):
result.append((table, targets))
elif name:
raise ValueError("reference table does not target the selected function")
return result
def source_table_location(source, reference, source_fn, reference_fn, table):
if source_fn.size != reference_fn.size:
raise ValueError("function sizes differ; check ctxdiff before table matching")
locations = set()
for relocation in reference.relocs(reference_fn.section).values():
if not reference_fn.value <= relocation.offset < reference_fn.value + reference_fn.size:
continue
if reference.location(relocation) != (table.section, table.value):
continue
offset = source_fn.value + relocation.offset - reference_fn.value
other = source.relocs(source_fn.section).get(offset)
if other is None or other.kind != relocation.kind:
raise ValueError("table-reference relocations differ; check ctxdiff")
location = source.location(other)
if location is None:
raise ValueError("source table reference is undefined")
if source.sections[location[0]][0] != reference.sections[table.section][0]:
raise ValueError("source table resolves to a different section")
locations.add(location)
if len(locations) != 1:
raise ValueError("cannot infer one source table from function relocations")
section, offset = next(iter(locations))
sizes = {s.size for s in source.symbols if s.section == section
and s.value == offset and s.size and s.kind != "STT_SECTION"}
if len(sizes) != 1:
raise ValueError("source table extent is missing or ambiguous")
size = next(iter(sizes))
if size % 4 or offset < 0 or offset + size > source.sections[section][1]:
raise ValueError("invalid source table extent")
return section, offset, size
def compare_table(source, reference, source_fn, reference_fn, table, expected):
section, offset, size = source_table_location(
source, reference, source_fn, reference_fn, table)
actual = [jump_target(source, source.relocs(section).get(i), source_fn)
for i in range(offset, offset + size, 4)]
differences = []
for i in range(max(len(actual), len(expected))):
src = actual[i] if i < len(actual) else None
ref = expected[i] if i < len(expected) else None
if i >= min(len(actual), len(expected)) or src != ref:
differences.append((i, src, ref))
return actual, differences
def main(argv=None):
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("unit", help="e.g. src/scene/sdChannelSelect/iplSDChannelSelect")
parser.add_argument("function", help="exact function symbol used by ctxdiff")
parser.add_argument("--table", help="optional exact reference jump-table symbol")
args = parser.parse_args(argv)
try:
source = read_object(Path("build/43U/src") / (args.unit + ".o"))
reference = read_object(Path("build/43U/obj") / (args.unit + ".o"))
source_fn = source.symbol(args.function)
reference_fn = reference.symbol(args.function)
tables = reference_tables(reference, reference_fn, args.table)
mismatch = False
for table, expected in tables:
actual, differences = compare_table(
source, reference, source_fn, reference_fn, table, expected)
matched = sum(a == b for a, b in zip(actual, expected))
print("%s: %d/%d entries match (source=%d reference=%d)" %
(table.name, matched, len(expected), len(actual), len(expected)))
for index, src, ref in differences:
src_text = "unresolved/missing" if src is None else "+0x%X" % src
ref_text = "missing" if ref is None else "+0x%X" % ref
print(" [%d] source %s; reference %s" % (index, src_text, ref_text))
mismatch |= bool(differences)
print("Compared %d jump table(s); instruction correctness requires ctxdiff." % len(tables))
return 1 if mismatch else 0
except (OSError, ValueError, ELFError) as error:
print("ERROR: %s" % error, file=sys.stderr)
return 2
if __name__ == "__main__":
sys.exit(main())

View File

@@ -1,159 +0,0 @@
import contextlib
from dataclasses import replace
import io
import unittest
from unittest.mock import patch
import jump_table_diff as tool
def fixture(entries=(0x10, 0x20, 0x30), function_offset=0x100,
table_offset=0x40, source=False, section_ids=(1, 2)):
text, data = section_ids
symbols = [
tool.Symbol("dispatch", text, function_offset, 0x80, "STT_FUNC"),
tool.Symbol("@123" if source else "jumptable_test", data,
table_offset, len(entries) * 4),
]
references = {
text: {
function_offset + 2: tool.Relocation(function_offset + 2, 6, 1, 0),
function_offset + 6: tool.Relocation(function_offset + 6, 4, 1, 0),
},
data: {table_offset + i * 4: tool.Relocation(table_offset + i * 4, 1, 0, value)
for i, value in enumerate(entries)},
}
return tool.ObjectInfo({text: (".text", 0x1000), data: (".data", 0x1000)},
symbols, references)
def compare(source, reference=None):
reference = reference or fixture()
src_fn = source.symbol("dispatch")
ref_fn = reference.symbol("dispatch")
table, expected = tool.reference_tables(reference, ref_fn, "jumptable_test")[0]
return tool.compare_table(source, reference, src_fn, ref_fn, table, expected)
class JumpTableTests(unittest.TestCase):
def test_infers_shifted_source_table_and_function(self):
source = fixture(source=True, function_offset=0x200, table_offset=0x90,
section_ids=(3, 4))
self.assertEqual(compare(source), ([0x10, 0x20, 0x30], []))
def test_detects_swapped_destinations_despite_same_function_size(self):
actual, differences = compare(fixture((0x20, 0x10, 0x30), source=True))
self.assertEqual(actual, [0x20, 0x10, 0x30])
self.assertEqual(differences, [(0, 0x20, 0x10), (1, 0x10, 0x20)])
def test_section_relative_code_reference(self):
source = fixture(source=True, table_offset=0x90)
source.symbols.append(tool.Symbol("", 2, 0, 0, "STT_SECTION"))
for offset, relocation in list(source.relocations[1].items()):
source.relocations[1][offset] = replace(relocation, symbol=2, addend=0x90)
self.assertEqual(compare(source)[1], [])
def test_section_relative_table_entries(self):
source = fixture(source=True)
source.symbols.append(tool.Symbol("", 1, 0, 0, "STT_SECTION"))
for offset, relocation in list(source.relocations[2].items()):
source.relocations[2][offset] = replace(
relocation, symbol=2, addend=0x100 + relocation.addend)
self.assertEqual(compare(source)[1], [])
def test_missing_entry_is_mismatch(self):
source = fixture(source=True)
del source.relocations[2][0x44]
self.assertEqual(compare(source)[1], [(1, None, 0x20)])
def test_wrong_relocation_kind_is_mismatch(self):
source = fixture(source=True)
source.relocations[2][0x44] = replace(source.relocations[2][0x44], kind=10)
self.assertEqual(compare(source)[1], [(1, None, 0x20)])
def test_out_of_function_destination_is_mismatch(self):
source = fixture(source=True)
source.relocations[2][0x44] = replace(source.relocations[2][0x44], addend=0x80)
self.assertEqual(compare(source)[1], [(1, None, 0x20)])
def test_extra_source_entry_is_not_a_pass(self):
self.assertEqual(compare(fixture((0x10, 0x20, 0x30, 0x40), source=True))[1],
[(3, 0x40, None)])
def test_short_source_table_is_not_a_pass(self):
self.assertEqual(compare(fixture((0x10, 0x20), source=True))[1],
[(2, None, 0x30)])
def test_different_function_sizes_reject_inference(self):
source = fixture(source=True)
source.symbols[0] = replace(source.symbols[0], size=0x84)
with self.assertRaisesRegex(ValueError, "function sizes differ"):
compare(source)
def test_disagreeing_code_references_reject_inference(self):
source = fixture(source=True)
source.relocations[1][0x106] = replace(source.relocations[1][0x106], addend=4)
with self.assertRaisesRegex(ValueError, "infer one source table"):
compare(source)
def test_missing_code_reference_rejects_inference(self):
source = fixture(source=True)
del source.relocations[1][0x106]
with self.assertRaisesRegex(ValueError, "table-reference relocations differ"):
compare(source)
def test_ambiguous_source_extent_rejects_inference(self):
source = fixture(source=True)
source.symbols.append(tool.Symbol("alias", 2, 0x40, 16))
with self.assertRaisesRegex(ValueError, "extent is missing or ambiguous"):
compare(source)
def test_different_source_section_rejects_inference(self):
source = fixture(source=True)
source.sections[2] = (".rodata", 0x1000)
with self.assertRaisesRegex(ValueError, "different section"):
compare(source)
def test_undefined_source_reference_rejects_inference(self):
source = fixture(source=True)
source.symbols[1] = replace(source.symbols[1], section="SHN_UNDEF")
with self.assertRaisesRegex(ValueError, "reference is undefined"):
compare(source)
def test_invalid_relocation_symbol_rejected(self):
source = fixture(source=True)
source.relocations[2][0x44] = replace(source.relocations[2][0x44], symbol=999)
with self.assertRaisesRegex(ValueError, "symbol index is out of range"):
compare(source)
def test_duplicate_function_rejected(self):
source = fixture(source=True)
source.symbols.append(source.symbols[0])
with self.assertRaisesRegex(ValueError, "one defined symbol"):
compare(source)
def test_out_of_section_symbol_rejected(self):
source = fixture(source=True)
source.symbols[0] = replace(source.symbols[0], size=0x2000)
with self.assertRaisesRegex(ValueError, "outside its section"):
compare(source)
def test_unrelated_reference_table_is_not_selected(self):
reference = fixture((0x80, 0x84, 0x88))
self.assertEqual(tool.reference_tables(reference, reference.symbol("dispatch")), [])
with self.assertRaisesRegex(ValueError, "does not target"):
tool.reference_tables(reference, reference.symbol("dispatch"), "jumptable_test")
def test_cli_exit_codes(self):
for source, expected_status in [(fixture(source=True), 0),
(fixture((0x20, 0x10, 0x30), source=True), 1)]:
with patch.object(tool, "read_object", side_effect=[source, fixture()]):
with contextlib.redirect_stdout(io.StringIO()):
self.assertEqual(tool.main(["unused", "dispatch"]), expected_status)
with patch.object(tool, "read_object", side_effect=ValueError("bad object")):
with contextlib.redirect_stderr(io.StringIO()):
self.assertEqual(tool.main(["unused", "dispatch"]), 2)
if __name__ == "__main__":
unittest.main()