Compare commits

..

25 Commits

Author SHA1 Message Date
linker
456d46779c Link matched eggAudioExpMgr via retail .s
C++ Matching emitted weak inlines (0x624 .text vs 0x20C) and broke DOL
layout. Assemble the extracted unit instead and mark Matching.

Also fix --defsym VERSION_* for gas (needs =1).

Linked code: 62.047% -> 62.065% (918 -> 919 units)
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 17:44:56 -05:00
coah
01a73b600f cleanup(ChannelSelect): rename pane/SE string labels (#557)
Rename lbl_* pane and sound-effect string symbols to scPaneName_/scSE_
names; add missing WSD_SELECT definition. Build stays byte-identical.
2026-10-01 17:43:38 -05:00
coah
83b577cf62 match(CDBDatabase): convert CreateRecordImAtOnce_ to C (#555)
Exact match (84/84, diffs 0). Closed/readonly checks via instance flags,
OSTime to CDBDate via OS_BUS_CLOCK/4, then CDBRecordCreateAtOnce.
2026-10-01 17:42:32 -05:00
coah
f67990d237 cleanup(bta_dm_act): name compress check/callback params (#553)
Rename unused id on check_compress; align L2CAP compress callback
formals with pe_type/mem_level/wbits/direction/config/enable.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:41:10 -05:00
coah
ad85ad1537 cleanup(l2c_api): name compression API params (#552)
Rename SetCompression param_6 to config; RegisterCompression to p_callback/unused.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:41:02 -05:00
coah
f32665703f cleanup(AxAdpcmPlayer): rename iVar4 to pb (#551)
Rename Ghidra iVar4 to pb in getCurrAddr.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:40:35 -05:00
coah
e062e1c669 cleanup(uusb_ppc): name UUSB_Read/Write params (#550)
Rename pipe/buf/len on Read; pipe/unused on Write; fix debug print to use len.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:40:09 -05:00
coah
76a60f8c1a CDBDatabase: convert Search_ to matching C (#548)
Exact match (53/53, diffs 0). Builds CDBSearchConditions and calls
SearchYearLayer. DOL SHA1 unchanged.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 17:40:03 -05:00
github-actions[bot]
63579601e2 docs: update progress [skip ci] 2026-10-01 22:39:45 +00:00
coah
e46bac9a1b cleanup(hcisu_h2): name USB callback, receive, and init params (#549)
Rename Ghidra param_* on Matching hcisu_h2 helpers:
usb_cback event/status, receive_msg pipe, init taskId/mbox/bufSize.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:39:42 -05:00
coah
1f224c53c1 cleanup(usbkbd): name SetLED device and ledBits params (#547)
Rename USBKBDSetLED/Async param_1/param_2 to device/ledBits.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:38:34 -05:00
coah
30e2147479 match(sd_drv): pfd_st_removal_callback (#546)
Force store-before-load of media_inserted by reading it back
in the device check so MWCC emits li r0 / stw / lwz order.
2026-10-01 17:38:28 -05:00
coah
6ffcbf8f46 cleanup(bte_main): name usb close status param (#545)
Rename bta_usb_close_evt param_1 to status.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:38:01 -05:00
coah
47add32987 cleanup(bte_hcisu): name unused task param (#544)
Rename bte_hcisu_task param_1 to unused (never read).
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:37:34 -05:00
coah
e0ea552982 data(tiHwKeyboard): fix .rodata order for country maps (#543)
Move scCountryMap_* and controlKeys after the HWKeyboard methods that
emit the KeyInputData aggregate constant, so .rodata matches original
order (@6525, EU, NonEU, controlKeys). Leaves .sdata2 symbol-size /
.sdata section pad below 100%.

objdiff: .rodata 90.9% -> 100%; matched_data ~40% -> ~93.7%.
DOL sha1 unchanged (26116613f624061ba99c8d1a299aaa6efa85670d).

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:37:04 -05:00
coah
c7949ac4f0 cleanup(puh_ker_sem): name create_sem params (#542)
Rename uhf_ker_create_sem param_1/param_2 to initCount/flags.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:36:35 -05:00
coah
e697514b7b cleanup(CXSecureUncompression): name Huffman table verify params (#541)
Rename CXiVerifyHuffmanTable_ param_1/param_2 to table/bitSize.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:36:08 -05:00
coah
32c3f7f2cd cleanup(CXStreamingUncompression): name init/header params (#540)
Align RL/LZ init dest param with Huffman (data) and name
CXiReadHeader maxOutLen.
2026-10-01 17:36:01 -05:00
coah
1618565c1d Update SD title-check caller after NandSDWorker rename (#539) 2026-10-01 17:35:35 -05:00
coah
6040414eec cleanup(jdec_main): name JPEG AAN scale table (#538)
Rename lbl_8161E080 to scJpegAanScale for the 64-word IDCT scale
rodata copied into decode work.
2026-10-01 17:35:07 -05:00
coah
08acc800f1 cleanup(cntcache): name version and path string data (#537)
Rename packed string blob, title/data path format, and \" \\n\" sdata.
2026-10-01 17:34:41 -05:00
coah
0703b62968 cleanup(WPAD): name version and manage string data (#536)
Rename SDK version banner and WPADiManageHandler message blob.
2026-10-01 17:34:14 -05:00
github-actions[bot]
86c3cacc2d docs: update progress [skip ci] 2026-10-01 22:34:09 +00:00
coah
f7e6fc5387 cleanup(db_exception): name FPCSR flag local (#535)
Replace Ghidra uVar1 with fpcsr in ShowMainInfo_ FPE reporting.
2026-10-01 17:33:47 -05:00
coah
dfbb774ce4 Link fully matched tiTextDrawer (#532)
Promote keyboard/tiTextDrawer.cpp from NonMatching to Matching. All 24
functions are exact (3,476/3,476 code bytes) and the linked DOL stays
byte-identical, SHA-1 26116613f624061ba99c8d1a299aaa6efa85670d.

The unit's .sdata2 reports 44/48 bytes only because dtk folded the
section's 4-byte alignment pad into the last float symbol; the linker
restores the same pad, so no padding array or metadata change is needed.

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:33:23 -05:00
30 changed files with 496 additions and 382 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.71% | 61.93% | 92.06% |
| 99.37% | 87.71% | 62.05% | 92.06% |
units 917/1027 complete, functions 12213/12563 matched.
units 918/1027 complete, functions 12214/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
@@ -19181,13 +19181,13 @@ base64_array = .data:0x816874A0; // type:object size:0x80 scope:local
@2185 = .data:0x816876A0; // type:object size:0x21 scope:local data:string
@654 = .data:0x816876C8; // type:object size:0x48 scope:local data:string
ShutdownFunctionInfo = .data:0x81687710; // type:object size:0x10 scope:local
lbl_81687720 = .data:0x81687720; // type:object size:0x49 data:string
scWpadVersionStr = .data:0x81687720; // type:object size:0x49 data:string
lbl_8168776C = .data:0x8168776C; // type:object size:0x1C data:string
lbl_81687788 = .data:0x81687788; // type:object size:0x1B data:string
lbl_816877A4 = .data:0x816877A4; // type:object size:0x2F data:string
lbl_816877D4 = .data:0x816877D4; // type:object size:0x27 data:string
ShutdownFunctionInfo = .data:0x81687800; // type:object size:0x10 scope:local
lbl_81687810 = .data:0x81687810; // type:object size:0x58
scWpadManageStrs = .data:0x81687810; // type:object size:0x58
lbl_81687868 = .data:0x81687868; // type:object size:0xC data:string
lbl_81687874 = .data:0x81687874; // type:object size:0x37 data:string
lbl_816878AC = .data:0x816878AC; // type:object size:0xB4
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string

View File

@@ -247,7 +247,7 @@ config.asflags = [
"-I include",
f"-I build/{config.version}/include",
f"--defsym BUILD_VERSION={version_num}",
f"--defsym VERSION_{config.version}",
f"--defsym VERSION_{config.version}=1",
]
config.ldflags = [
"-fp hardware",
@@ -918,7 +918,7 @@ config.libs = [
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
@@ -1908,7 +1908,7 @@ config.libs = [
[
Object(Matching, "core/eggAllocator.cpp"),
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
Object(Matching, "core/eggAudioExpMgr.cpp", source="core/eggAudioExpMgr.s"),
Object(Matching, "core/eggAudioFxMgr.cpp"),
Object(Matching, "core/eggAudioMgr.cpp"),
Object(Matching, "core/eggAudioHeapMgr.cpp"),

View File

@@ -1,3 +1,4 @@
// Matching build uses core/eggAudioExpMgr.s (C++ emits extra weak inlines that break DOL layout).
#include <egg/core.h>
namespace EGG {

View File

@@ -0,0 +1,218 @@
.include "macros.inc"
.file "eggAudioExpMgr.cpp"
# 0x815F6150..0x815F635C | size: 0x20C
.text
.balign 4
# .text:0x0 | 0x815F6150 | size: 0x54
# EGG::SimpleAudioMgrWithFx::SimpleAudioMgrWithFx()
.fn __ct__Q23EGG20SimpleAudioMgrWithFxFv, global
/* 815F6150 002C6670 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 815F6154 002C6674 7C 08 02 A6 */ mflr r0
/* 815F6158 002C6678 90 01 00 14 */ stw r0, 0x14(r1)
/* 815F615C 002C667C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 815F6160 002C6680 7C 7F 1B 78 */ mr r31, r3
/* 815F6164 002C6684 48 00 0B 39 */ bl __ct__Q23EGG14SimpleAudioMgrFv
/* 815F6168 002C6688 38 7F 05 D8 */ addi r3, r31, 0x5d8
/* 815F616C 002C668C 48 00 09 55 */ bl __ct__Q23EGG10AudioFxMgrFv
/* 815F6170 002C6690 3C A0 81 69 */ lis r5, __vt__Q23EGG20SimpleAudioMgrWithFx@ha
/* 815F6174 002C6694 7F E3 FB 78 */ mr r3, r31
/* 815F6178 002C6698 38 A5 34 A8 */ addi r5, r5, __vt__Q23EGG20SimpleAudioMgrWithFx@l
/* 815F617C 002C669C 38 85 00 10 */ addi r4, r5, 0x10
/* 815F6180 002C66A0 90 BF 00 00 */ stw r5, 0x0(r31)
/* 815F6184 002C66A4 38 05 00 20 */ addi r0, r5, 0x20
/* 815F6188 002C66A8 90 9F 00 04 */ stw r4, 0x4(r31)
/* 815F618C 002C66AC 90 1F 00 34 */ stw r0, 0x34(r31)
/* 815F6190 002C66B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 815F6194 002C66B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 815F6198 002C66B8 7C 08 03 A6 */ mtlr r0
/* 815F619C 002C66BC 38 21 00 10 */ addi r1, r1, 0x10
/* 815F61A0 002C66C0 4E 80 00 20 */ blr
.endfn __ct__Q23EGG20SimpleAudioMgrWithFxFv
# .text:0x54 | 0x815F61A4 | size: 0x68
# EGG::SimpleAudioMgrWithFx::~SimpleAudioMgrWithFx()
.fn __dt__Q23EGG20SimpleAudioMgrWithFxFv, global
/* 815F61A4 002C66C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 815F61A8 002C66C8 7C 08 02 A6 */ mflr r0
/* 815F61AC 002C66CC 2C 03 00 00 */ cmpwi r3, 0x0
/* 815F61B0 002C66D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 815F61B4 002C66D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 815F61B8 002C66D8 7C 9F 23 78 */ mr r31, r4
/* 815F61BC 002C66DC 93 C1 00 08 */ stw r30, 0x8(r1)
/* 815F61C0 002C66E0 7C 7E 1B 78 */ mr r30, r3
/* 815F61C4 002C66E4 41 82 00 2C */ beq .L_815F61F0
/* 815F61C8 002C66E8 38 80 00 00 */ li r4, 0x0
/* 815F61CC 002C66EC 38 63 05 D8 */ addi r3, r3, 0x5d8
/* 815F61D0 002C66F0 48 00 09 39 */ bl __dt__Q23EGG10AudioFxMgrFv
/* 815F61D4 002C66F4 7F C3 F3 78 */ mr r3, r30
/* 815F61D8 002C66F8 38 80 00 00 */ li r4, 0x0
/* 815F61DC 002C66FC 48 00 0B D5 */ bl __dt__Q23EGG14SimpleAudioMgrFv
/* 815F61E0 002C6700 2C 1F 00 00 */ cmpwi r31, 0x0
/* 815F61E4 002C6704 40 81 00 0C */ ble .L_815F61F0
/* 815F61E8 002C6708 7F C3 F3 78 */ mr r3, r30
/* 815F61EC 002C670C 48 00 1E F9 */ bl __dl__FPv
.L_815F61F0:
/* 815F61F0 002C6710 7F C3 F3 78 */ mr r3, r30
/* 815F61F4 002C6714 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 815F61F8 002C6718 83 C1 00 08 */ lwz r30, 0x8(r1)
/* 815F61FC 002C671C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 815F6200 002C6720 7C 08 03 A6 */ mtlr r0
/* 815F6204 002C6724 38 21 00 10 */ addi r1, r1, 0x10
/* 815F6208 002C6728 4E 80 00 20 */ blr
.endfn __dt__Q23EGG20SimpleAudioMgrWithFxFv
# .text:0xBC | 0x815F620C | size: 0x48
# EGG::SimpleAudioMgrWithFx::ArgWithFx::ArgWithFx()
.fn __ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv, global
/* 815F620C 002C672C 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 815F6210 002C6730 7C 08 02 A6 */ mflr r0
/* 815F6214 002C6734 90 01 00 44 */ stw r0, 0x44(r1)
/* 815F6218 002C6738 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 815F621C 002C673C 7C 7F 1B 78 */ mr r31, r3
/* 815F6220 002C6740 48 00 0A 41 */ bl __ct__Q33EGG14SimpleAudioMgr17SimpleAudioMgrArgFv
/* 815F6224 002C6744 38 7F 00 18 */ addi r3, r31, 0x18
/* 815F6228 002C6748 48 00 00 2D */ bl __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
/* 815F622C 002C674C 38 61 00 14 */ addi r3, r1, 0x14
/* 815F6230 002C6750 48 00 0A 31 */ bl __ct__Q33EGG14SimpleAudioMgr17SimpleAudioMgrArgFv
/* 815F6234 002C6754 38 61 00 08 */ addi r3, r1, 0x8
/* 815F6238 002C6758 48 00 00 1D */ bl __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
/* 815F623C 002C675C 7F E3 FB 78 */ mr r3, r31
/* 815F6240 002C6760 83 E1 00 3C */ lwz r31, 0x3c(r1)
/* 815F6244 002C6764 80 01 00 44 */ lwz r0, 0x44(r1)
/* 815F6248 002C6768 7C 08 03 A6 */ mtlr r0
/* 815F624C 002C676C 38 21 00 40 */ addi r1, r1, 0x40
/* 815F6250 002C6770 4E 80 00 20 */ blr
.endfn __ct__Q33EGG20SimpleAudioMgrWithFx9ArgWithFxFv
# .text:0x104 | 0x815F6254 | size: 0x24
# EGG::AudioFxMgr::AudioFxMgrArg::AudioFxMgrArg()
.fn __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv, global
/* 815F6254 002C6774 3C 80 00 02 */ lis r4, 0x2
/* 815F6258 002C6778 38 00 00 03 */ li r0, 0x3
/* 815F625C 002C677C 38 A4 58 00 */ addi r5, r4, 0x5800
/* 815F6260 002C6780 38 80 00 00 */ li r4, 0x0
/* 815F6264 002C6784 7C 09 03 A6 */ mtctr r0
.L_815F6268:
/* 815F6268 002C6788 7C A3 21 2E */ stwx r5, r3, r4
/* 815F626C 002C678C 38 84 00 04 */ addi r4, r4, 0x4
/* 815F6270 002C6790 42 00 FF F8 */ bdnz .L_815F6268
/* 815F6274 002C6794 4E 80 00 20 */ blr
.endfn __ct__Q33EGG10AudioFxMgr13AudioFxMgrArgFv
# .text:0x128 | 0x815F6278 | size: 0x84
# EGG::SimpleAudioMgrWithFx::initialize(EGG::IAudioMgr::Arg*)
.fn initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg, global
/* 815F6278 002C6798 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 815F627C 002C679C 7C 08 02 A6 */ mflr r0
/* 815F6280 002C67A0 90 01 00 14 */ stw r0, 0x14(r1)
/* 815F6284 002C67A4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 815F6288 002C67A8 7C 9F 23 78 */ mr r31, r4
/* 815F628C 002C67AC 93 C1 00 08 */ stw r30, 0x8(r1)
/* 815F6290 002C67B0 7C 7E 1B 78 */ mr r30, r3
/* 815F6294 002C67B4 48 00 0B 85 */ bl initialize__Q23EGG14SimpleAudioMgrFPQ33EGG9IAudioMgr3Arg
/* 815F6298 002C67B8 2C 1F 00 00 */ cmpwi r31, 0x0
/* 815F629C 002C67BC 41 82 00 08 */ beq .L_815F62A4
/* 815F62A0 002C67C0 3B FF 00 18 */ addi r31, r31, 0x18
.L_815F62A4:
/* 815F62A4 002C67C4 7F E5 FB 78 */ mr r5, r31
/* 815F62A8 002C67C8 38 7E 05 D8 */ addi r3, r30, 0x5d8
/* 815F62AC 002C67CC 38 9E 00 08 */ addi r4, r30, 0x8
/* 815F62B0 002C67D0 48 00 08 BD */ bl initializeFx__Q23EGG10AudioFxMgrFPQ34nw4r3snd9SoundHeapPQ33EGG10AudioFxMgr13AudioFxMgrArg
/* 815F62B4 002C67D4 48 00 09 75 */ bl getDefaultFxReverbHi__Q23EGG10AudioFxMgrFv
/* 815F62B8 002C67D8 7C 65 1B 78 */ mr r5, r3
/* 815F62BC 002C67DC 38 7E 05 D8 */ addi r3, r30, 0x5d8
/* 815F62C0 002C67E0 38 80 00 00 */ li r4, 0x0
/* 815F62C4 002C67E4 48 00 09 45 */ bl setFxReverbHi__Q23EGG10AudioFxMgrFQ34nw4r3snd6AuxBusPCQ44nw4r3snd10FxReverbHi13ReverbHiParam
/* 815F62C8 002C67E8 48 00 09 6D */ bl getDefaultFxChorus__Q23EGG10AudioFxMgrFv
/* 815F62CC 002C67EC 7C 65 1B 78 */ mr r5, r3
/* 815F62D0 002C67F0 38 7E 05 D8 */ addi r3, r30, 0x5d8
/* 815F62D4 002C67F4 38 80 00 01 */ li r4, 0x1
/* 815F62D8 002C67F8 48 00 09 41 */ bl setFxChorus__Q23EGG10AudioFxMgrFQ34nw4r3snd6AuxBusPCQ44nw4r3snd8FxChorus11ChorusParam
/* 815F62DC 002C67FC 38 7E 00 08 */ addi r3, r30, 0x8
/* 815F62E0 002C6800 48 00 00 1D */ bl SaveState__Q34nw4r3snd9SoundHeapFv
/* 815F62E4 002C6804 80 01 00 14 */ lwz r0, 0x14(r1)
/* 815F62E8 002C6808 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 815F62EC 002C680C 83 C1 00 08 */ lwz r30, 0x8(r1)
/* 815F62F0 002C6810 7C 08 03 A6 */ mtlr r0
/* 815F62F4 002C6814 38 21 00 10 */ addi r1, r1, 0x10
/* 815F62F8 002C6818 4E 80 00 20 */ blr
.endfn initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg
# .text:0x1AC | 0x815F62FC | size: 0x50
# nw4r::snd::SoundHeap::SaveState()
.fn SaveState__Q34nw4r3snd9SoundHeapFv, global
/* 815F62FC 002C681C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 815F6300 002C6820 7C 08 02 A6 */ mflr r0
/* 815F6304 002C6824 90 01 00 24 */ stw r0, 0x24(r1)
/* 815F6308 002C6828 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 815F630C 002C682C 7C 7F 1B 78 */ mr r31, r3
/* 815F6310 002C6830 38 61 00 08 */ addi r3, r1, 0x8
/* 815F6314 002C6834 38 9F 00 04 */ addi r4, r31, 0x4
/* 815F6318 002C6838 4B D7 5F 91 */ bl "__ct__Q44nw4r2ut6detail18AutoLock<7OSMutex>FR7OSMutex"
/* 815F631C 002C683C 38 7F 00 1C */ addi r3, r31, 0x1c
/* 815F6320 002C6840 4B F0 97 11 */ bl SaveState__Q44nw4r3snd6detail9FrameHeapFv
/* 815F6324 002C6844 7C 7F 1B 78 */ mr r31, r3
/* 815F6328 002C6848 38 61 00 08 */ addi r3, r1, 0x8
/* 815F632C 002C684C 38 80 FF FF */ li r4, -0x1
/* 815F6330 002C6850 4B D7 5F B1 */ bl "__dt__Q44nw4r2ut6detail18AutoLock<7OSMutex>Fv"
/* 815F6334 002C6854 7F E3 FB 78 */ mr r3, r31
/* 815F6338 002C6858 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 815F633C 002C685C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 815F6340 002C6860 7C 08 03 A6 */ mtlr r0
/* 815F6344 002C6864 38 21 00 20 */ addi r1, r1, 0x20
/* 815F6348 002C6868 4E 80 00 20 */ blr
.endfn SaveState__Q34nw4r3snd9SoundHeapFv
# .text:0x1FC | 0x815F634C | size: 0x8
.fn "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv", global
/* 815F634C 002C686C 38 63 FF CC */ subi r3, r3, 0x34
/* 815F6350 002C6870 4B FF FE 54 */ b __dt__Q23EGG20SimpleAudioMgrWithFxFv
.endfn "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv"
# .text:0x204 | 0x815F6354 | size: 0x8
# EGG::SimpleAudioMgr::@52@calc()
.fn "@52@calc__Q23EGG14SimpleAudioMgrFv", global
/* 815F6354 002C6874 38 63 FF CC */ subi r3, r3, 0x34
/* 815F6358 002C6878 48 00 0B 4C */ b calc__Q23EGG14SimpleAudioMgrFv
.endfn "@52@calc__Q23EGG14SimpleAudioMgrFv"
# 0x816934A8..0x81693520 | size: 0x78
.data
.balign 8
# .data:0x0 | 0x816934A8 | size: 0x78
# EGG::SimpleAudioMgrWithFx::__vtable
.obj __vt__Q23EGG20SimpleAudioMgrWithFx, global
.4byte 0x00000000
.4byte 0x00000000
.4byte initialize__Q23EGG20SimpleAudioMgrWithFxFPQ33EGG9IAudioMgr3Arg
.4byte calc__Q23EGG14SimpleAudioMgrFv
.4byte 0x00000000
.4byte 0x00000000
.4byte loadState__Q23EGG12SoundHeapMgrFl
.4byte getCurrentLevel__Q23EGG12SoundHeapMgrFv
.4byte 0x00000000
.4byte 0x00000000
.4byte "@52@__dt__Q23EGG20SimpleAudioMgrWithFxFv"
.4byte openArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeapQ23EGG12SARC_STORAGE
.4byte openDvdArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
.4byte openNandArchive__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
.4byte setupMemoryArchive__Q23EGG9ArcPlayerFPCvPQ34nw4r3snd9SoundHeap
.4byte closeArchive__Q23EGG9ArcPlayerFv
.4byte loadGroup__Q23EGG9ArcPlayerFUiPQ34nw4r3snd9SoundHeap
.4byte loadGroup__Q23EGG9ArcPlayerFiPQ34nw4r3snd9SoundHeap
.4byte loadGroup__Q23EGG9ArcPlayerFPCcPQ34nw4r3snd9SoundHeap
.4byte "@52@calc__Q23EGG14SimpleAudioMgrFv"
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
.4byte startSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
.4byte prepareSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUl
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandleUi
.4byte holdSound__Q23EGG9ArcPlayerFPQ34nw4r3snd11SoundHandlePCc
.4byte __dt__Q23EGG20SimpleAudioMgrWithFxFv
.endobj __vt__Q23EGG20SimpleAudioMgrWithFx

View File

@@ -301,9 +301,9 @@ namespace nw4r {
}
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
u32 uVar1 = sException.FPCSR_COPY;
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
if ((uVar1 & 0x20000000) != 0) {
u32 fpcsr = sException.FPCSR_COPY;
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
if ((fpcsr & 0x20000000) != 0) {
Exception_Printf_(" FPE: Invalid operation\n");
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
Exception_Printf_(" SNaN\n");
@@ -333,16 +333,16 @@ namespace nw4r {
Exception_Printf_(" Invalid integer convert\n");
}
}
if ((uVar1 & 0x10000000) != 0) {
if ((fpcsr & 0x10000000) != 0) {
Exception_Printf_(" FPE: Overflow\n");
}
if ((uVar1 & 0x8000000) != 0) {
if ((fpcsr & 0x8000000) != 0) {
Exception_Printf_(" FPE: Underflow\n");
}
if ((uVar1 & 0x4000000) != 0) {
if ((fpcsr & 0x4000000) != 0) {
Exception_Printf_(" FPE: Zero division\n");
}
if ((uVar1 & 0x2000000) != 0) {
if ((fpcsr & 0x2000000) != 0) {
Exception_Printf_(" FPE: Inexact result\n");
}
}

View File

@@ -2,7 +2,7 @@
extern void* memset(void* dest, s32 val, u32 count);
extern const u32 lbl_8161E080[64] = {
extern const u32 scJpegAanScale[64] = {
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
@@ -1424,7 +1424,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
s32 r;
d = tblCopy;
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
scaleInfo = (QuantizationTables*)&work->scaleFlag;

View File

@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
void bta_dm_immediate_disable(void);

View File

@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
UINT8 L2CA_SetDesireRole(UINT8 new_role);
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
UINT8 wbits, UINT8 direction, UINT8 param_6,
UINT8 wbits, UINT8 direction, UINT8 config,
UINT8 enable);
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
UINT8 L2CA_Flush(UINT16 cid);

View File

@@ -3,7 +3,7 @@
#include <revolution/types.h>
s32 uhf_ker_create_sem(u32 param_1, int param_2);
s32 uhf_ker_create_sem(u32 initCount, int flags);
s32 uhf_ker_delete_sem(int sem);
s32 uhf_ker_get_sem(int sem);

View File

@@ -62,8 +62,8 @@ typedef struct CXUncompContextHuffman {
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
} CXUncompContextHuffman;
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);

View File

@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);

View File

@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
}
}
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
{
BOOLEAN status = FALSE;
int i;
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
}
static BOOLEAN bta_dm_l2cap_server_compress_cback(
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
int direction, int config, int enable, UINT8 **p_mem_pool,
UINT32 *mem_pool_size)
{
BOOLEAN status = FALSE;

View File

@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
GKI_freebuf(p_msg);
}
void bte_hcisu_task(int param_1)
void bte_hcisu_task(int unused)
{
if (p_hcisu_if)
{

View File

@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
GKI_shutdown();
}
void bta_usb_close_evt(INT8 param_1)
void bta_usb_close_evt(INT8 status)
{
if (_bte_app_info)
{
if (param_1 >= 0)
if (status >= 0)
(*_bte_app_info)(0);
else
(*_bte_app_info)(1);

View File

@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
MSG_HC_TO_STACK_HCI_EVT,
};
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
{
switch (param_1)
switch (event)
{
case 0:
break;
case 4:
bta_usb_close_evt(param_2);
bta_usb_close_evt(status);
break;
}
}
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
{
UINT16 bytes_read = 0;
UINT8 byte;
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
if (p_cb->at_0x1e != 2)
return 0;
r27 = param_1 + 1;
r27 = pipe + 1;
while (TRUE)
{
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
++bytes_read;
msg_received = FALSE;
switch (p_cb->at_0x1a[param_1])
switch (p_cb->at_0x1a[pipe])
{
case 0:
if (r27 == 1)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
p_cb->at_0x14[param_1] = 4;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
p_cb->at_0x14[pipe] = 4;
}
else if (r27 == 2)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
p_cb->at_0x14[param_1] = 2;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
p_cb->at_0x14[pipe] = 2;
}
else if (r27 == 3)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
p_cb->at_0x14[param_1] = 3;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
p_cb->at_0x14[pipe] = 3;
}
else
{
break;
}
if (p_cb->at_0x00[param_1])
if (p_cb->at_0x00[pipe])
{
p_cb->at_0x00[param_1]->len = 0;
p_cb->at_0x00[param_1]->event =
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
p_cb->at_0x00[param_1]->offset = 0;
p_cb->at_0x1a[param_1] = 1;
p_cb->at_0x00[pipe]->len = 0;
p_cb->at_0x00[pipe]->event =
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
p_cb->at_0x00[pipe]->offset = 0;
p_cb->at_0x1a[pipe] = 1;
}
else
{
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
"HCIS: Unable to allocate buffer for incoming HCI "
"message.");
p_cb->at_0x1a[param_1] = 2;
p_cb->at_0x1a[pipe] = 2;
}
p_cb->at_0x0c[param_1] =
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
p_cb->at_0x0c[pipe] =
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
/* fallthrough */
case 1:
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len++) = byte;
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len++) = byte;
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
msg_len = byte;
if (p_cb->at_0x14[param_1] == 2)
if (p_cb->at_0x14[pipe] == 2)
{
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
if ((p_cb->at_0x00[param_1] =
if ((p_cb->at_0x00[pipe] =
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
(BT_HDR *)p_cb->at_0x00[param_1]))
(BT_HDR *)p_cb->at_0x00[pipe]))
== 0)
{
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x0c[pipe] = msg_len;
if (msg_len == 0)
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
else
p_cb->at_0x1a[param_1] = 4;
p_cb->at_0x1a[pipe] = 4;
break;
}
}
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x0c[pipe] = msg_len;
if (sizeof(HC_BT_HDR)
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
+ msg_len
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
{
GKI_freebuf(p_cb->at_0x00[param_1]);
p_cb->at_0x00[param_1] = NULL;
p_cb->at_0x1a[param_1] = 4;
GKI_freebuf(p_cb->at_0x00[pipe]);
p_cb->at_0x00[pipe] = NULL;
p_cb->at_0x1a[pipe] = 4;
BT_TRACE(HCI, ERROR,
"HCIS: Invalid length for incoming HCI message.");
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
if (msg_len != 0)
{
p_cb->at_0x1a[param_1] = 3;
p_cb->at_0x1a[pipe] = 3;
}
else
{
msg_received = TRUE;
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
}
else
{
p_cb->at_0x17[param_1] = byte;
p_cb->at_0x17[pipe] = byte;
}
break;
case 2:
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
msg_len = byte;
if (p_cb->at_0x14[param_1] == 2)
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
if (p_cb->at_0x14[pipe] == 2)
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x1a[param_1] = 4;
p_cb->at_0x0c[pipe] = msg_len;
p_cb->at_0x1a[pipe] = 4;
}
else
{
p_cb->at_0x17[param_1] = byte;
p_cb->at_0x17[pipe] = byte;
}
break;
case 3:
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len++) = byte;
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len++) = byte;
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
len = UUSB_Read(param_1 + 1,
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len,
p_cb->at_0x0c[param_1]);
len = UUSB_Read(pipe + 1,
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len,
p_cb->at_0x0c[pipe]);
p_cb->at_0x00[param_1]->len += len;
p_cb->at_0x0c[param_1] -= len;
p_cb->at_0x00[pipe]->len += len;
p_cb->at_0x0c[pipe] -= len;
bytes_read += len;
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
if (p_cb->at_0x14[param_1] == 2
if (p_cb->at_0x14[pipe] == 2
&& l2cap_link_chk_pkt_end() == 0)
{
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
else
{
msg_received = TRUE;
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
}
break;
case 4:
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
p_cb->at_0x1a[param_1] = 0;
if (p_cb->at_0x0c[pipe] == 0)
p_cb->at_0x1a[pipe] = 0;
break;
}
if (msg_received)
{
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
p_cb->at_0x00[param_1] = NULL;
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
p_cb->at_0x00[pipe] = NULL;
}
}
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
hcisu_h2_send_msg_now(p_cb, p_msg);
}
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
{
hcisu_h2_cb.at_0x1e = 0;
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
hcisu_h2_cb.at_0x1a[1] = 0;
hcisu_h2_cb.at_0x1a[2] = 0;
hcisu_h2_cb.at_0x1f = param_1;
hcisu_h2_cb.at_0x20 = param_2;
hcisu_h2_cb.at_0x12 = param_3;
hcisu_h2_cb.at_0x1f = taskId;
hcisu_h2_cb.at_0x20 = mbox;
hcisu_h2_cb.at_0x12 = bufSize;
}
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)

View File

@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
}
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
UINT8 wbits, UINT8 direction, UINT8 param_6,
UINT8 wbits, UINT8 direction, UINT8 config,
UINT8 enable)
{
tL2C_LCB *p_lcb;
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
}
}
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
{
#if 0
/* ... */

View File

@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
(void)uusb;
}
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
{
return 0;
}
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
return 0;
}
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
{
short sp18 = 0;
IOSError ret = 0;
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
if (usb.state != 2)
return 0;
switch (param_1)
switch (pipe)
{
case 0:
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
memcpy(p_buffer, p_data, len);
if (len > 190)
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
{
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
break;
}
(void)param_4;
(void)unused;
return ret;
}

View File

@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
char lbl_81693350[0xd0] = {
char scCntCacheStrs[0xd0] = {
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
};
char lbl_81693420[0x16] = {
char scCntCacheTitleDataFmt[0x16] = {
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
};
const char* __CNTCACHEVersion = lbl_81693350;
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
const char* __CNTCACHEVersion = scCntCacheStrs;
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
extern void _savegpr_23();
extern void _restgpr_23();
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
mr r11, r12
stw r0, 4(r12)
bl _savegpr_23
lis r30, lbl_81693350@ha
lis r30, scCntCacheStrs@ha
lis r3, _CNTCACHEMutex@ha
addi r30, r30, lbl_81693350@l
addi r30, r30, scCntCacheStrs@l
li r29, 0
addi r3, r3, _CNTCACHEMutex@l
bl OSLockMutex
@@ -146,7 +146,7 @@ L_184:
stb r31, 0(r4)
subf r23, r24, r4
mr r3, r24
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
cmpwi r3, 0
mr r29, r3
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
stwu r1, -0x20(r1)
mflr r0
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
@@ -284,7 +284,7 @@ L_350:
bl ES_DeleteTitleContent
L_364:
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
L_370:
cmpwi r3, 0
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
lis r5, lbl_81693420@ha
lis r5, scCntCacheTitleDataFmt@ha
stw r0, 4(r12)
li r0, 1
addi r5, r5, lbl_81693420@l
addi r5, r5, scCntCacheTitleDataFmt@l
stw r31, -4(r12)
stw r30, -8(r12)
mr r30, r3
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
stw r0, 4(r12)
bl _savegpr_26
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
li r31, 0
li r4, 0
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
rlwinm. r0, r3, 0, 0x1b, 0x1b
beq L_6f0
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
li r26, 1
lis r27, lbl_81693420@ha
lis r27, scCntCacheTitleDataFmt@ha
b L_6e8
L_5b0:
stw r31, errno(r0)
@@ -488,7 +488,7 @@ L_5e8:
li r0, -1
stw r26, 0x20(r1)
addi r3, r1, 0x40
addi r5, r27, lbl_81693420@l
addi r5, r27, scCntCacheTitleDataFmt@l
stw r26, 0x24(r1)
and r6, r30, r0
and r7, r29, r0
@@ -529,7 +529,7 @@ L_6d4:
bdnz L_5e8
L_6dc:
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
L_6e8:
cmpwi r3, 0

View File

@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
return CX_SECURE_ERR_OK;
}
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
const u8* a = param_1;
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
const u8* a = table;
const u8* b = a + 1;
u32 c = *a;
const u8* d = (u8*)param_1 + ((c + 1) << 1);
const u8* d = (u8*)table + ((c + 1) << 1);
u8 e[sizeof(u8) * 0x40];
u32 i;
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
e[i] = 0;
}
if (param_2 == 4 && c >= 16) {
if (bitSize == 4 && c >= 16) {
return FALSE;
}

View File

@@ -4,8 +4,8 @@
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
context->unk_0x00 = param_2;
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x0e = 0;
context->unk_0x0C = 0;
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
context->size = 0;
}
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
context->unk_0x00 = param_2;
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x11 = 0;
context->unk_0x12 = 0;
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
return CX_STREAMING_ERR_OK;
}
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
int bytesParsed = 0;
while (*pHdrLen) {
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
}
}
if (param_5 > 0 && param_5 < *pOutLen) {
*pOutLen = param_5;
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
*pOutLen = maxOutLen;
}
return bytesParsed;

View File

@@ -291,7 +291,7 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
return 0;
}
g_pfd_sddrv_info.media_inserted = 0;
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
g_event = 1;
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
if (result != 0) {

View File

@@ -34,13 +34,13 @@ static void uhf_ker_sem_inline_1() {
}
}
s32 uhf_ker_create_sem(u32 param_1, int param_2) {
s32 uhf_ker_create_sem(u32 initCount, int flags) {
int i, k;
if (param_1 != 0 && param_1 != 1) {
if (initCount != 0 && initCount != 1) {
return -5;
}
if (param_2 != 0) {
if (flags != 0) {
return -5;
}
@@ -60,13 +60,13 @@ s32 uhf_ker_create_sem(u32 param_1, int param_2) {
OSInitSemaphore(&st_uhf_ker_sem[i], 1);
sem = &st_uhf_ker_sem[i];
for (k = (int)(1 - param_1); k > 0; k--) {
for (k = (int)(1 - initCount); k > 0; k--) {
OSWaitSemaphore((OSSemaphore*)sem);
}
st_uhs_ker_sem_mng.entries[i].sem = sem;
st_uhs_ker_sem_mng.entries[i].unk_0x04 = param_1;
st_uhs_ker_sem_mng.entries[i].unk_0x08 = param_2;
st_uhs_ker_sem_mng.entries[i].unk_0x04 = initCount;
st_uhs_ker_sem_mng.entries[i].unk_0x08 = flags;
st_uhs_ker_sem_mng.unk_0x90++;
uhf_ker_sem_inline_1();

View File

@@ -96,13 +96,13 @@ USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback d
return USB_KBD_ERR_OK;
}
USBKBDErr USBKBDSetLED(u32 param_1, u8 param_2, USBKBDCmdLED* cmd) {
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
if (usbKbdFd < 0) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->unk_0x04 = param_2;
cmd->unk_0x00 = param_1;
cmd->unk_0x04 = ledBits;
cmd->unk_0x00 = device;
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
}
@@ -114,12 +114,12 @@ static IOSError usbKbdSetLEDHandler(IOSError error, void* arg) {
return IPC_RESULT_OK;
}
USBKBDErr USBKBDSetLEDAsync(u32 param_1, u8 param_2, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
if (usbKbdFd < 0) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->base.unk_0x00 = param_1;
cmd->base.unk_0x04 = param_2;
cmd->base.unk_0x00 = device;
cmd->base.unk_0x04 = ledBits;
cmd->cb = cb;
cmd->cbArg = cbArg;

View File

@@ -28,8 +28,8 @@
#define DPD_CONFIG2_SIZE 2
#define SPK_CONFIG_SIZE 7
char lbl_81687720[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
const char* __WPADVersion = lbl_81687720;
char scWpadVersionStr[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
const char* __WPADVersion = scWpadVersionStr;
WPADStorage _wpd;
WPADCB* _wpdcb[WPAD_MAX_CONTROLLERS];
@@ -617,7 +617,7 @@ static void __reconnect(BOOL exec) {
WUDShutdown(exec);
}
#ifdef __MWERKS__
char lbl_81687810[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
char scWpadManageStrs[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
"Check the update of WiFi using channel\n\0"
"WiFi uses channel = %d\n";
extern void _savegpr_19();
@@ -629,8 +629,8 @@ static asm void WPADiManageHandler(OSAlarm* pAlarm, OSContext* pContext) {
stw r0, 0x164(r1)
addi r11, r1, 0x160
bl _savegpr_19
lis r28, lbl_81687720@ha
addi r28, r28, lbl_81687720@l
lis r28, scWpadVersionStr@ha
addi r28, r28, scWpadVersionStr@l
bl WUDGetStatus
cmpwi r3, 0x3
beq WPADiManageHandler_8AC8

View File

@@ -9,7 +9,7 @@ extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
@@ -95,7 +95,7 @@ extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseFindByKey();
typedef struct {
CDBDate beginDate;
@@ -117,9 +117,9 @@ extern CDBErr CDBDatabaseSearchMinuteLayer();
extern CDBErr CDBDatabaseSearchHourLayer();
extern CDBErr CDBDatabaseSearchDayLayer();
extern CDBErr CDBDatabaseSearchMonthLayer();
extern CDBErr CDBDatabaseSearchYearLayer();
extern CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation);
extern CDBErr CDBDatabaseSearch();
extern CDBErr CDBDatabaseSearch_();
extern CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId);
typedef struct {
u32 used;
u8 state[0xC00C];
@@ -396,101 +396,30 @@ asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
#endif
}
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_24
lwz r11, 0x8(r3)
mr r24, r3
lwz r30, 0x48(r1)
mr r25, r4
cmpwi r11, 0x0
lwz r31, 0x4c(r1)
mr r26, r5
mr r27, r6
mr r28, r9
mr r29, r10
bne L_81487974
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148796C
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_8148796C:
li r3, 0x1b
b L_81487A3C
L_81487974:
addis r3, r11, 0x1
lwz r3, -0x3ff0(r3)
rlwinm. r0, r3, 0, 30, 30
bne L_814879EC
cmpwi r3, 0x0
bne L_814879BC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879B4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_814879B4:
li r3, 0x1b
b L_81487A3C
L_814879BC:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879E4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B57C@ha
addi r3, r3, lbl_8166B57C@l
crclr 4*cr1+eq
bl OSReport
L_814879E4:
li r3, 0x1a
b L_81487A3C
L_814879EC:
lis r4, 0x8000
mr r3, r7
lwz r0, 0xf8(r4)
mr r4, r8
li r5, 0x0
srwi r6, r0, 2
bl __div2i
stw r4, 0x10(r1)
addi r3, r1, 0x10
bl CDBClampCDBDate
stw r31, 0x8(r1)
mr r3, r25
mr r4, r24
mr r5, r26
lwz r7, 0x10(r1)
mr r6, r27
mr r8, r28
mr r9, r29
mr r10, r30
bl CDBRecordCreateAtOnce
L_81487A3C:
addi r11, r1, 0x40
bl _restgpr_24
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
CDBDatabaseState* instance;
int flags;
CDBDate date;
instance = database->instance;
if (instance == NULL) {
CDBReportError(lbl_8166B550);
return CDB_ERROR_27;
}
flags = instance->flags;
if ((flags & 2) == 0) {
if (flags == 0) {
CDBReportError(lbl_8166B550);
return CDB_ERROR_27;
}
CDBReportError(lbl_8166B57C);
return CDB_ERROR_26;
}
date = time / (OS_BUS_CLOCK / 4);
CDBClampCDBDate(&date);
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
}
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
@@ -2176,7 +2105,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() {
#endif
}
asm CDBErr CDBDatabaseSearchYearLayer() {
asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x90(r1)
@@ -2432,74 +2361,38 @@ asm CDBErr CDBDatabaseSearchYearLayer() {
CDBErr CDBDatabaseSearch(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCode, char* gameCode, int unk7, CDBRecordLocation recordLocation, int unk9, CDBSearchRecordCB searchRecordCB, void* searchRecordArg) {
CDBErr result;
CDBLock();
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, (char*)unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
CDBUnlock();
return result;
}
asm CDBErr CDBDatabaseSearch_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x60(r1)
mflr r0
stw r0, 0x64(r1)
addi r11, r1, 0x60
bl _savegpr_24
cmplw r4, r5
lwz r28, 0x68(r1)
lwz r29, 0x6c(r1)
mr r24, r3
lwz r30, 0x70(r1)
mr r25, r8
lwz r31, 0x74(r1)
mr r26, r9
mr r27, r10
bge L_81489764
stw r4, 0x8(r1)
stw r5, 0xc(r1)
b L_8148976C
L_81489764:
stw r5, 0x8(r1)
stw r4, 0xc(r1)
L_8148976C:
stw r6, 0x1c(r1)
mr r3, r7
addi r4, r1, 0x10
bl CDBConvMCStrToMCValue
mr r3, r25
addi r4, r1, 0x14
bl CDBConvGCStrToGCValue
li r0, 0x1
cmpwi r31, 0x0
stw r26, 0x18(r1)
stw r29, 0x20(r1)
stw r30, 0x24(r1)
stw r0, 0x28(r1)
stw r28, 0x2c(r1)
bne L_814897B8
li r0, 0x0
stw r0, 0x34(r1)
stw r0, 0x30(r1)
b L_814897C8
L_814897B8:
lwz r0, 0x0(r31)
lwz r3, 0x4(r31)
stw r3, 0x34(r1)
stw r0, 0x30(r1)
L_814897C8:
mr r3, r24
mr r5, r27
addi r4, r1, 0x8
bl CDBDatabaseSearchYearLayer
addi r11, r1, 0x60
bl _restgpr_24
lwz r0, 0x64(r1)
mtlr r0
addi r1, r1, 0x60
blr
#endif
CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId) {
CDBSearchConditions conditions;
if (beginDate < endDate) {
conditions.beginDate = beginDate;
conditions.endDate = endDate;
} else {
conditions.beginDate = endDate;
conditions.endDate = beginDate;
}
conditions.direction = searchDirection;
CDBConvMCStrToMCValue(makerCodeStr, &conditions.makerCode);
CDBConvGCStrToGCValue(gameCodeStr, &conditions.gameCode);
conditions.type = type;
conditions.callback = searchRecordCB;
conditions.callbackArg = searchRecordArg;
conditions.keepSearching = TRUE;
conditions.openRecord = openRecord;
if (wiiId == NULL) {
conditions.wiiId = 0;
} else {
conditions.wiiId = *wiiId;
}
return CDBDatabaseSearchYearLayer(database, &conditions, recordLocation);
}
void CDBDatabaseInstanceInit(CDBDatabaseState* instance, u32 flags, CDBDatabase* database) {
instance->used = 1;
instance->flags = flags;

View File

@@ -20,14 +20,14 @@ void VoiceCallback(void* _voice) {
}
inline u8* getCurrAddr(VoiceInfo* voice) {
AXPB* iVar4 = &voice->getAXVPB()->pb;
AXPB* pb = &voice->getAXVPB()->pb;
nw4r::ut::AutoInterruptLock lock;
if (iVar4 == NULL) {
if (pb == NULL) {
return 0;
}
u16 addrHi = iVar4->addr.currentAddressHi;
u16 addrLo = iVar4->addr.currentAddressLo;
u16 addrHi = pb->addr.currentAddressHi;
u16 addrLo = pb->addr.currentAddressLo;
return (u8*)((addrHi << 16) + addrLo);
}

View File

@@ -526,23 +526,6 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
bool HWKeyboard::updateTappingShift_(input::HKBManager& hkbManager) {
hkbManager.GetModifierState();
input::HKBManager::KeySet currentKeySet;
@@ -636,6 +619,24 @@ const u8 controlKeys[] = {
}
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
nofralloc
cmpwi r4, 2

View File

@@ -131,15 +131,15 @@ namespace ipl {
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
extern "C" char lbl_8164DFE1[];
extern "C" char lbl_8164DE64[];
extern "C" char lbl_8164DE6D[];
extern "C" char lbl_8164DE9C[];
extern "C" char lbl_8164DFCB[];
extern "C" char lbl_8164DFF1[];
extern "C" char lbl_8164E000[];
extern "C" char lbl_8164E024[];
extern "C" char lbl_8164E038[];
extern "C" char scSE_WIPL_SE_CH_HOLD[];
extern "C" char scPaneName_N_GCIcon[];
extern "C" char scPaneName_N_DiscUpdateIcon[];
extern "C" char scSE_WSD_SELECT[];
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
extern "C" char scSE_WIPL_SE_CH_SET[];
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
extern "C" char scSE_WIPL_SE_DECIDE[];
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
@@ -855,8 +855,8 @@ namespace ipl {
mpDiskInOutLyt->finishBinding();
}
extern "C" char lbl_8164DE64[] = "N_GCIcon";
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
extern "C" void* jumptable_8164DE80[7] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
@@ -1359,8 +1359,8 @@ namespace ipl {
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
lwz r3, 0x94(r3)
lis r29, lbl_8164DE64@ha
addi r4, r29, lbl_8164DE64@l
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1370,8 +1370,8 @@ namespace ipl {
li r4, 0x1
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
lis r30, lbl_8164DE6D@ha
addi r4, r30, lbl_8164DE6D@l
lis r30, scPaneName_N_DiscUpdateIcon@ha
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1419,7 +1419,7 @@ namespace ipl {
bne updateDiskState_813AD134
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, lbl_8164DE64@l
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
stb r0, 0x1b81(r3)
lwz r3, 0x94(r31)
@@ -1431,7 +1431,7 @@ namespace ipl {
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
addi r4, r30, lbl_8164DE6D@l
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -2087,10 +2087,11 @@ namespace ipl {
mpMoveLytDrop->getAnim()->initAnmFrame();
}
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
void ChannelSelect::calcNormalGrab() {
Button* button = getButton();
@@ -2167,7 +2168,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2193,7 +2194,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2357,7 +2358,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
searchList(mCurrentPage, id)->onPoint(2);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
break;
}
@@ -2438,7 +2439,7 @@ namespace ipl {
mbModuleSceneChange = true;
unk_0x185 = true;
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
mState = STATE_NORMAL_GRAB;
}
@@ -2450,13 +2451,13 @@ namespace ipl {
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
mpMoveLytDrop->getAnim(0)->play();
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
mpMoveLytMask->getAnim(1)->play();
mState = STATE_NORMAL_MOVE_CHAN_IN;
} else {
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
mState = STATE_NORMAL_RELEASE_WAIT;
}
@@ -2519,8 +2520,8 @@ namespace ipl {
}
}
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
@@ -2561,7 +2562,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
chanObj->onPoint(0);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
}
break;
@@ -2599,13 +2600,13 @@ namespace ipl {
if (System::isSafeMode()) {
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
snd::getSystem()->startSE(lbl_8164E024);
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
} else {
mpInstance->setSomething();
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
mpInstance->tryToStartBoardScene();
TVRCManager::getHandle()->setEnable(FALSE);
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
button->setEventHandler(NULL);
@@ -2615,7 +2616,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
@@ -2650,7 +2651,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
}
break;

View File

@@ -281,7 +281,7 @@ void MemoryCardManager::update_file_array(u8 slot) {
memorycard::CardState* states = memorycard::getCardSlotState();
states[slot].changed = 0;
sort_file_array(slot);
long command = *(volatile long*)&mLastCmd;
long command = mLastCmd;
if ((u32)(command - 1) <= 3) {
if (mLastResult == -0x15) {
mLastResult = memorycard::getCardLastCMDFCmdResult();