Compare commits
187 Commits
agent/cont
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e41a7ba9c | ||
|
|
d2d00f38ff | ||
|
|
33911687c7 | ||
|
|
03bc324c97 | ||
|
|
7e24906764 | ||
|
|
17a33b2d18 | ||
|
|
10bbb7b394 | ||
|
|
dcfa7b859d | ||
|
|
a255b91806 | ||
|
|
9779363fb5 | ||
|
|
1f3dbb0ff0 | ||
|
|
041460fc6b | ||
|
|
287f88ae75 | ||
|
|
c3e50612b2 | ||
|
|
99d70b31f7 | ||
|
|
27844c37b3 | ||
|
|
abf047bc3b | ||
|
|
52977bb782 | ||
|
|
b1fd404137 | ||
|
|
9a9f937e9e | ||
|
|
0792087bf1 | ||
|
|
1542f73080 | ||
|
|
d51e34beb2 | ||
|
|
5ffea56c30 | ||
|
|
3dfeacd4f6 | ||
|
|
36f3716be7 | ||
|
|
784a463f27 | ||
|
|
fadf50ce43 | ||
|
|
a824e02a30 | ||
|
|
75c7a24c2f | ||
|
|
12c7a67d2c | ||
|
|
e2c26aad07 | ||
|
|
622b7e678e | ||
|
|
ddbb9b1ab9 | ||
|
|
4b71db7dfd | ||
|
|
e052c9ae0c | ||
|
|
a843f0770f | ||
|
|
c356c90f22 | ||
|
|
6af767089f | ||
|
|
bee0a51dbf | ||
|
|
d9e7306a99 | ||
|
|
f214b726b5 | ||
|
|
cbe489cd37 | ||
|
|
d78ab4cfd1 | ||
|
|
311b437e5f | ||
|
|
8581b15e80 | ||
|
|
16317c11e2 | ||
|
|
667b9f6fa2 | ||
|
|
bf479c7e3f | ||
|
|
5ce99fb34c | ||
|
|
44a074bdce | ||
|
|
59e3ec6007 | ||
|
|
f9a70d7d43 | ||
|
|
e5adf3de29 | ||
|
|
373ea6a875 | ||
|
|
84c3af7235 | ||
|
|
1f0ce55081 | ||
|
|
002e2e7e36 | ||
|
|
6713cca2e3 | ||
|
|
43fb4f1bb7 | ||
|
|
e926be4585 | ||
|
|
8d95ccd8ab | ||
|
|
cf3d7c4393 | ||
|
|
da448d002b | ||
|
|
d6c74589e5 | ||
|
|
63492be139 | ||
|
|
bede348ee3 | ||
|
|
75bdcc3e2c | ||
|
|
4872b6e925 | ||
|
|
7b96616b53 | ||
|
|
b9895bb3d6 | ||
|
|
22961c86a3 | ||
|
|
e4b8d405ed | ||
|
|
584dbb6906 | ||
|
|
2f865cb308 | ||
|
|
476e471184 | ||
|
|
45514dad2d | ||
|
|
9e2b86d38a | ||
|
|
86ed50ab79 | ||
|
|
4a30cfa843 | ||
|
|
bb3365c7da | ||
|
|
511b8d2a57 | ||
|
|
98f0f11dc7 | ||
|
|
e194e9ccd4 | ||
|
|
9b89894ee2 | ||
|
|
71c1c07d3b | ||
|
|
12e0ec188d | ||
|
|
93b2f44cfc | ||
|
|
9df26503a6 | ||
|
|
836a348b64 | ||
|
|
8201dbba31 | ||
|
|
1711e860c7 | ||
|
|
0c3af7ea2e | ||
|
|
fb539fe968 | ||
|
|
cd2a126243 | ||
|
|
620f8c8b4e | ||
|
|
7bf0665f40 | ||
|
|
f5ccda1cb4 | ||
|
|
4c84325f64 | ||
|
|
380c8a059c | ||
|
|
df19b05818 | ||
|
|
e27bb4c191 | ||
|
|
6aafa4acfe | ||
|
|
704850f5dd | ||
|
|
ca4acc8625 | ||
|
|
9e9c6bcd54 | ||
|
|
1975cefade | ||
|
|
721f9907df | ||
|
|
21c1e8a207 | ||
|
|
34f121b783 | ||
|
|
8647740dd8 | ||
|
|
84d8c7fe7a | ||
|
|
8923728dc4 | ||
|
|
71b4ac3296 | ||
|
|
21c4d9b7d9 | ||
|
|
558bb52727 | ||
|
|
cacffaa5ee | ||
|
|
d4cb1ee2ee | ||
|
|
ec93b2aad3 | ||
|
|
f026821af2 | ||
|
|
dd369fbb8c | ||
|
|
47f78dcead | ||
|
|
d951489ea3 | ||
|
|
2afb673a8e | ||
|
|
5b7475fe54 | ||
|
|
51f1c36f3f | ||
|
|
eb2d67bfe3 | ||
|
|
e167441313 | ||
|
|
fcf28f93e2 | ||
|
|
956f076799 | ||
|
|
3283047615 | ||
|
|
d0f6f8a7b9 | ||
|
|
8bec89c069 | ||
|
|
84ce6d4198 | ||
|
|
fba54700b6 | ||
|
|
748265e71b | ||
|
|
06e8788815 | ||
|
|
44a7f17e41 | ||
|
|
e1bd339ba5 | ||
|
|
0532e405d3 | ||
|
|
961a1b0431 | ||
|
|
e65297484f | ||
|
|
10f3bbc57c | ||
|
|
747e87959f | ||
|
|
0f89a4218d | ||
|
|
d0127008b2 | ||
|
|
8f31470be5 | ||
|
|
8a46eaae2d | ||
|
|
55946192bf | ||
|
|
f5486c85f4 | ||
|
|
bcbffb2c06 | ||
|
|
3793ce8c4e | ||
|
|
5cd7bcb31f | ||
|
|
c6ae812dd3 | ||
|
|
eeb6e310cf | ||
|
|
2242c861de | ||
|
|
ded8d62531 | ||
|
|
2c9e8eb028 | ||
|
|
a8c6bcf550 | ||
|
|
aa72085db7 | ||
|
|
4f747f363b | ||
|
|
2dce7103d1 | ||
|
|
f812a3bf87 | ||
|
|
25177c690e | ||
|
|
912546fd58 | ||
|
|
39aef1c7c0 | ||
|
|
872f55c573 | ||
|
|
ba46047e4d | ||
|
|
3e41051d36 | ||
|
|
fa2c5714ad | ||
|
|
cebdd7236d | ||
|
|
87cf5dacc3 | ||
|
|
9424c50f7b | ||
|
|
020ba288c3 | ||
|
|
1ab4726f50 | ||
|
|
2b016f9144 | ||
|
|
29984adbed | ||
|
|
e2832af0d2 | ||
|
|
df3f27980e | ||
|
|
28a693c7ad | ||
|
|
1d16705416 | ||
|
|
1ccf72e0d5 | ||
|
|
11b63fc609 | ||
|
|
3ae7c32d1c | ||
|
|
1171037c9b | ||
|
|
0a6a722237 | ||
|
|
18e76c8e59 |
21
AGENTS.md
21
AGENTS.md
@@ -170,6 +170,12 @@ disjoint tasks. Never duplicate a source file or function
|
||||
range. Workers return changed paths, exact objdiff measurements, and validation
|
||||
results. Fuzzy-only results are not accepted.
|
||||
|
||||
Workers must do the work through tool calls and avoid conversational messages.
|
||||
Send findings to the parent only through the collaboration tool, with concise
|
||||
paths, measurements, and validation evidence. Put PR discussion on the PR when
|
||||
needed. Do not send user-facing status chatter; the orchestrator follows the
|
||||
reporting rule below.
|
||||
|
||||
### Worker loop
|
||||
|
||||
Workers iterate until exact-name `objdiff` reports `100.0%`. They must not stop
|
||||
@@ -299,6 +305,21 @@ After a successful merge:
|
||||
worktree and local branch. A failed or conflicted leaf keeps its worktree
|
||||
and worker alive.
|
||||
|
||||
### User-facing progress reports
|
||||
|
||||
Keep user-facing messages to a minimum and use as few tokens as possible.
|
||||
Do not send routine status updates or commentary while workers are running or
|
||||
PRs are open. After each matching-work PR is merged and the live progress
|
||||
report has been regenerated, send only the current linked, fuzzy, and data
|
||||
percentages in this format:
|
||||
|
||||
```
|
||||
Linked: <percent> | Fuzzy: <percent> | Data: <percent>
|
||||
```
|
||||
|
||||
Do not report stale values, unmerged PR results, or add other text to that
|
||||
update. Continue all required verification and coordination silently.
|
||||
|
||||
## Goal completion contract
|
||||
|
||||
The decompilation loop does not stop after a successful wave, a convenient
|
||||
|
||||
@@ -10,6 +10,33 @@ splits: 'config/43U/splits.txt'
|
||||
|
||||
ldscript_template: 'config/ldscript_ipl2.lcf'
|
||||
|
||||
force_active:
|
||||
- labs
|
||||
- itoa
|
||||
- strpbrk
|
||||
- strspn
|
||||
- strcspn
|
||||
- atol
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
block_relocations:
|
||||
- source: .data:0x8165E15C
|
||||
- source: .data:0x8165E19C
|
||||
|
||||
add_relocations:
|
||||
- source: .data:0x8165E15C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
addend: 0x1DC
|
||||
- source: .data:0x8165E19C
|
||||
type: abs
|
||||
target: csAninationFile__Q29textinput7toolbar
|
||||
addend: 0x1DC
|
||||
|
||||
quick_analysis: true
|
||||
fill_gaps: false
|
||||
|
||||
|
||||
@@ -37,11 +37,16 @@ src/system/iplSystem.cpp:
|
||||
.sdata start:0x81696060 end:0x81696080
|
||||
|
||||
src/system/iplController.cpp:
|
||||
.text start:0x81335CCC end:0x81337978
|
||||
.text start:0x81335CCC end:0x81337318
|
||||
.rodata start:0x8160D2C0 end:0x8160D2D0
|
||||
.data start:0x816346A8 end:0x81634A28
|
||||
.sdata2 start:0x81694440 end:0x81694490
|
||||
.data start:0x816346A8 end:0x81634910
|
||||
.sdata2 start:0x81694440 end:0x81694478
|
||||
.sdata start:0x81696080 end:0x81696088
|
||||
|
||||
src/system/iplControllerManager.cpp:
|
||||
.text start:0x81337318 end:0x81337978
|
||||
.data start:0x81634910 end:0x81634A28
|
||||
.sdata2 start:0x81694478 end:0x81694490
|
||||
.sbss start:0x81698680 end:0x81698690
|
||||
|
||||
src/system/iplChannelManager.cpp:
|
||||
|
||||
@@ -7,7 +7,7 @@ mMac__Q33ipl6socket13SocketSetting = .bss:0x81089720; // type:object size:0x40
|
||||
_database__7LibTVRC = .bss:0x81089760; // type:object size:0x20 data:4byte
|
||||
_alarm__7LibTVRC = .bss:0x81089780; // type:object size:0x30
|
||||
_tickWait__7LibTVRC = .bss:0x810897B0; // type:object size:0x10 data:4byte
|
||||
mArg__Q33ipl7utility8Graphics = .bss:0x810897C0; // type:object size:0x88
|
||||
mArg__Q33ipl7utility8Graphics = .bss:0x810897C0; // type:object size:0x84
|
||||
unk__Q23ipl3snd = .bss:0x81089848; // type:object size:0xC
|
||||
_seBlk__Q23ipl3snd = .bss:0x81089854; // type:object size:0xD8 data:4byte
|
||||
sSystem__Q23ipl3snd = .bss:0x8108992C; // type:object size:0x63C data:4byte
|
||||
@@ -123,7 +123,7 @@ CDB_SD_ROOT_PATH_LS = .bss:0x810C8A08; // type:object size:0x20
|
||||
CDB_SD_VFF_FILE_NAME = .bss:0x810C8A28; // type:object size:0x48
|
||||
lbl_810C8A80 = .bss:0x810C8A80; // type:object size:0x40 align:32
|
||||
lbl_810C8AC0 = .bss:0x810C8AC0; // type:object size:0x40 align:32
|
||||
s_mutex = .bss:0x810C8B00; // type:object size:0x20 scope:local
|
||||
s_mutex = .bss:0x810C8B00; // type:object size:0x18 scope:local
|
||||
s_cdbWiiId = .bss:0x810C8B20; // type:object size:0x40 scope:local
|
||||
ncdMutex = .bss:0x810C8B60; // type:object size:0x20
|
||||
ncdCommonResult = .bss:0x810C8B80; // type:object size:0x20 align:32 data:4byte
|
||||
@@ -161,7 +161,7 @@ l_dev_init_info_table = .bss:0x810F55C0; // type:object size:0xD0 scope:local
|
||||
l_tmpWName = .bss:0x810F5690; // type:object size:0x10 scope:local data:2byte
|
||||
hashTable = .bss:0x810F56A0; // type:object size:0x22E scope:local data:byte
|
||||
l_driveInfo = .bss:0x810F58D0; // type:object size:0x208 scope:local data:4byte
|
||||
l_nandFunc = .bss:0x810F5AD8; // type:object size:0x1A8 scope:local
|
||||
l_nandFunc = .bss:0x810F5AD8; // type:object size:0x1A0 scope:local
|
||||
l_event = .bss:0x810F5C80; // type:object size:0x340 scope:local
|
||||
l_sddrv_info = .bss:0x810F5FC0; // type:object size:0x80 scope:local
|
||||
sZeroBuffer__Q44nw4r3snd6detail9AxManager = .bss:0x810F6040; // type:object size:0x100
|
||||
@@ -13835,8 +13835,8 @@ scAnmTable__10homebutton = .rodata:0x8160F378; // type:object size:0x60 scope:lo
|
||||
scGroupAnmTable__10homebutton = .rodata:0x8160F3D8; // type:object size:0x250 scope:local data:4byte
|
||||
__DVDErrorMessage = .rodata:0x8160F628; // type:object size:0x28
|
||||
lbl_8160F650 = .rodata:0x8160F650; // type:object size:0x16 data:2byte
|
||||
lbl_8160F668 = .rodata:0x8160F668; // type:object size:0xB data:byte
|
||||
lbl_8160F673 = .rodata:0x8160F673; // type:object size:0xC data:byte
|
||||
specials$18760 = .rodata:0x8160F668; // type:object size:0xB data:byte
|
||||
@19145 = .rodata:0x8160F673; // type:object size:0xC data:byte
|
||||
lbl_8160F67F = .rodata:0x8160F67F; // type:object size:0xD data:byte
|
||||
lbl_8160F690 = .rodata:0x8160F690; // type:object size:0x18 data:2byte
|
||||
scAnmFrame__Q23ipl5scene = .rodata:0x8160F6A8; // type:object size:0x20 scope:local
|
||||
@@ -13938,7 +13938,7 @@ pppURLCheck = .rodata:0x816152A8; // type:object size:0x28 scope:local
|
||||
lbl_816152D0 = .rodata:0x816152D0; // type:object size:0x10 scope:local data:4byte
|
||||
csAninationFile__Q29textinput12candidatebox = .rodata:0x816152E0; // type:object size:0x378 scope:local
|
||||
lbl_81615658 = .rodata:0x81615658; // type:object size:0xA0 scope:local data:4byte
|
||||
csAninationFile__Q29textinput7toolbar = .rodata:0x816156F8; // type:object size:0x1E0 scope:local data:4byte
|
||||
csAninationFile__Q29textinput7toolbar = .rodata:0x816156F8; // type:object size:0x1DC scope:local data:4byte
|
||||
csAninationFile__Q29textinput11predictlang = .rodata:0x816158D8; // type:object size:0x268 scope:local
|
||||
csAninationFileForSign__Q39textinput8keyboard10signwindow = .rodata:0x81615B40; // type:object size:0x268 scope:local
|
||||
csPaneNameToControlKey__Q39textinput8keyboard10signwindow = .rodata:0x81615DA8; // type:object size:0x48 scope:local
|
||||
@@ -15435,26 +15435,46 @@ __vt__Q33ipl5scene7Address = .data:0x81647B70; // type:object size:0x120
|
||||
@11177 = .data:0x81647D9A; // type:object size:0xF scope:local data:string
|
||||
__vt__Q33ipl5scene18AddressAddSelEvent = .data:0x81647DAC; // type:object size:0x18
|
||||
__vt__Q33ipl5scene13AddressAddSel = .data:0x81647DC4; // type:object size:0x88
|
||||
lbl_81647EE0 = .data:0x81647EE0; // type:object size:0xD data:string
|
||||
lbl_81647EED = .data:0x81647EED; // type:object size:0xD data:string
|
||||
lbl_81647EFA = .data:0x81647EFA; // type:object size:0xD data:string
|
||||
lbl_81647F07 = .data:0x81647F07; // type:object size:0xE data:string
|
||||
lbl_81647F15 = .data:0x81647F15; // type:object size:0xC data:string
|
||||
lbl_81647F24 = .data:0x81647F24; // type:object size:0x14
|
||||
lbl_81647F38 = .data:0x81647F38; // type:object size:0xE data:string
|
||||
lbl_81647F46 = .data:0x81647F46; // type:object size:0x83
|
||||
lbl_81647FC9 = .data:0x81647FC9; // type:object size:0xC data:string
|
||||
lbl_81647FD5 = .data:0x81647FD5; // type:object size:0x128
|
||||
lbl_816480FD = .data:0x816480FD; // type:object size:0xE data:string
|
||||
lbl_8164810B = .data:0x8164810B; // type:object size:0x1F5
|
||||
jumptable_81648300 = .data:0x81648300; // type:object size:0xC0 scope:local
|
||||
jumptable_816483C0 = .data:0x816483C0; // type:object size:0xC0 scope:local
|
||||
lbl_8164848D = .data:0x8164848D; // type:object size:0x16 data:string
|
||||
lbl_816484A3 = .data:0x816484A3; // type:object size:0xF data:string
|
||||
jumptable_816484B4 = .data:0x816484B4; // type:object size:0x44 scope:local
|
||||
jumptable_81648508 = .data:0x81648508; // type:object size:0x58 scope:local
|
||||
jumptable_81648560 = .data:0x81648560; // type:object size:0x8C scope:local
|
||||
lbl_816485EC = .data:0x816485EC; // type:object size:0xC data:wstring
|
||||
@16959 = .data:0x81647EE0; // type:object size:0xD data:string
|
||||
@16960 = .data:0x81647EED; // type:object size:0xD data:string
|
||||
@16961 = .data:0x81647EFA; // type:object size:0xD data:string
|
||||
@16962 = .data:0x81647F07; // type:object size:0xE data:string
|
||||
@16963 = .data:0x81647F15; // type:object size:0xC data:string
|
||||
sButtonPaneNames = .data:0x81647F24; // type:object size:0x14
|
||||
@16964 = .data:0x81647F38; // type:object size:0xE data:string
|
||||
@23886 = .data:0x81647F46; // type:object size:0xC data:string
|
||||
@24207 = .data:0x81647F52; // type:object size:0x12 data:string
|
||||
@24208 = .data:0x81647F64; // type:object size:0x1C data:string
|
||||
@24209 = .data:0x81647F80; // type:object size:0xF data:string
|
||||
@24210 = .data:0x81647F8F; // type:object size:0x19 data:string
|
||||
@24211 = .data:0x81647FA8; // type:object size:0xB data:string
|
||||
@24212 = .data:0x81647FB3; // type:object size:0xB data:string
|
||||
@24213 = .data:0x81647FBE; // type:object size:0xB data:string
|
||||
@24214 = .data:0x81647FC9; // type:object size:0xC data:string
|
||||
@24215 = .data:0x81647FD5; // type:object size:0xE data:string
|
||||
@24216 = .data:0x81647FE3; // type:object size:0x1A data:string
|
||||
@24217 = .data:0x81647FFD; // type:object size:0x1A data:string
|
||||
@24218 = .data:0x81648017; // type:object size:0x1D data:string
|
||||
@24219 = .data:0x81648034; // type:object size:0x1E data:string
|
||||
@24220 = .data:0x81648052; // type:object size:0xC data:string
|
||||
@24221 = .data:0x8164805E; // type:object size:0x22 data:string
|
||||
@24222 = .data:0x81648080; // type:object size:0x9 data:string
|
||||
@24223 = .data:0x81648089; // type:object size:0x23 data:string
|
||||
@24224 = .data:0x816480AC; // type:object size:0x1C data:string
|
||||
@24225 = .data:0x816480C8; // type:object size:0xD data:string
|
||||
@24226 = .data:0x816480D5; // type:object size:0xD data:string
|
||||
@24227 = .data:0x816480E2; // type:object size:0xD data:string
|
||||
@24228 = .data:0x816480EF; // type:object size:0xE data:string
|
||||
@24229 = .data:0x816480FD; // type:object size:0xE data:string
|
||||
@24231 = .data:0x8164810B; // type:object size:0x1F5
|
||||
@25188 = .data:0x81648300; // type:object size:0xC0 scope:local
|
||||
@25187 = .data:0x816483C0; // type:object size:0xC0 scope:local
|
||||
@25711 = .data:0x8164848D; // type:object size:0x16 data:string
|
||||
@25835 = .data:0x816484A3; // type:object size:0xF data:string
|
||||
@25838 = .data:0x816484B4; // type:object size:0x44 scope:local
|
||||
@26007 = .data:0x81648508; // type:object size:0x58 scope:local
|
||||
@26006 = .data:0x81648560; // type:object size:0x8C scope:local
|
||||
@26030 = .data:0x816485EC; // type:object size:0xC data:wstring
|
||||
__vt__Q33ipl5scene17AddressInputEvent = .data:0x816485F8; // type:object size:0x18
|
||||
__vt__Q33ipl5scene16AddressEditEvent = .data:0x81648610; // type:object size:0x18
|
||||
__vt__Q33ipl5scene11AddressEdit = .data:0x81648628; // type:object size:0x120
|
||||
@@ -15733,47 +15753,47 @@ panes__Q23ipl5scene = .data:0x8164C8A4; // type:object size:0xB4 scope:local
|
||||
@16662 = .data:0x8164CBF4; // type:object size:0xC scope:local data:string
|
||||
@16898 = .data:0x8164CC00; // type:object size:0x1A scope:local data:string
|
||||
__vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
|
||||
lbl_8164CC68 = .data:0x8164CC68; // type:object size:0x21 data:string
|
||||
lbl_8164CC89 = .data:0x8164CC89; // type:object size:0xA data:string
|
||||
lbl_8164CC93 = .data:0x8164CC93; // type:object size:0x22 data:string
|
||||
lbl_8164CCB5 = .data:0x8164CCB5; // type:object size:0x23 data:string
|
||||
lbl_8164CCD8 = .data:0x8164CCD8; // type:object size:0x9 data:string
|
||||
lbl_8164CCE1 = .data:0x8164CCE1; // type:object size:0x2C data:string
|
||||
lbl_8164CD0D = .data:0x8164CD0D; // type:object size:0xC data:string
|
||||
lbl_8164CD19 = .data:0x8164CD19; // type:object size:0x2D data:string
|
||||
lbl_8164CD46 = .data:0x8164CD46; // type:object size:0x29 data:string
|
||||
lbl_8164CD6F = .data:0x8164CD6F; // type:object size:0x25 data:string
|
||||
lbl_8164CD94 = .data:0x8164CD94; // type:object size:0xB data:string
|
||||
lbl_8164CD9F = .data:0x8164CD9F; // type:object size:0x26 data:string
|
||||
lbl_8164CDC5 = .data:0x8164CDC5; // type:object size:0x28 data:string
|
||||
lbl_8164CDED = .data:0x8164CDED; // type:object size:0x20 data:string
|
||||
lbl_8164CE0D = .data:0x8164CE0D; // type:object size:0x20 data:string
|
||||
lbl_8164CE2D = .data:0x8164CE2D; // type:object size:0x21 data:string
|
||||
lbl_8164CE4E = .data:0x8164CE4E; // type:object size:0xA data:string
|
||||
lbl_8164CE58 = .data:0x8164CE58; // type:object size:0xA data:string
|
||||
lbl_8164CE62 = .data:0x8164CE62; // type:object size:0x22 data:string
|
||||
lbl_8164CE84 = .data:0x8164CE84; // type:object size:0xD data:string
|
||||
lbl_8164CE91 = .data:0x8164CE91; // type:object size:0xD data:string
|
||||
lbl_8164CE9E = .data:0x8164CE9E; // type:object size:0x23 data:string
|
||||
lbl_8164CEC1 = .data:0x8164CEC1; // type:object size:0x1F data:string
|
||||
lbl_8164CEE0 = .data:0x8164CEE0; // type:object size:0xA data:string
|
||||
lbl_8164CEEA = .data:0x8164CEEA; // type:object size:0x21 data:string
|
||||
lbl_8164CF0B = .data:0x8164CF0B; // type:object size:0xB data:string
|
||||
lbl_8164CF16 = .data:0x8164CF16; // type:object size:0xB data:string
|
||||
lbl_8164CF21 = .data:0x8164CF21; // type:object size:0x1F data:string
|
||||
lbl_8164CF40 = .data:0x8164CF40; // type:object size:0x25 data:string
|
||||
lbl_8164CF65 = .data:0x8164CF65; // type:object size:0xB data:string
|
||||
lbl_8164CF70 = .data:0x8164CF70; // type:object size:0x26 data:string
|
||||
lbl_8164CF96 = .data:0x8164CF96; // type:object size:0xF data:string
|
||||
lbl_8164CFA5 = .data:0x8164CFA5; // type:object size:0xF data:string
|
||||
lbl_8164CFB4 = .data:0x8164CFB4; // type:object size:0xE data:string
|
||||
lbl_8164CFC2 = .data:0x8164CFC2; // type:object size:0xE data:string
|
||||
lbl_8164CFD0 = .data:0x8164CFD0; // type:object size:0xB data:string
|
||||
lbl_8164CFDB = .data:0x8164CFDB; // type:object size:0xA data:string
|
||||
lbl_8164CFE5 = .data:0x8164CFE5; // type:object size:0xA data:string
|
||||
lbl_8164CFEF = .data:0x8164CFEF; // type:object size:0xF data:string
|
||||
lbl_8164CFFE = .data:0x8164CFFE; // type:object size:0xE data:string
|
||||
jumptable_8164D00C = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
@17285 = .data:0x8164CC68; // type:object size:0x21 scope:local data:string
|
||||
@17286 = .data:0x8164CC89; // type:object size:0xA scope:local data:string
|
||||
@17287 = .data:0x8164CC93; // type:object size:0x22 scope:local data:string
|
||||
@17288 = .data:0x8164CCB5; // type:object size:0x23 scope:local data:string
|
||||
@17289 = .data:0x8164CCD8; // type:object size:0x9 scope:local data:string
|
||||
@17290 = .data:0x8164CCE1; // type:object size:0x2C scope:local data:string
|
||||
@17291 = .data:0x8164CD0D; // type:object size:0xC scope:local data:string
|
||||
@17292 = .data:0x8164CD19; // type:object size:0x2D scope:local data:string
|
||||
@17293 = .data:0x8164CD46; // type:object size:0x29 scope:local data:string
|
||||
@17294 = .data:0x8164CD6F; // type:object size:0x25 scope:local data:string
|
||||
@17295 = .data:0x8164CD94; // type:object size:0xB scope:local data:string
|
||||
@17296 = .data:0x8164CD9F; // type:object size:0x26 scope:local data:string
|
||||
@17297 = .data:0x8164CDC5; // type:object size:0x28 scope:local data:string
|
||||
@17298 = .data:0x8164CDED; // type:object size:0x20 scope:local data:string
|
||||
@17300 = .data:0x8164CE0D; // type:object size:0x20 scope:local data:string
|
||||
@17301 = .data:0x8164CE2D; // type:object size:0x21 scope:local data:string
|
||||
@17302 = .data:0x8164CE4E; // type:object size:0xA scope:local data:string
|
||||
@17303 = .data:0x8164CE58; // type:object size:0xA scope:local data:string
|
||||
@17304 = .data:0x8164CE62; // type:object size:0x22 scope:local data:string
|
||||
@17305 = .data:0x8164CE84; // type:object size:0xD scope:local data:string
|
||||
@17306 = .data:0x8164CE91; // type:object size:0xD scope:local data:string
|
||||
@17307 = .data:0x8164CE9E; // type:object size:0x23 scope:local data:string
|
||||
@17308 = .data:0x8164CEC1; // type:object size:0x1F scope:local data:string
|
||||
@17309 = .data:0x8164CEE0; // type:object size:0xA scope:local data:string
|
||||
@17310 = .data:0x8164CEEA; // type:object size:0x21 scope:local data:string
|
||||
@17311 = .data:0x8164CF0B; // type:object size:0xB scope:local data:string
|
||||
@17312 = .data:0x8164CF16; // type:object size:0xB scope:local data:string
|
||||
@17313 = .data:0x8164CF21; // type:object size:0x1F scope:local data:string
|
||||
@17314 = .data:0x8164CF40; // type:object size:0x25 scope:local data:string
|
||||
@17315 = .data:0x8164CF65; // type:object size:0xB scope:local data:string
|
||||
@17316 = .data:0x8164CF70; // type:object size:0x26 scope:local data:string
|
||||
@17317 = .data:0x8164CF96; // type:object size:0xF scope:local data:string
|
||||
@17318 = .data:0x8164CFA5; // type:object size:0xF scope:local data:string
|
||||
@17319 = .data:0x8164CFB4; // type:object size:0xE scope:local data:string
|
||||
@17320 = .data:0x8164CFC2; // type:object size:0xE scope:local data:string
|
||||
@17321 = .data:0x8164CFD0; // type:object size:0xB scope:local data:string
|
||||
@17325 = .data:0x8164CFDB; // type:object size:0xA scope:local data:string
|
||||
@17326 = .data:0x8164CFE5; // type:object size:0xA scope:local data:string
|
||||
@17329 = .data:0x8164CFEF; // type:object size:0xF scope:local data:string
|
||||
@17330 = .data:0x8164CFFE; // type:object size:0xE scope:local data:string
|
||||
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
|
||||
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
|
||||
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
@@ -15791,56 +15811,56 @@ lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
|
||||
lbl_8164D2E8 = .data:0x8164D2E8; // type:object size:0x20 data:string
|
||||
lbl_8164D308 = .data:0x8164D308; // type:object size:0x21 data:string
|
||||
lbl_8164D329 = .data:0x8164D329; // type:object size:0x26 data:string
|
||||
lbl_8164D34F = .data:0x8164D34F; // type:object size:0x27 data:string
|
||||
lbl_8164D376 = .data:0x8164D376; // type:object size:0x23 data:string
|
||||
lbl_8164D399 = .data:0x8164D399; // type:object size:0xC data:string
|
||||
lbl_8164D3A5 = .data:0x8164D3A5; // type:object size:0x25 data:string
|
||||
lbl_8164D3CA = .data:0x8164D3CA; // type:object size:0x26 data:string
|
||||
lbl_8164D3F0 = .data:0x8164D3F0; // type:object size:0x22 data:string
|
||||
lbl_8164D412 = .data:0x8164D412; // type:object size:0xB data:string
|
||||
lbl_8164D41D = .data:0x8164D41D; // type:object size:0x23 data:string
|
||||
lbl_8164D440 = .data:0x8164D440; // type:object size:0x9 data:string
|
||||
lbl_8164D449 = .data:0x8164D449; // type:object size:0x24 data:string
|
||||
lbl_8164D46D = .data:0x8164D46D; // type:object size:0x26 data:string
|
||||
lbl_8164D493 = .data:0x8164D493; // type:object size:0x1E data:string
|
||||
lbl_8164D4B1 = .data:0x8164D4B1; // type:object size:0x26 data:string
|
||||
lbl_8164D4D7 = .data:0x8164D4D7; // type:object size:0x26 data:string
|
||||
lbl_8164D4FD = .data:0x8164D4FD; // type:object size:0x27 data:string
|
||||
lbl_8164D524 = .data:0x8164D524; // type:object size:0x23 data:string
|
||||
lbl_8164D547 = .data:0x8164D547; // type:object size:0xC data:string
|
||||
lbl_8164D553 = .data:0x8164D553; // type:object size:0xA data:string
|
||||
lbl_8164D55D = .data:0x8164D55D; // type:object size:0xA data:string
|
||||
lbl_8164D567 = .data:0x8164D567; // type:object size:0x9 data:string
|
||||
lbl_8164D570 = .data:0x8164D570; // type:object size:0xB data:string
|
||||
lbl_8164D57B = .data:0x8164D57B; // type:object size:0xB data:string
|
||||
lbl_8164D586 = .data:0x8164D586; // type:object size:0xD data:string
|
||||
lbl_8164D593 = .data:0x8164D593; // type:object size:0xB data:string
|
||||
lbl_8164D59E = .data:0x8164D59E; // type:object size:0xB data:string
|
||||
lbl_8164D5A9 = .data:0x8164D5A9; // type:object size:0xB data:string
|
||||
lbl_8164D5B4 = .data:0x8164D5B4; // type:object size:0xB data:string
|
||||
lbl_8164D5BF = .data:0x8164D5BF; // type:object size:0x9 data:string
|
||||
lbl_8164D5C8 = .data:0x8164D5C8; // type:object size:0xB data:string
|
||||
lbl_8164D5D3 = .data:0x8164D5D3; // type:object size:0xB data:string
|
||||
lbl_8164D5DE = .data:0x8164D5DE; // type:object size:0xA data:string
|
||||
lbl_8164D5E8 = .data:0x8164D5E8; // type:object size:0xB data:string
|
||||
lbl_8164D5F3 = .data:0x8164D5F3; // type:object size:0xD data:string
|
||||
lbl_8164D600 = .data:0x8164D600; // type:object size:0x10 data:string
|
||||
lbl_8164D610 = .data:0x8164D610; // type:object size:0xB data:string
|
||||
lbl_8164D61B = .data:0x8164D61B; // type:object size:0xE data:string
|
||||
lbl_8164D629 = .data:0x8164D629; // type:object size:0xA data:string
|
||||
lbl_8164D633 = .data:0x8164D633; // type:object size:0xA data:string
|
||||
lbl_8164D63D = .data:0x8164D63D; // type:object size:0x9 data:string
|
||||
jumptable_8164D648 = .data:0x8164D648; // type:object size:0x34 scope:local
|
||||
lbl_8164D67C = .data:0x8164D67C; // type:object size:0xF data:string
|
||||
lbl_8164D68B = .data:0x8164D68B; // type:object size:0xE data:string
|
||||
lbl_8164D699 = .data:0x8164D699; // type:object size:0xA data:string
|
||||
lbl_8164D6A3 = .data:0x8164D6A3; // type:object size:0xC data:string
|
||||
lbl_8164D6AF = .data:0x8164D6AF; // type:object size:0xC data:string
|
||||
lbl_8164D6BB = .data:0x8164D6BB; // type:object size:0xB data:string
|
||||
lbl_8164D6C6 = .data:0x8164D6C6; // type:object size:0xF data:string
|
||||
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
|
||||
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
|
||||
@18432 = .data:0x8164D329; // type:object size:0x26 scope:local data:string
|
||||
@18434 = .data:0x8164D34F; // type:object size:0x27 scope:local data:string
|
||||
@18435 = .data:0x8164D376; // type:object size:0x23 scope:local data:string
|
||||
@18436 = .data:0x8164D399; // type:object size:0xC scope:local data:string
|
||||
@18437 = .data:0x8164D3A5; // type:object size:0x25 scope:local data:string
|
||||
@18439 = .data:0x8164D3CA; // type:object size:0x26 scope:local data:string
|
||||
@18440 = .data:0x8164D3F0; // type:object size:0x22 scope:local data:string
|
||||
@18441 = .data:0x8164D412; // type:object size:0xB scope:local data:string
|
||||
@18442 = .data:0x8164D41D; // type:object size:0x23 scope:local data:string
|
||||
@18443 = .data:0x8164D440; // type:object size:0x9 scope:local data:string
|
||||
@18444 = .data:0x8164D449; // type:object size:0x24 scope:local data:string
|
||||
@18445 = .data:0x8164D46D; // type:object size:0x26 scope:local data:string
|
||||
@18446 = .data:0x8164D493; // type:object size:0x1E scope:local data:string
|
||||
@18448 = .data:0x8164D4B1; // type:object size:0x26 scope:local data:string
|
||||
@18450 = .data:0x8164D4D7; // type:object size:0x26 scope:local data:string
|
||||
@18452 = .data:0x8164D4FD; // type:object size:0x27 scope:local data:string
|
||||
@18453 = .data:0x8164D524; // type:object size:0x23 scope:local data:string
|
||||
@18454 = .data:0x8164D547; // type:object size:0xC scope:local data:string
|
||||
@18455 = .data:0x8164D553; // type:object size:0xA scope:local data:string
|
||||
@18456 = .data:0x8164D55D; // type:object size:0xA scope:local data:string
|
||||
@18457 = .data:0x8164D567; // type:object size:0x9 scope:local data:string
|
||||
@18458 = .data:0x8164D570; // type:object size:0xB scope:local data:string
|
||||
@18460 = .data:0x8164D57B; // type:object size:0xB scope:local data:string
|
||||
@18461 = .data:0x8164D586; // type:object size:0xD scope:local data:string
|
||||
@18462 = .data:0x8164D593; // type:object size:0xB scope:local data:string
|
||||
@18463 = .data:0x8164D59E; // type:object size:0xB scope:local data:string
|
||||
@18464 = .data:0x8164D5A9; // type:object size:0xB scope:local data:string
|
||||
@18465 = .data:0x8164D5B4; // type:object size:0xB scope:local data:string
|
||||
@18467 = .data:0x8164D5BF; // type:object size:0x9 scope:local data:string
|
||||
@18469 = .data:0x8164D5C8; // type:object size:0xB scope:local data:string
|
||||
@18470 = .data:0x8164D5D3; // type:object size:0xB scope:local data:string
|
||||
@18471 = .data:0x8164D5DE; // type:object size:0xA scope:local data:string
|
||||
@18472 = .data:0x8164D5E8; // type:object size:0xB scope:local data:string
|
||||
@18473 = .data:0x8164D5F3; // type:object size:0xD scope:local data:string
|
||||
@18474 = .data:0x8164D600; // type:object size:0x10 scope:local data:string
|
||||
@18475 = .data:0x8164D610; // type:object size:0xB scope:local data:string
|
||||
@18476 = .data:0x8164D61B; // type:object size:0xE scope:local data:string
|
||||
@18477 = .data:0x8164D629; // type:object size:0xA scope:local data:string
|
||||
@18478 = .data:0x8164D633; // type:object size:0xA scope:local data:string
|
||||
@18479 = .data:0x8164D63D; // type:object size:0x9 scope:local data:string
|
||||
@18554 = .data:0x8164D648; // type:object size:0x34 scope:local
|
||||
@18692 = .data:0x8164D67C; // type:object size:0xF scope:local data:string
|
||||
@18693 = .data:0x8164D68B; // type:object size:0xE scope:local data:string
|
||||
@18695 = .data:0x8164D699; // type:object size:0xA scope:local data:string
|
||||
@18696 = .data:0x8164D6A3; // type:object size:0xC scope:local data:string
|
||||
@18697 = .data:0x8164D6AF; // type:object size:0xC scope:local data:string
|
||||
@18698 = .data:0x8164D6BB; // type:object size:0xB scope:local data:string
|
||||
@18826 = .data:0x8164D6C6; // type:object size:0xF scope:local data:string
|
||||
__vt__Q33ipl5scene11ChanAppEdit = .data:0x8164D6D8; // type:object size:0x28
|
||||
@15167 = .data:0x8164D7C0; // type:object size:0x7C scope:local
|
||||
...data.0 = .data:0x8164D7C0; // type:label scope:local
|
||||
@@ -17535,20 +17555,20 @@ __vt__Q39textinput12candidatebox4Base = .data:0x8165DFA8; // type:object size:0x
|
||||
__vt__Q39textinput12candidatebox18CandidateBoxCaller = .data:0x8165DFFC; // type:object size:0x1C
|
||||
__vt__Q39textinput11nw4rmanager11AnmObserver = .data:0x8165E018; // type:object size:0x4C
|
||||
__vt__Q39textinput4util12AnimObserver = .data:0x8165E064; // type:object size:0xC
|
||||
lbl_8165E070 = .data:0x8165E070; // type:object size:0xC data:string
|
||||
lbl_8165E080 = .data:0x8165E080; // type:object size:0x10 data:string
|
||||
lbl_8165E090 = .data:0x8165E090; // type:object size:0xD data:string
|
||||
lbl_8165E0A0 = .data:0x8165E0A0; // type:object size:0xC data:string
|
||||
@6142 = .data:0x8165E070; // type:object size:0xC scope:local data:string
|
||||
@6143 = .data:0x8165E080; // type:object size:0x10 scope:local data:string
|
||||
@6144 = .data:0x8165E090; // type:object size:0xD scope:local data:string
|
||||
@6145 = .data:0x8165E0A0; // type:object size:0xC scope:local data:string
|
||||
csPaneToAnimation__Q29textinput7toolbar = .data:0x8165E0B0; // type:object size:0x100
|
||||
lbl_8165E1B0 = .data:0x8165E1B0; // type:object size:0xD data:string
|
||||
lbl_8165E1C0 = .data:0x8165E1C0; // type:object size:0xC data:string
|
||||
lbl_8165E1CC = .data:0x8165E1CC; // type:object size:0xD data:string
|
||||
lbl_8165E1DC = .data:0x8165E1DC; // type:object size:0xC data:string
|
||||
lbl_8165E1E8 = .data:0x8165E1E8; // type:object size:0xC data:string
|
||||
lbl_8165E1F8 = .data:0x8165E1F8; // type:object size:0x10 data:string
|
||||
jumptable_8165E208 = .data:0x8165E208; // type:object size:0x30 scope:local
|
||||
lbl_8165E238 = .data:0x8165E238; // type:object size:0xC data:string
|
||||
jumptable_8165E244 = .data:0x8165E244; // type:object size:0x1C scope:local
|
||||
@6802 = .data:0x8165E1B0; // type:object size:0xD scope:local data:string
|
||||
@6805 = .data:0x8165E1C0; // type:object size:0xC scope:local data:string
|
||||
@6808 = .data:0x8165E1CC; // type:object size:0xD scope:local data:string
|
||||
@6812 = .data:0x8165E1DC; // type:object size:0xC scope:local data:string
|
||||
@6816 = .data:0x8165E1E8; // type:object size:0xC scope:local data:string
|
||||
@6817 = .data:0x8165E1F8; // type:object size:0x10 scope:local data:string
|
||||
@6837 = .data:0x8165E208; // type:object size:0x30 scope:local
|
||||
@6894 = .data:0x8165E238; // type:object size:0xC scope:local data:string
|
||||
@6937 = .data:0x8165E244; // type:object size:0x1C scope:local
|
||||
__vt__Q39textinput7toolbar19ToggleButtonAnmPane = .data:0x8165E260; // type:object size:0x2C
|
||||
__vt__Q39textinput7toolbar19NormalButtonAnmPane = .data:0x8165E28C; // type:object size:0x2C
|
||||
__vt__Q39textinput7toolbar7AnmPane = .data:0x8165E2B8; // type:object size:0x2C
|
||||
@@ -21691,7 +21711,7 @@ lbl_816965C4 = .sdata:0x816965C4; // type:object size:0x6 data:string
|
||||
lbl_816965CA = .sdata:0x816965CA; // type:object size:0x4
|
||||
smButtonName__Q33ipl5scene13AddressAddSel = .sdata:0x816965D0; // type:object size:0x8
|
||||
@10971 = .sdata:0x816965D8; // type:object size:0x4 scope:local data:string
|
||||
lbl_816965E0 = .sdata:0x816965E0; // type:object size:0x4 data:4byte
|
||||
sInputPaneName = .sdata:0x816965E0; // type:object size:0x4 data:4byte
|
||||
lbl_816965E4 = .sdata:0x816965E4; // type:object size:0x4 data:string
|
||||
lbl_816965E8 = .sdata:0x816965E8; // type:object size:0x2
|
||||
lbl_816965EA = .sdata:0x816965EA; // type:object size:0x6 data:string
|
||||
@@ -22266,10 +22286,10 @@ lbl_816973C4 = .sdata:0x816973C4; // type:object size:0x4 data:4byte
|
||||
lbl_816973C8 = .sdata:0x816973C8; // type:object size:0x8
|
||||
lbl_816973D0 = .sdata:0x816973D0; // type:object size:0x8 data:string
|
||||
lbl_816973D8 = .sdata:0x816973D8; // type:object size:0x8 data:string
|
||||
lbl_816973E0 = .sdata:0x816973E0; // type:object size:0x4 data:4byte
|
||||
lbl_816973E4 = .sdata:0x816973E4; // type:object size:0x4 data:4byte
|
||||
lbl_816973E8 = .sdata:0x816973E8; // type:object size:0x5 data:string
|
||||
lbl_816973F0 = .sdata:0x816973F0; // type:object size:0x7 data:string
|
||||
COMMON_BUTTON_ANIM__Q29textinput7toolbar = .sdata:0x816973E0; // type:object size:0x4 scope:local data:4byte
|
||||
COMMON_CHG_ANIM__Q29textinput7toolbar = .sdata:0x816973E4; // type:object size:0x4 scope:local data:4byte
|
||||
@6901 = .sdata:0x816973E8; // type:object size:0x5 scope:local data:string
|
||||
@6908 = .sdata:0x816973F0; // type:object size:0x7 scope:local data:string
|
||||
lbl_816973F8 = .sdata:0x816973F8; // type:object size:0x4 data:4byte
|
||||
lbl_81697400 = .sdata:0x81697400; // type:object size:0x4 data:4byte
|
||||
lbl_81697404 = .sdata:0x81697404; // type:object size:0x4 data:4byte
|
||||
@@ -23523,7 +23543,7 @@ s_fatalVFFlag = .sbss:0x81698D7C; // type:object size:0x4 scope:local data:4byte
|
||||
CDBPrintDebugLevel = .sbss:0x81698D80; // type:object size:0x4 data:4byte
|
||||
s_lastNANDError = .sbss:0x81698D84; // type:object size:0x4 scope:local data:4byte
|
||||
s_lastVFError = .sbss:0x81698D88; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81698D8C = .sbss:0x81698D8C; // type:object size:0x4 scope:local data:4byte
|
||||
CDBDatabaseWorkBuf = .sbss:0x81698D8C; // type:object size:0x4 data:4byte
|
||||
s_recordPool = .sbss:0x81698D90; // type:object size:0x4 scope:local data:4byte
|
||||
s_databasePool = .sbss:0x81698D94; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81698D98 = .sbss:0x81698D98; // type:object size:0x4 data:4byte
|
||||
|
||||
@@ -36,3 +36,7 @@ SECTIONS {
|
||||
__ArenaLo = (_db_stack_addr + 0x1F) & ~0x1F;
|
||||
__ArenaHi = $ARENAHI;
|
||||
}
|
||||
|
||||
FORCEACTIVE {
|
||||
$FORCEACTIVE
|
||||
}
|
||||
|
||||
173
configure.py
173
configure.py
@@ -623,8 +623,9 @@ config.libs = [
|
||||
Object(Matching, "system/enc_dummy.c"),
|
||||
Object(Matching, "system/rvl_dec.c"),
|
||||
Object(Matching, "system/RIPL_BoardRecord.c"),
|
||||
Object(Equivalent, "system/iplSystem.cpp"),
|
||||
Object(Matching, "system/iplSystem.cpp"),
|
||||
Object(NonMatching, "system/iplController.cpp"),
|
||||
Object(NonMatching, "system/iplControllerManager.cpp"),
|
||||
Object(Matching, "system/iplChannelManager.cpp"),
|
||||
Object(Matching, "system/iplChannelScriptManager.cpp"),
|
||||
Object(Matching, "system/iplNand.cpp"),
|
||||
@@ -641,7 +642,7 @@ config.libs = [
|
||||
Object(Matching, "system/iplCdbManager.cpp"),
|
||||
Object(Matching, "system/iplCdbWrapper.cpp"),
|
||||
Object(Matching, "system/iplPlayTimeLog.cpp"),
|
||||
Object(Equivalent, "system/iplNwc24Manager.cpp"),
|
||||
Object(Matching, "system/iplNwc24Manager.cpp"),
|
||||
Object(Matching, "system/iplPointer.cpp"),
|
||||
Object(Matching, "system/iplPointerCore.cpp"),
|
||||
Object(Matching, "system/iplDialogWindow.cpp"),
|
||||
@@ -653,7 +654,7 @@ config.libs = [
|
||||
Object(Matching, "system/iplWarningHandler.cpp"),
|
||||
Object(Matching, "system/iplSocketSetting.cpp"),
|
||||
Object(Matching, "system/iplPostmanManager.cpp"),
|
||||
Object(NonMatching, "system/iplSaveDataManager.cpp"),
|
||||
Object(Matching, "system/iplSaveDataManager.cpp"),
|
||||
Object(Matching, "system/iplChannelRsoThread.cpp"),
|
||||
Object(Matching, "system/RsoSystem.cpp"),
|
||||
Object(Matching, "system/iplCdbBackup.cpp"),
|
||||
@@ -662,7 +663,7 @@ config.libs = [
|
||||
Object(Matching, "system/iplNandWrapper.cpp"),
|
||||
Object(Matching, "system/main.cpp"),
|
||||
Object(Matching, "system/iplBS2Manager.cpp"),
|
||||
Object(NonMatching, "system/TVRC.cpp"),
|
||||
Object(Matching, "system/TVRC.cpp"),
|
||||
Object(Matching, "system/iplTVRCManager.cpp"),
|
||||
Object(Matching, "system/_DATA_.c"),
|
||||
]
|
||||
@@ -671,7 +672,7 @@ config.libs = [
|
||||
Object(Matching, "utility/iplTVRCUtils.cpp"),
|
||||
Object(Matching, "utility/iplTree.cpp"),
|
||||
Object(Matching, "utility/iplFrameController.cpp"),
|
||||
Object(Equivalent, "utility/iplGraphics.cpp"),
|
||||
Object(Matching, "utility/iplGraphics.cpp"),
|
||||
Object(Matching, "utility/iplCapture.cpp"),
|
||||
Object(Matching, "utility/iplUtility.cpp"),
|
||||
Object(Matching, "utility/iplThread.cpp"),
|
||||
@@ -692,19 +693,19 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("iplwww", [
|
||||
Object(Equivalent, "iplwww/www_browser.cpp"),
|
||||
Object(Matching, "iplwww/www_browser.cpp"),
|
||||
Object(Matching, "iplwww/www_message.cpp"),
|
||||
Object(Matching, "iplwww/www_surface.cpp"),
|
||||
Object(Matching, "iplwww/www_thread.cpp"),
|
||||
Object(Matching, "iplwww/www_print.cpp"),
|
||||
Object(Equivalent, "iplwww/www_window.cpp"),
|
||||
Object(Matching, "iplwww/www_window.cpp"),
|
||||
Object(Matching, "iplwww/www_trasition.cpp"),
|
||||
Object(Equivalent, "iplwww/www_wiisetting.cpp"),
|
||||
Object(Matching, "iplwww/www_arcreader.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("homebutton", [
|
||||
Object(Equivalent, "homebutton/HBMBase.cpp"),
|
||||
Object(Matching, "homebutton/HBMBase.cpp"),
|
||||
Object(Matching, "homebutton/HBMAnmController.cpp"),
|
||||
Object(Matching, "homebutton/HBMController.cpp"),
|
||||
Object(Matching, "homebutton/HBMFrameController.cpp"),
|
||||
@@ -738,9 +739,9 @@ config.libs = [
|
||||
),
|
||||
IPLSection("board", [
|
||||
Object(Equivalent, "scene/board/iplBoard.cpp"),
|
||||
Object(Equivalent, "scene/board/iplBoardObject.cpp"),
|
||||
Object(Matching, "scene/board/iplBoardObject.cpp"),
|
||||
Object(Matching, "scene/board/iplBoardSD.cpp"),
|
||||
Object(Equivalent, "scene/board/iplUrlProcessor.cpp"),
|
||||
Object(Matching, "scene/board/iplUrlProcessor.cpp"),
|
||||
Object(Equivalent, "scene/board/iplFocusObject.cpp"),
|
||||
]
|
||||
),
|
||||
@@ -750,15 +751,15 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("calendar", [
|
||||
Object(Equivalent, "scene/calendar/iplCalendar.cpp"),
|
||||
Object(Equivalent, "scene/calendar/iplDate.cpp"),
|
||||
Object(Matching, "scene/calendar/iplCalendar.cpp"),
|
||||
Object(Matching, "scene/calendar/iplDate.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("channelEdit", [
|
||||
Object(Matching, "scene/channelEdit/iplChannelEdit.cpp"),
|
||||
Object(Equivalent, "scene/channelEdit/iplChanAppBase.cpp"),
|
||||
Object(Equivalent, "scene/channelEdit/iplChanAppBox.cpp"),
|
||||
Object(Equivalent, "scene/channelEdit/iplChanAppEdit.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppBase.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppBox.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplChanAppEdit.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplAnmController.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplNandSDCardManager.cpp"),
|
||||
Object(Matching, "scene/channelEdit/iplThumbnail.cpp"),
|
||||
@@ -783,12 +784,12 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("kitayamaTest", [
|
||||
Object(Equivalent, "scene/kitayamaTest/iplKitayamaTest.cpp"),
|
||||
Object(Matching, "scene/kitayamaTest/iplKitayamaTest.cpp"),
|
||||
Object(Matching, "scene/kitayamaTest/nandsdworker_autotest.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("letterWriter", [
|
||||
Object(Equivalent, "scene/letterWriter/iplLetterWriter.cpp"),
|
||||
Object(Matching, "scene/letterWriter/iplLetterWriter.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("limitOver", [
|
||||
@@ -899,7 +900,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("bannerSound", [
|
||||
Object(Equivalent, "bannerSound/AudioWavePlayer.cpp"),
|
||||
Object(Matching, "bannerSound/AudioWavePlayer.cpp"),
|
||||
Object(Equivalent, "bannerSound/AxAdpcmPlayer.cpp"),
|
||||
Object(Matching, "bannerSound/BannerSoundPlayer.cpp"),
|
||||
Object(Matching, "bannerSound/AudioWaveUtility.cpp"),
|
||||
@@ -911,8 +912,8 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiCellPhone.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiCandidateBox.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiToolBar.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiPredictLang.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiSignWindow.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
@@ -931,7 +932,7 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Equivalent, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -944,7 +945,7 @@ config.libs = [
|
||||
Object(Matching, "channelScript/systemmenu/VmSystem.c"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSSystem.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSLayout.cpp"),
|
||||
Object(Equivalent, "channelScript/systemmenu/iplCSPane.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSPane.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSMaterial.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSTexture.cpp"),
|
||||
Object(Matching, "channelScript/systemmenu/iplCSSavedata.cpp"),
|
||||
@@ -980,7 +981,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
ZI8Lib("zi8clib", [
|
||||
Object(NonMatching, "clib/zaddress.c"),
|
||||
Object(Matching, "clib/zaddress.c"),
|
||||
Object(NonMatching, "clib/zconvert.c"),
|
||||
Object(NonMatching, "clib/zi81key.c"),
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
@@ -1001,7 +1002,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8space.c"),
|
||||
Object(NonMatching, "clib/zi8uwd.c"),
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(NonMatching, "clib/zi8ZHuwd.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
@@ -1015,18 +1016,18 @@ config.libs = [
|
||||
# RevoEX
|
||||
RevoEXLib("cdb", [
|
||||
Object(Matching, "cdb/cdb.c"),
|
||||
Object(Equivalent, "cdb/CDBConv.c"), # hmm
|
||||
Object(NonMatching, "cdb/CDBDatabase.c"),
|
||||
Object(Equivalent, "cdb/CDBFileSystemUtils.c"),
|
||||
Object(Matching, "cdb/CDBConv.c"), # hmm
|
||||
Object(Matching, "cdb/CDBDatabase.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemUtils.c"),
|
||||
Object(Matching, "cdb/CDBFileSystem.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemVF.c"),
|
||||
Object(Matching, "cdb/CDBFileSystemSD.c"),
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(NonMatching, "cdb/CDBRecordKey.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(NonMatching, "cdb/CDBSystem.c"),
|
||||
Object(Equivalent, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
Object(Matching, "cdb/CDBFBridgeVF.c"),
|
||||
Object(Matching, "cdb/CDBFBridgeSD.c"),
|
||||
@@ -1035,7 +1036,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RevoEXLib("ncd", [
|
||||
Object(NonMatching, "ncd/ncdsystem.c"),
|
||||
Object(Matching, "ncd/ncdsystem.c"),
|
||||
Object(NonMatching, "ncd/ncdsleep.c"),
|
||||
]
|
||||
),
|
||||
@@ -1068,12 +1069,12 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RevoEXLib("nwc24", [
|
||||
Object(NonMatching, "nwc24/NWC24StdAPI.c"),
|
||||
Object(Matching, "nwc24/NWC24StdAPI.c"),
|
||||
Object(Matching, "nwc24/NWC24FileAPI.c"),
|
||||
Object(Matching, "nwc24/NWC24Config.c"),
|
||||
Object(Matching, "nwc24/NWC24Utils.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Manage.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(Matching, "nwc24/NWC24Manage.c"),
|
||||
Object(Matching, "nwc24/NWC24MsgObj.c"),
|
||||
Object(NonMatching, "nwc24/NWC24MBoxCtrl.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Mime.c"),
|
||||
Object(Matching, "nwc24/NWC24Stream.c"),
|
||||
@@ -1083,18 +1084,18 @@ config.libs = [
|
||||
Object(NonMatching, "nwc24/NWC24MsgSubject.c"),
|
||||
Object(Matching, "nwc24/NWC24Schedule.c"),
|
||||
Object(NonMatching, "nwc24/NWC24DateParser.c"),
|
||||
Object(Equivalent, "nwc24/NWC24FriendList.c"),
|
||||
Object(Matching, "nwc24/NWC24FriendList.c"),
|
||||
Object(Matching, "nwc24/NWC24SecretFList.c"),
|
||||
Object(NonMatching, "nwc24/NWC24UserId.c"),
|
||||
Object(Matching, "nwc24/NWC24UserId.c"),
|
||||
Object(Matching, "nwc24/NWC24Time.c"),
|
||||
Object(Matching, "nwc24/NWC24Ipc.c"),
|
||||
Object(NonMatching, "nwc24/NWC24Download.c"),
|
||||
Object(Equivalent, "nwc24/NWC24CHJump.c"),
|
||||
Object(Matching, "nwc24/NWC24CHJump.c"),
|
||||
Object(NonMatching, "nwc24/NWC24System.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("so", [
|
||||
Object(NonMatching, "so/SOCommon.c"),
|
||||
Object(Matching, "so/SOCommon.c"),
|
||||
Object(NonMatching, "so/SOBasic.c"),
|
||||
Object(NonMatching, "so/SOInformation.c"),
|
||||
Object(NonMatching, "so/SOOption.c"),
|
||||
@@ -1159,19 +1160,19 @@ config.libs = [
|
||||
Object(Matching, "vf/system/pf_system.c"),
|
||||
|
||||
Object(Matching, "vf/develop/d_vf.c"),
|
||||
Object(NonMatching, "vf/develop/d_vf_sys.c"),
|
||||
Object(Matching, "vf/develop/d_vf_sys.c"),
|
||||
Object(Matching, "vf/develop/d_hash.c"),
|
||||
Object(Matching, "vf/develop/d_time.c"),
|
||||
Object(Matching, "vf/develop/d_common.c"),
|
||||
Object(NonMatching, "vf/develop/nand_drv.c"),
|
||||
Object(NonMatching, "vf/develop/sd_drv.c"),
|
||||
Object(Matching, "vf/develop/nand_drv.c"),
|
||||
Object(Matching, "vf/develop/sd_drv.c"),
|
||||
]
|
||||
),
|
||||
RevoEXLib("wd", [
|
||||
Object(Matching, "wd/wd_misc.c"),
|
||||
Object(Matching, "wd/wd_request.c"),
|
||||
Object(Matching, "wd/wd_init.c"),
|
||||
Object(NonMatching, "wd/WDScan.c"),
|
||||
Object(Matching, "wd/WDScan.c"),
|
||||
]
|
||||
),
|
||||
# RVLFaceLib
|
||||
@@ -1197,20 +1198,20 @@ config.libs = [
|
||||
# TMC JPEG
|
||||
TMCJpegLib(
|
||||
[
|
||||
Object(NonMatching, "buffer/mkhdec3.c"),
|
||||
Object(Matching, "buffer/mkhdec3.c"),
|
||||
Object(Matching, "buffer/buffer_system.c"),
|
||||
Object(Equivalent, "buffer/getcode.c"),
|
||||
Object(Matching, "buffer/getcode.c"),
|
||||
Object(NonMatching, "buffer/idct_block_var.c"),
|
||||
|
||||
Object(Matching, "api/decapi.c"),
|
||||
|
||||
Object(Matching, "jpegdec/jdec.c"),
|
||||
Object(NonMatching, "jpegdec/jdec_main.c"),
|
||||
Object(Matching, "jpegdec/jdec_main.c"),
|
||||
Object(Matching, "jpegdec/jpformat.c"),
|
||||
|
||||
Object(NonMatching, "exif/exif_parse.c"),
|
||||
|
||||
Object(Equivalent, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(Matching, "reschange/iqdec_resolution_change_a3.c"),
|
||||
Object(NonMatching, "reschange/idct_resolution_change_var.c"),
|
||||
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoY8U8V8.c"),
|
||||
@@ -1299,7 +1300,7 @@ config.libs = [
|
||||
Object(Matching, "ut/ut_ResFontBase.cpp"),
|
||||
Object(Matching, "ut/ut_ResFont.cpp"),
|
||||
Object(NonMatching, "ut/ut_ArchiveFontBase.cpp"),
|
||||
Object(NonMatching, "ut/ut_ArchiveFont.cpp"),
|
||||
Object(Matching, "ut/ut_ArchiveFont.cpp"),
|
||||
Object(Matching, "ut/ut_CharWriter.cpp"),
|
||||
Object(Matching, "ut/ut_TextWriterBase.cpp"),
|
||||
]
|
||||
@@ -1446,7 +1447,7 @@ config.libs = [
|
||||
RVLSDKLib("axfx", [
|
||||
Object(Matching, "axfx/AXFXReverbHi.c"),
|
||||
Object(Matching, "axfx/AXFXReverbHiDpl2.c"),
|
||||
Object(NonMatching, "axfx/AXFXReverbHiExp.c"),
|
||||
Object(Matching, "axfx/AXFXReverbHiExp.c"),
|
||||
Object(NonMatching, "axfx/AXFXReverbHiExpDpl2.c"),
|
||||
Object(Matching, "axfx/AXFXDelay.c"),
|
||||
Object(Matching, "axfx/AXFXReverbStd.c"),
|
||||
@@ -1483,7 +1484,7 @@ config.libs = [
|
||||
Object(Matching, "card/CARDBios.c"),
|
||||
Object(Matching, "card/CARDUnlock.c"),
|
||||
Object(Matching, "card/CARDRdwr.c"),
|
||||
Object(Equivalent, "card/CARDBlock.c"),
|
||||
Object(Matching, "card/CARDBlock.c"),
|
||||
Object(Matching, "card/CARDDir.c"),
|
||||
Object(Matching, "card/CARDCheck.c"),
|
||||
Object(Matching, "card/CARDMount.c"),
|
||||
@@ -1550,7 +1551,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("wpad", [
|
||||
Object(Equivalent, "wpad/WPAD.c"),
|
||||
Object(Matching, "wpad/WPAD.c"),
|
||||
Object(NonMatching, "wpad/WPADHIDParser.c"),
|
||||
Object(Matching, "wpad/WPADMem.c"),
|
||||
Object(Matching, "wpad/WPADEncrypt.c"),
|
||||
@@ -1699,7 +1700,7 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(NonMatching, "fa/pf_fat16.c"),
|
||||
Object(NonMatching, "fa/pf_fat32.c"),
|
||||
Object(NonMatching, "fa/pf_fatfs.c"),
|
||||
Object(Matching, "fa/pf_fatfs.c"),
|
||||
Object(NonMatching, "fa/pf_file.c"),
|
||||
Object(NonMatching, "fa/pf_path.c"),
|
||||
Object(NonMatching, "fa/pf_sector.c"),
|
||||
@@ -1714,7 +1715,7 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_closedir.c"),
|
||||
Object(Matching, "fa/pf_closedir.c"),
|
||||
Object(NonMatching, "fa/pf_combine.c"),
|
||||
Object(NonMatching, "fa/pf_create.c"),
|
||||
Object(NonMatching, "fa/pf_createdir.c"),
|
||||
@@ -1722,27 +1723,27 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_derrnum.c"),
|
||||
Object(NonMatching, "fa/pf_detach.c"),
|
||||
Object(NonMatching, "fa/pf_divide.c"),
|
||||
Object(NonMatching, "fa/pf_errnum.c"),
|
||||
Object(Matching, "fa/pf_errnum.c"),
|
||||
Object(NonMatching, "fa/pf_fadjust.c"),
|
||||
Object(NonMatching, "fa/pf_fappend.c"),
|
||||
Object(NonMatching, "fa/pf_fchdir.c"),
|
||||
Object(NonMatching, "fa/pf_fclose.c"),
|
||||
Object(Matching, "fa/pf_fclose.c"),
|
||||
Object(NonMatching, "fa/pf_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_feof.c"),
|
||||
Object(NonMatching, "fa/pf_ferror.c"),
|
||||
Object(Matching, "fa/pf_feof.c"),
|
||||
Object(Matching, "fa/pf_ferror.c"),
|
||||
Object(NonMatching, "fa/pf_finfo.c"),
|
||||
Object(NonMatching, "fa/pf_flock.c"),
|
||||
Object(Matching, "fa/pf_flock.c"),
|
||||
Object(NonMatching, "fa/pf_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_format.c"),
|
||||
Object(NonMatching, "fa/pf_fread.c"),
|
||||
Object(Matching, "fa/pf_fread.c"),
|
||||
Object(NonMatching, "fa/pf_fseek.c"),
|
||||
Object(NonMatching, "fa/pf_fsetclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pf_fsnext.c"),
|
||||
Object(NonMatching, "fa/pf_fstat.c"),
|
||||
Object(NonMatching, "fa/pf_fsync.c"),
|
||||
Object(NonMatching, "fa/pf_fwrite.c"),
|
||||
Object(Matching, "fa/pf_fsync.c"),
|
||||
Object(Matching, "fa/pf_fwrite.c"),
|
||||
Object(NonMatching, "fa/pf_getdev.c"),
|
||||
Object(NonMatching, "fa/pf_getvol.c"),
|
||||
Object(NonMatching, "fa/pf_getvolcfg.c"),
|
||||
@@ -1831,19 +1832,19 @@ config.libs = [
|
||||
Object(NonMatching, "fa/api/FACreatedir.c"),
|
||||
Object(NonMatching, "fa/api/FADetach.c"),
|
||||
Object(NonMatching, "fa/api/FAErrnum.c"),
|
||||
Object(NonMatching, "fa/api/FAFclose.c"),
|
||||
Object(NonMatching, "fa/api/FAFinfo.c"),
|
||||
Object(Matching, "fa/api/FAFclose.c"),
|
||||
Object(Matching, "fa/api/FAFinfo.c"),
|
||||
Object(NonMatching, "fa/api/FAFopen.c"),
|
||||
Object(NonMatching, "fa/api/FAFormat.c"),
|
||||
Object(NonMatching, "fa/api/FAFread.c"),
|
||||
Object(Matching, "fa/api/FAFread.c"),
|
||||
Object(NonMatching, "fa/api/FAFseek.c"),
|
||||
Object(NonMatching, "fa/api/FAFsfirst.c"),
|
||||
Object(NonMatching, "fa/api/FAFsnext.c"),
|
||||
Object(NonMatching, "fa/api/FAFstat.c"),
|
||||
Object(NonMatching, "fa/api/FAFwrite.c"),
|
||||
Object(Matching, "fa/api/FAFwrite.c"),
|
||||
Object(NonMatching, "fa/api/FAGetdev.c"),
|
||||
Object(NonMatching, "fa/api/FAInit.c"),
|
||||
Object(NonMatching, "fa/api/FAInitDiskManager.c"),
|
||||
Object(Matching, "fa/api/FAInitDiskManager.c"),
|
||||
Object(NonMatching, "fa/api/FAMount.c"),
|
||||
Object(NonMatching, "fa/api/FARegistCB.c"),
|
||||
Object(NonMatching, "fa/api/FARemove.c"),
|
||||
@@ -1863,7 +1864,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("sdi", [
|
||||
Object(NonMatching, "sdi/sdi_api.c"),
|
||||
Object(Matching, "sdi/sdi_api.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("nup", [
|
||||
@@ -1899,17 +1900,17 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
RVLSDKLib("cntcache", [
|
||||
Object(NonMatching, "cntcache/cntcache.c"),
|
||||
Object(Matching, "cntcache/cntcache.c"),
|
||||
]
|
||||
),
|
||||
# EGG library (for Nintendo EAD software)
|
||||
EGGLib(
|
||||
[
|
||||
Object(Matching, "core/eggAllocator.cpp"),
|
||||
Object(Equivalent, "core/eggAudioArcPlayerMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioArcPlayerMgr.cpp"),
|
||||
Object(Equivalent, "core/eggAudioExpMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioFxMgr.cpp"),
|
||||
Object(Equivalent, "core/eggAudioMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioMgr.cpp"),
|
||||
Object(Matching, "core/eggAudioHeapMgr.cpp"),
|
||||
Object(Matching, "core/eggColorFader.cpp"),
|
||||
Object(Matching, "core/eggDisposer.cpp"),
|
||||
@@ -1946,38 +1947,38 @@ config.libs = [
|
||||
Object(NonMatching, "MSL_Common_Embedded/ansi_fp.c"),
|
||||
Object(Matching, "MSL_Common/ctype.c"),
|
||||
Object(NonMatching, "MSL_Common/locale.c"),
|
||||
Object(NonMatching, "MSL_Common/arith.c"),
|
||||
Object(NonMatching, "MSL_Common/bsearch.c"),
|
||||
Object(NonMatching, "MSL_Common/buffer_io.c"),
|
||||
Object(NonMatching, "MSL_Common/direct_io.c"),
|
||||
Object(Matching, "MSL_Common/arith.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/bsearch.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/buffer_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/direct_io.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/file_io.c"),
|
||||
Object(NonMatching, "MSL_Common/FILE_POS.c"),
|
||||
Object(NonMatching, "MSL_Common/mbstring.c"),
|
||||
Object(Matching, "MSL_Common/FILE_POS.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mbstring.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/mem.c"),
|
||||
Object(Matching, "MSL_Common/mem_funcs.c"),
|
||||
Object(Matching, "MSL_Common/math_api.c"),
|
||||
Object(NonMatching, "MSL_Common/misc_io.c"),
|
||||
Object(Matching, "MSL_Common/printf.c", mw_version = "GC/3.0a5.2", strip_comment=True),
|
||||
Object(NonMatching, "MSL_Common/qsort.c"),
|
||||
Object(Matching, "MSL_Common/misc_io.c"),
|
||||
Object(NonMatching, "MSL_Common/printf.c"),
|
||||
Object(Matching, "MSL_Common/qsort.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/rand.c"),
|
||||
Object(NonMatching, "MSL_Common/scanf.c"),
|
||||
Object(NonMatching, "MSL_Common/signal.c"),
|
||||
Object(NonMatching, "MSL_Common/string.c"),
|
||||
Object(Matching, "MSL_Common/signal.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/string.c"),
|
||||
Object(Matching, "MSL_Common/float.c"),
|
||||
Object(NonMatching, "MSL_Common/strtold.c"),
|
||||
Object(NonMatching, "MSL_Common/strtoul.c"),
|
||||
Object(Matching, "MSL_Common/strtoul.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(NonMatching, "MSL_Common/time.c"),
|
||||
Object(NonMatching, "MSL_Common/wctype.c"),
|
||||
Object(Matching, "MSL_Common/wctype.c"),
|
||||
Object(Matching, "MSL_Common/wmem.c"),
|
||||
Object(NonMatching, "MSL_Common/wprintf.c"),
|
||||
Object(NonMatching, "MSL_Common/wstring.c"),
|
||||
Object(NonMatching, "MSL_Common/wchar_io.c"),
|
||||
Object(Matching, "MSL_Common/wstring.c"),
|
||||
Object(Matching, "MSL_Common/wchar_io.c"),
|
||||
Object(Matching, "PPC_EABI/time.dolphin.c"),
|
||||
Object(Matching, "PPC_EABI/sysenv.GCN.c"),
|
||||
Object(Matching, "PPC_EABI/uart_console_io_gcn.c"),
|
||||
Object(Matching, "PPC_EABI/abort_exit_ppc_eabi.c"),
|
||||
Object(NonMatching, "MSL_Common/math_sun.c"),
|
||||
Object(NonMatching, "MSL_Common/extras.c"),
|
||||
Object(Matching, "MSL_Common/math_sun.c", extra_cflags=["-Cpp_exceptions on"]),
|
||||
Object(Matching, "MSL_Common/extras.c"),
|
||||
|
||||
Object(Matching, "MSL_Common_Embedded/Math/e_acos.c"),
|
||||
Object(Matching, "MSL_Common_Embedded/Math/e_asin.c"),
|
||||
|
||||
@@ -30,9 +30,9 @@ private:
|
||||
class WaveFileAiff : public WaveFile {
|
||||
public:
|
||||
WaveFileAiff();
|
||||
virtual ~WaveFileAiff() {}
|
||||
|
||||
virtual u32 getBit() const override;
|
||||
virtual ~WaveFileAiff();
|
||||
virtual int getChannels() const override { return mNumChans; }
|
||||
virtual f64 getSamplingRate() const override { return mSamplingRate; }
|
||||
virtual s32 getFrames() const override;
|
||||
@@ -67,9 +67,9 @@ private:
|
||||
class WaveFileWav : public WaveFile {
|
||||
public:
|
||||
WaveFileWav();
|
||||
virtual ~WaveFileWav() {}
|
||||
|
||||
virtual u32 getBit() const override;
|
||||
virtual ~WaveFileWav();
|
||||
virtual int getChannels() const override { return mNumChans; }
|
||||
virtual f64 getSamplingRate() const override { return mSamplingRate; }
|
||||
virtual s32 getFrames() const override;
|
||||
|
||||
@@ -272,20 +272,20 @@ namespace homebutton {
|
||||
f32 mFadeOutSeTime; // 0x798
|
||||
|
||||
private:
|
||||
static const int scSoundHeapSize_but2;
|
||||
static const int scSoundHeapSize_but3;
|
||||
static const int scSoundThreadPrio;
|
||||
static const int scDvdThreadPrio;
|
||||
static const int scSoundHeapSize_but2 = 0x60000;
|
||||
static const int scSoundHeapSize_but3 = 0x6f800;
|
||||
static const int scSoundThreadPrio = 4;
|
||||
static const int scDvdThreadPrio = 3;
|
||||
|
||||
static const int scReConnectTime;
|
||||
static const int scReConnectTime2;
|
||||
static const int scPadDrawWaitTime;
|
||||
static const int scGetPadInfoTime;
|
||||
static const int scForcusSEWaitTime;
|
||||
static const int scReConnectTime = 3600;
|
||||
static const int scReConnectTime2 = 3570;
|
||||
static const int scPadDrawWaitTime = 5;
|
||||
static const int scGetPadInfoTime = 100;
|
||||
static const int scForcusSEWaitTime = 2;
|
||||
static const f32 scOnPaneVibTime;
|
||||
static const f32 scOnPaneVibWaitTime;
|
||||
static const int scWaitStopMotorTime;
|
||||
static const int scWaitDisConnectTime;
|
||||
static const int scWaitStopMotorTime = 30;
|
||||
static const int scWaitDisConnectTime = 180;
|
||||
|
||||
static const char* scCursorLytName[res::eCursorLyt_Max];
|
||||
static const char* scCursorPaneName;
|
||||
|
||||
@@ -139,6 +139,9 @@ namespace ext_ead {
|
||||
u32 unk_0x14; // 0x14
|
||||
u32 unk_0x18; // 0x18
|
||||
u32 maxLength; // 0x1c
|
||||
|
||||
ImeData& operator=(const ImeData&);
|
||||
|
||||
} ImeData;
|
||||
|
||||
class BrowserThread : public ut_thread {
|
||||
@@ -170,6 +173,9 @@ namespace ext_ead {
|
||||
} updateIme; // ID 4
|
||||
u32 raw[6];
|
||||
} data;
|
||||
|
||||
CmdPacket& operator=(const CmdPacket&);
|
||||
|
||||
};
|
||||
|
||||
BrowserThread();
|
||||
|
||||
@@ -290,7 +290,7 @@ namespace textinput {
|
||||
public:
|
||||
PaneComponent(u32 id) : GUIComponent(id) { mpPane = NULL; }
|
||||
|
||||
virtual ~PaneComponent() {} // 0x08
|
||||
virtual ~PaneComponent(); // 0x08
|
||||
|
||||
virtual void draw(); // 0x1C
|
||||
|
||||
|
||||
@@ -162,6 +162,7 @@ namespace textinput {
|
||||
virtual void autoScroll();
|
||||
|
||||
virtual bool doWordWrap(const wchar_t* string, u32, f32);
|
||||
f32 getWordWrapRectWidth() const { return mRect.right - mRect.left; }
|
||||
virtual void drawFixString(u32);
|
||||
|
||||
virtual void onSE(sound::SE seId);
|
||||
|
||||
@@ -67,6 +67,9 @@ namespace textinput {
|
||||
virtual void setAspectRatio(bool b4x3);
|
||||
|
||||
virtual void setSecretInputMode(bool secretInputMode) { mpInputForm->setSecretModeOn(secretInputMode); }
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
void enableKSXFilter(bool compatibleFilter);
|
||||
#endif
|
||||
|
||||
virtual void setDefaultPredictionJP(int num, const char** predicts);
|
||||
virtual void setFixedPredictionJP(int num, const char** predicts);
|
||||
|
||||
@@ -14,6 +14,10 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mePredictMode(inputform::Base::PM_USEn), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator) override { mpAllocator = allocator; }
|
||||
virtual void setPredictMode(inputform::Base::PredictMode mode) { mePredictMode = mode; }
|
||||
|
||||
@@ -28,6 +32,12 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_prdicSelWidw_a.brlyt", observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -58,6 +68,15 @@ namespace textinput {
|
||||
keyboard::KeyboardBase* mpCaller; // 0xD4
|
||||
};
|
||||
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#endif
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace textinput {
|
||||
virtual void isEnableCursorCache();
|
||||
virtual void getDrawModifyStartLine();
|
||||
virtual void getDrawModifyEndLine();
|
||||
virtual void getDrawCacheStartPos();
|
||||
virtual u32 getDrawCacheStartPos() const;
|
||||
virtual void dirtyDrawCache();
|
||||
virtual void dirtyCursorCache();
|
||||
|
||||
|
||||
@@ -10,6 +10,10 @@ namespace textinput {
|
||||
namespace toolbar {
|
||||
class Base {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
|
||||
virtual void init() {}
|
||||
virtual bool isQwerty() const { return mQwerty; }
|
||||
@@ -31,6 +35,12 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_toolbar_a.brlyt", observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -107,7 +117,16 @@ namespace textinput {
|
||||
KeyType meKeyType; // 0x30
|
||||
};
|
||||
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
virtual ~Sample() {}
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
|
||||
class NormalButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
|
||||
@@ -30,10 +30,18 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
#endif
|
||||
public:
|
||||
enum {
|
||||
ON_TRIG = 0,
|
||||
|
||||
@@ -11,14 +11,18 @@
|
||||
namespace ipl {
|
||||
namespace gui {
|
||||
class PaneComponent : public ::gui::PaneComponent {};
|
||||
class PaneManager : public ::gui::PaneManager {
|
||||
class PaneManager : public ::gui::PaneManager {
|
||||
public:
|
||||
PaneManager(::gui::EventHandler* event, const nw4r::lyt::DrawInfo* drawInfo, EGG::Heap* heap, EGG::Allocator* allocator, bool bDisableCon = false) :
|
||||
::gui::PaneManager(event, allocator, drawInfo),
|
||||
mpHeap(heap),
|
||||
mbDisableCon(bDisableCon) {}
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
#endif
|
||||
|
||||
void update();
|
||||
void update(int chan);
|
||||
|
||||
@@ -12,6 +12,9 @@ namespace ipl {
|
||||
template <typename T>
|
||||
class Interporation : public utility::FrameController {
|
||||
public:
|
||||
#ifdef IPL_BOARD_OBJECT_INLINE_INTERPOLATION_DTORS
|
||||
virtual ~Interporation();
|
||||
#endif
|
||||
void init(int playback, f32 maxFrame, f32 minFrame, const T& start, const T& end, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
@@ -34,6 +37,9 @@ namespace ipl {
|
||||
template <typename T>
|
||||
class LinearIntp : public Interporation<T> {
|
||||
public:
|
||||
#ifdef IPL_BOARD_OBJECT_INLINE_INTERPOLATION_DTORS
|
||||
virtual ~LinearIntp();
|
||||
#endif
|
||||
T get() const {
|
||||
T r = mEnd * getCurrentFrame();
|
||||
T b = mStart * (mMaxFrame - mFrame);
|
||||
@@ -44,6 +50,94 @@ namespace ipl {
|
||||
T get2() const { return (((mStart * (mMaxFrame - mFrame)) + (mEnd * mFrame)) / mMaxFrame); }
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
template <typename T>
|
||||
class __declspec(novtable) HermiteIntp : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
T r =
|
||||
(mStart *
|
||||
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
|
||||
/*f32 var_f27 = mMaxFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
T sp28 = mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))));
|
||||
T sp1C = mStart * (1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
T r = sp1C - sp28;
|
||||
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
template <>
|
||||
class HermiteIntp<f32> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
f32 var_f28 = 1.0f / mMaxFrame;
|
||||
f32 r =
|
||||
(mStart *
|
||||
(1.0f + ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
#else
|
||||
template <typename T>
|
||||
class HermiteIntp : public Interporation<T> {
|
||||
public:
|
||||
@@ -94,6 +188,8 @@ namespace ipl {
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
|
||||
|
||||
@@ -35,6 +35,10 @@ namespace ipl {
|
||||
return x;
|
||||
}
|
||||
}
|
||||
#ifdef IPL_CONTROLLER_OUT_OF_LINE_ABS_CLAMP
|
||||
template <>
|
||||
f32 abs_clamp<f32>(const f32& x, const f32& y);
|
||||
#endif
|
||||
|
||||
typedef struct MTX33 : public nw4r::math::MTX33 {
|
||||
} MTX33;
|
||||
@@ -55,19 +59,27 @@ namespace ipl {
|
||||
x = r.x;
|
||||
y = r.y;
|
||||
}
|
||||
#ifdef IPL_CONTROLLER_OUT_OF_LINE_VEC2
|
||||
VEC2(f32 fx, f32 fy);
|
||||
#else
|
||||
VEC2(f32 fx, f32 fy) {
|
||||
x = fx;
|
||||
y = fy;
|
||||
}
|
||||
#endif
|
||||
|
||||
void operator=(const VEC2& r);
|
||||
|
||||
VEC2 operator*(f32 val) const { return VEC2(x * val, y * val); }
|
||||
|
||||
#ifdef IPL_CONTROLLER_OUT_OF_LINE_VEC2
|
||||
void set(f32 fx, f32 fy);
|
||||
#else
|
||||
void set(f32 fx, f32 fy) {
|
||||
x = fx;
|
||||
y = fy;
|
||||
}
|
||||
#endif
|
||||
|
||||
void clear() {
|
||||
y = 0;
|
||||
@@ -91,11 +103,15 @@ namespace ipl {
|
||||
y = r.y;
|
||||
z = 0.0f;
|
||||
}
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
VEC3(f32 fx, f32 fy, f32 fz);
|
||||
#else
|
||||
VEC3(f32 fx, f32 fy, f32 fz) {
|
||||
x = fx;
|
||||
y = fy;
|
||||
z = fz;
|
||||
}
|
||||
#endif
|
||||
|
||||
VEC3& operator+=(const VEC3& rhs) {
|
||||
VEC3Add(this, this, &rhs);
|
||||
|
||||
@@ -1,44 +1,277 @@
|
||||
#ifndef IPL_SCENE_ADDRESS_H
|
||||
#define IPL_SCENE_ADDRESS_H
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
#include "iplSceneUIHeader.h"
|
||||
|
||||
#include "scene/button/iplButton.h"
|
||||
|
||||
#include <revolution/nwc24.h>
|
||||
|
||||
namespace ipl {
|
||||
namespace nigaoe {
|
||||
class Object;
|
||||
}
|
||||
|
||||
namespace scene {
|
||||
class AddressEvent;
|
||||
|
||||
class FriendListCache {
|
||||
public:
|
||||
enum {
|
||||
FRIEND_MAX = 100,
|
||||
};
|
||||
|
||||
FriendListCache() : mbOpened(false) {}
|
||||
|
||||
BOOL init();
|
||||
void fin();
|
||||
|
||||
void add(u32 index, const NWC24FriendInfo& info);
|
||||
void update(u32 index, const wchar_t* name, u64 fdId);
|
||||
void del(u32 index);
|
||||
void swap(u32 index1, u32 index2);
|
||||
|
||||
BOOL isValidId(const NWC24UserId& userId);
|
||||
BOOL isDupId(const NWC24UserId& userId);
|
||||
BOOL isDupMail(const char* mailAddr);
|
||||
|
||||
void sendRegisterMail(u32 index);
|
||||
|
||||
s32 check();
|
||||
s32 getErrCode() const;
|
||||
|
||||
const NWC24FriendInfo& getInfo(int index) const { return mInfos[index]; }
|
||||
BOOL isThere(u32 index) const { return mbThere[index]; }
|
||||
u32 getRegFriendNum() const { return mRegFriendNum; }
|
||||
NWC24UserId getMyUserId() const { return mMyUserId; }
|
||||
s32 getLastErr() const { return mErrCode; }
|
||||
|
||||
private:
|
||||
NWC24FriendInfo mInfos[100];
|
||||
NWC24FriendInfo mInfos[FRIEND_MAX]; // 0x0000
|
||||
u8 mbThere[FRIEND_MAX]; // 0x7D00
|
||||
NWC24UserId mMyUserId; // 0x7D68
|
||||
u32 mRegFriendNum; // 0x7D70
|
||||
u8 mSendWork[0x2000]; // 0x7D74
|
||||
s32 mErrCode; // 0x9D74
|
||||
bool mbOpened; // 0x9D78
|
||||
};
|
||||
|
||||
FADER_SCENE_CLASS(Address) {
|
||||
FADER_SCENE_CLASS(Address), public ButtonEventHandlerBase {
|
||||
public:
|
||||
Address(EGG::Heap * heap, int);
|
||||
virtual void destroy() override;
|
||||
Address(EGG::Heap * heap, int mode);
|
||||
virtual ~Address();
|
||||
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void draw();
|
||||
virtual void destroy();
|
||||
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
|
||||
virtual void initCalcNormal();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
|
||||
virtual void initCalcFadeout();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
|
||||
virtual void calcCommonAfter();
|
||||
|
||||
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
|
||||
|
||||
enum {
|
||||
SCENE_ADD_WII = 1,
|
||||
SCENE_ADD_EMAIL,
|
||||
};
|
||||
|
||||
enum {
|
||||
BTN_MAX = 5,
|
||||
BTN_SPACE_MAX = BTN_MAX - 1,
|
||||
PAGE_MAX = 20,
|
||||
};
|
||||
|
||||
int getChosenFriendIndex() {
|
||||
return unk_0xC0;
|
||||
return mChosenFriend;
|
||||
}
|
||||
FriendListCache* getFriendCache() {
|
||||
return unk_0x274;
|
||||
return mpFriendCache;
|
||||
}
|
||||
|
||||
private:
|
||||
u8 unk_0x58[0x68];
|
||||
int unk_0xC0;
|
||||
u8 unk_0xC4[0x1B0];
|
||||
FriendListCache* unk_0x274;
|
||||
u8 unk_0x278[0x28];
|
||||
enum {
|
||||
FADEIN_STATE_WAIT_OPEN = 0,
|
||||
FADEIN_STATE_FADEIN,
|
||||
FADEIN_STATE_DONE,
|
||||
};
|
||||
|
||||
enum {
|
||||
STATE_INIT = 0,
|
||||
STATE_COVER_NORMAL,
|
||||
STATE_COVER_FORWARD,
|
||||
STATE_COVER_BACKWARD,
|
||||
STATE_NORMAL,
|
||||
STATE_FORWARD,
|
||||
STATE_BACKWARD,
|
||||
STATE_LOOP_FORWARD,
|
||||
STATE_LOOP_BACKWARD,
|
||||
STATE_DECIDE,
|
||||
STATE_DRAG,
|
||||
STATE_RELEASE,
|
||||
STATE_WAIT_CHILD_CST,
|
||||
STATE_WAIT_CHILD_DST,
|
||||
STATE_WAIT_CHILD_FADEOUT,
|
||||
STATE_MSG_NET,
|
||||
STATE_WAIT_PARENTAL,
|
||||
STATE_WAIT_PARENTAL_DST,
|
||||
STATE_MSG_WC,
|
||||
STATE_WAIT_PARENTAL_WC,
|
||||
STATE_WAIT_PARENTAL_DST_WC,
|
||||
STATE_MSG_NWC24_ERROR,
|
||||
STATE_MSG_FI_FULL,
|
||||
STATE_MSG_PARENTAL,
|
||||
STATE_MSG_OPEN_FAILURE,
|
||||
STATE_WAIT_DIALOG,
|
||||
STATE_DONE,
|
||||
};
|
||||
|
||||
class MiiObj {
|
||||
public:
|
||||
MiiObj();
|
||||
~MiiObj();
|
||||
|
||||
void init(nw4r::lyt::Pane* pane);
|
||||
void set(u64 fdId);
|
||||
void reset();
|
||||
|
||||
static void create_callback(nigaoe::Object* object, void* work);
|
||||
|
||||
GXTexObj mTexObj; // 0x00
|
||||
nigaoe::Object* mpNigaoe; // 0x20
|
||||
nw4r::lyt::Material* mpMaterial; // 0x24
|
||||
};
|
||||
|
||||
struct DragInfo {
|
||||
nw4r::math::VEC2 mPos; // 0x00
|
||||
int mChan; // 0x08
|
||||
int mPage; // 0x0C
|
||||
int mButton; // 0x10
|
||||
int mNextCount; // 0x14
|
||||
int mPrevCount; // 0x18
|
||||
int unk_0x1C; // 0x1C
|
||||
bool mbDragging; // 0x20
|
||||
};
|
||||
|
||||
void fistt_wait_open();
|
||||
void fistt_fadein();
|
||||
|
||||
void onInitFriendList();
|
||||
|
||||
void stt_cover_normal();
|
||||
void stt_cover_forward();
|
||||
void stt_cover_backward();
|
||||
void stt_normal();
|
||||
void stt_forward();
|
||||
void stt_backward();
|
||||
void stt_loop_forward();
|
||||
void stt_loop_backward();
|
||||
void stt_decide();
|
||||
void stt_drag();
|
||||
void stt_release();
|
||||
void stt_wait_child_cst();
|
||||
void stt_wait_child_dst();
|
||||
void stt_wait_child_fadeout();
|
||||
void stt_msg_net();
|
||||
void stt_wait_parental();
|
||||
void stt_wait_parental_dst();
|
||||
void stt_msg_wc();
|
||||
void stt_wait_parental_wc();
|
||||
void stt_wait_parental_dst_wc();
|
||||
void stt_msg_nwc24_error();
|
||||
void stt_msg_fi_full();
|
||||
void stt_msg_parental();
|
||||
void stt_msg_open_failure();
|
||||
void stt_wait_dialog();
|
||||
|
||||
void add_translate(nw4r::lyt::Pane* pane, const math::VEC2& offset);
|
||||
void set_friend(const char* paneName, u32 friendNo, u32 buttonNo, MiiObj& miiObj, bool bDrag);
|
||||
void set_page_text(const char* paneName, int page);
|
||||
void set_textbox(const char* paneName, const wchar_t* text);
|
||||
void set_textbox(const char* paneName, u32 msgId);
|
||||
void reset_friend();
|
||||
|
||||
void start_point_event(const char* paneName, controller::Interface* con);
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
void start_drag_event(const char* paneName, const controller::Interface* con);
|
||||
void start_drag_point_event(const char* paneName, controller::Interface* con);
|
||||
void start_drag_left_event(const char* paneName);
|
||||
void start_release_event(const char* paneName);
|
||||
|
||||
void on_point_event(int buttonNo, controller::Interface* con);
|
||||
void left_point_event(int buttonNo);
|
||||
|
||||
int get_button_no(const char* paneName);
|
||||
int get_button_space_no(const char* paneName);
|
||||
|
||||
void reset_gui(bool bKeepPointed);
|
||||
|
||||
BOOL is_selectable(u32 friendNo);
|
||||
|
||||
void onNextPage();
|
||||
void onPreviousPage();
|
||||
|
||||
void set_err_msg(wchar_t* errMsg, u32 errMsgLen, NWC24Err err);
|
||||
|
||||
void entry_friend();
|
||||
|
||||
bool isReleasableArea(int page, int buttonNo);
|
||||
|
||||
void changePage_onDrag();
|
||||
void movePane_onDrag();
|
||||
|
||||
DragInfo mDrag; // 0x64
|
||||
int mMode; // 0x88
|
||||
layout::Object* mpLayout; // 0x8C
|
||||
int unk_0x90; // 0x90
|
||||
AddressEvent* mpEvent; // 0x94
|
||||
gui::PaneManager* mpGui; // 0x98
|
||||
layout::Object* mpBackLayout; // 0x9C
|
||||
layout::Object* mpDialogLayout; // 0xA0
|
||||
int mFadeinState; // 0xA4
|
||||
int mWaitOpenCount; // 0xA8
|
||||
int mState; // 0xAC
|
||||
int mPage; // 0xB0
|
||||
int mNextPageNum; // 0xB4
|
||||
int mPrevPageNum; // 0xB8
|
||||
int mSelectedButton; // 0xBC
|
||||
u32 mChosenFriend; // 0xC0
|
||||
bool mbFaceValid[BTN_MAX]; // 0xC4
|
||||
int mPointCount[BTN_MAX]; // 0xCC
|
||||
bool mbParentalOK; // 0xE0
|
||||
bool mbCover; // 0xE1
|
||||
MiiObj mMiiObj[BTN_MAX]; // 0xE4
|
||||
MiiObj mNextMiiObj[BTN_MAX]; // 0x1AC
|
||||
FriendListCache* mpFriendCache; // 0x274
|
||||
GXTexObj mDragTexObj; // 0x278
|
||||
u8* mpWork; // 0x298
|
||||
f32 mDragOffsetX; // 0x29C
|
||||
|
||||
static const math::VEC2 smcPageOffset;
|
||||
|
||||
friend class AddressEvent;
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
friend class AddressEdit;
|
||||
#endif
|
||||
};
|
||||
|
||||
class AddressEvent : public ::gui::EventHandler {
|
||||
public:
|
||||
AddressEvent(Address* instance) : ::gui::EventHandler(), mpInstance(instance) {}
|
||||
|
||||
virtual void onEvent(u32 compId, u32 event, void* data);
|
||||
|
||||
private:
|
||||
Address* mpInstance; // 0x0C
|
||||
int mTrigChan; // 0x10
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -2,22 +2,125 @@
|
||||
#define IPL_SCENE_ADDRESS_EDIT_H
|
||||
|
||||
#include "iplSceneHeader.h"
|
||||
#include "scene/button/iplButton.h"
|
||||
|
||||
#include <RFL_Types.h>
|
||||
#include <revolution/nwc24.h>
|
||||
|
||||
namespace ipl {
|
||||
namespace nigaoe {
|
||||
class Object;
|
||||
}
|
||||
|
||||
namespace scene {
|
||||
FADER_SCENE_CLASS(AddressEdit) {
|
||||
class AddressEditEvent;
|
||||
class AddressInputEvent;
|
||||
class FriendListCache;
|
||||
|
||||
FADER_SCENE_CLASS(AddressEdit), public ButtonEventHandlerBase {
|
||||
public:
|
||||
AddressEdit(EGG::Heap * heap, int friendCode);
|
||||
virtual ~AddressEdit();
|
||||
|
||||
virtual void prepare();
|
||||
virtual void create();
|
||||
virtual void draw();
|
||||
|
||||
virtual void initCalcNormal();
|
||||
virtual void initCalcFadeout();
|
||||
virtual void calcCommonAfter();
|
||||
|
||||
virtual FaderSceneCommand calcFadein();
|
||||
virtual FaderSceneCommand calcNormal();
|
||||
virtual FaderSceneCommand calcFadeout();
|
||||
virtual void onEventDerived(u32 compId, u32 event, const controller::Interface* con);
|
||||
|
||||
void stt_msg_code_add();
|
||||
void stt_msg_code_edit();
|
||||
void stt_msg_parental();
|
||||
void stt_msg_nwc24_error();
|
||||
void reset_gui();
|
||||
void start_point_event(const char* paneName, controller::Interface* controller);
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
void start_ipt_point_event(const char* paneName, int channel);
|
||||
void start_ipt_left_event(const char* paneName, int channel);
|
||||
void start_ipt_trig_event(const char* paneName, int channel);
|
||||
int get_button_no(const char*);
|
||||
void add_friendinfo();
|
||||
void delete_friendinfo();
|
||||
void set_textbox(nw4r::lyt::Pane*, const wchar_t*);
|
||||
void setDefaultTitleText(const wchar_t*, bool);
|
||||
static void wiiid_utf16(u64, wchar_t*);
|
||||
static void nigaoe_create_callback_add(ipl::nigaoe::Object*, void*);
|
||||
static void nigaoe_create_callback_edit(ipl::nigaoe::Object*, void*);
|
||||
void set_err_msg(wchar_t*, u32, NWC24Err);
|
||||
void get_friendinfo();
|
||||
static u64 utf16_wiiid(const wchar_t*);
|
||||
void stt_add_code_fadein();
|
||||
void stt_add_code_fadeout();
|
||||
void stt_add_code_input();
|
||||
void stt_add_code_normal();
|
||||
void stt_add_confirm_fadein();
|
||||
void stt_add_confirm_fadeout();
|
||||
void stt_add_confirm_normal();
|
||||
void stt_add_mii_fadein();
|
||||
void stt_add_mii_fadeout();
|
||||
void stt_add_mii_input();
|
||||
void stt_add_mii_normal();
|
||||
void stt_add_name_fadein();
|
||||
void stt_add_name_fadeout();
|
||||
void stt_add_name_input();
|
||||
void stt_add_name_normal();
|
||||
void stt_ipt_input();
|
||||
void stt_ipt_normal();
|
||||
void stt_ipt_wait_fadein();
|
||||
void stt_ipt_wait_fadeout();
|
||||
void stt_msg_add_rlt();
|
||||
void stt_msg_code_invalid();
|
||||
void stt_msg_del_rlt();
|
||||
void stt_msg_dup_email();
|
||||
void stt_msg_dup_wii_no();
|
||||
void stt_msg_my_wii_no();
|
||||
void stt_msg_net();
|
||||
void stt_msg_no_established();
|
||||
void stt_msg_no_mii();
|
||||
void stt_msg_no_mii_add();
|
||||
void stt_msg_wc();
|
||||
void stt_select_mii();
|
||||
void stt_wait_btn_fadein();
|
||||
void stt_wait_btn_fadeout();
|
||||
void stt_wait_del_msg_fadein();
|
||||
void stt_wait_del_msg_fadeout();
|
||||
void stt_wait_del_msg_fadeout_to_rlt();
|
||||
void stt_wait_delete();
|
||||
void stt_wait_decide_anm_add();
|
||||
void stt_wait_parental();
|
||||
void stt_wait_parental_dst();
|
||||
void stt_wait_parental_dst_wc();
|
||||
void stt_wait_parental_wc();
|
||||
void stt_normal();
|
||||
void stt_wait_decide_anm();
|
||||
void update_friendinfo();
|
||||
void requestSceneChange(int sceneId, void* args) { reserveSceneChange(sceneId, args); }
|
||||
u32 getPreviousScene() const { return getPrevSceneID(); }
|
||||
EGG::Heap* getHeap() { return getSceneHeap(); }
|
||||
::gui::Manager* getGuiManager() { return mpManager; }
|
||||
|
||||
class String {
|
||||
public:
|
||||
void clear();
|
||||
const wchar_t* getDispCodeLong() const;
|
||||
void setName(const wchar_t* value);
|
||||
void setEMail(const wchar_t* value);
|
||||
void setWiiNo(const wchar_t* value);
|
||||
|
||||
wchar_t mValue[0x102];
|
||||
wchar_t mName[0x0c];
|
||||
wchar_t mDisplayText[0x102];
|
||||
bool mbValidMail;
|
||||
bool mbNameNotEmpty;
|
||||
bool mbHasWiiNo;
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -25,8 +128,28 @@ namespace ipl {
|
||||
SCENE_ADD_EMAIL,
|
||||
};
|
||||
|
||||
private:
|
||||
u8 unk_0x58[0x498];
|
||||
int mState;
|
||||
layout::Object* mpCodeLayout;
|
||||
AddressEditEvent* mpEditEvent;
|
||||
gui::PaneManager* mpEditGui;
|
||||
layout::Object* mpNameLayout;
|
||||
AddressInputEvent* mpInputEvent;
|
||||
gui::PaneManager* mpInputGui;
|
||||
layout::Object* mpBackgroundLayout;
|
||||
int mMode;
|
||||
int mSelectedButton;
|
||||
int mSubState;
|
||||
s32 mPointCount[5];
|
||||
u32 mSelectedFriend;
|
||||
TextBalloon* mpBalloon;
|
||||
nand::LayoutFile* mpBalloonFile;
|
||||
String mString;
|
||||
AddressEdit* mpCallbackOwner;
|
||||
bool mbParentalOK;
|
||||
nigaoe::Object* mpNigaoe;
|
||||
RFLCreateID mCreateID;
|
||||
int mNigaoeState;
|
||||
FriendListCache* mpFriendCache;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern wchar_t scTextDateJpnFormat[];
|
||||
extern wchar_t scTextDateKorFormat[];
|
||||
extern wchar_t scTextDateGerFormat[];
|
||||
extern wchar_t scTextDatePalengFormat[];
|
||||
#ifdef IPL_BOARD_DATE_HELPERS_INLINE
|
||||
extern const u32 scWeekMsgId[];
|
||||
#endif
|
||||
class focus_object;
|
||||
SCENE_CLASS(Board), public ButtonEventHandlerBase {
|
||||
public:
|
||||
@@ -81,13 +88,57 @@ namespace ipl {
|
||||
void set_text_date();
|
||||
void set_text_date(const utility::Date& date, const char* paneName);
|
||||
|
||||
#ifdef IPL_BOARD_DATE_HELPERS_INLINE
|
||||
void get_text_jpn(const utility::Date& date, wchar_t* text, u32 textLen) {
|
||||
message::Manager* msgMgr = System::getMessageManager();
|
||||
const wchar_t* week = msgMgr->getMessage(scWeekMsgId[utility::Calendar::getWeek(date)]);
|
||||
const wchar_t* sep1 = msgMgr->getMessage(MESG_CALENDAR_MONDAY);
|
||||
const wchar_t* sep2 = msgMgr->getMessage(MESG_CALENDAR_MONDAY);
|
||||
const wchar_t* weekStart = msgMgr->getMessage(MESG_CALENDAR_WEEK_START);
|
||||
const wchar_t* weekEnd = msgMgr->getMessage(MESG_CALENDAR_WEEK_END);
|
||||
|
||||
swprintf(text, textLen, scTextDateJpnFormat, date.month, sep1, date.day, sep2, weekStart, week, weekEnd);
|
||||
}
|
||||
|
||||
void get_text_kor(const utility::Date& date, wchar_t* text, u32 textLen) {
|
||||
message::Manager* msgMgr = System::getMessageManager();
|
||||
const wchar_t* week = msgMgr->getMessage(scWeekMsgId[utility::Calendar::getWeek(date)]);
|
||||
const wchar_t* sep1 = msgMgr->getMessage(MESG_CALENDAR_MONDAY);
|
||||
const wchar_t* sep2 = msgMgr->getMessage(MESG_CALENDAR_MONDAY);
|
||||
const wchar_t* weekStart = msgMgr->getMessage(MESG_CALENDAR_WEEK_START);
|
||||
const wchar_t* weekEnd = msgMgr->getMessage(MESG_CALENDAR_WEEK_END);
|
||||
|
||||
swprintf(text, textLen, scTextDateKorFormat, date.month, sep1, date.day, sep2, weekStart, week, weekEnd);
|
||||
}
|
||||
#else
|
||||
void get_text_jpn(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
void get_text_kor(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
#endif
|
||||
void get_text_spa(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
#ifdef IPL_BOARD_DATE_HELPERS_INLINE
|
||||
void get_text_ger(const utility::Date& date, wchar_t* text, u32 textLen) {
|
||||
message::Manager* msgMgr = System::getMessageManager();
|
||||
const wchar_t* week = msgMgr->getMessage(scWeekMsgId[utility::Calendar::getWeek(date)]);
|
||||
const wchar_t* weekStart = msgMgr->getMessage(MESG_CALENDAR_WEEK_START);
|
||||
const wchar_t* weekEnd = msgMgr->getMessage(MESG_CALENDAR_WEEK_END);
|
||||
|
||||
swprintf(text, textLen, scTextDateGerFormat, date.day, date.month, weekStart, week, weekEnd);
|
||||
}
|
||||
#else
|
||||
void get_text_ger(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
#endif
|
||||
void get_text_usaeng(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
void get_text_usafre(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
#ifdef IPL_BOARD_DATE_HELPERS_INLINE
|
||||
void get_text_paleng(const utility::Date& date, wchar_t* text, u32 textLen) {
|
||||
message::Manager* msgMgr = System::getMessageManager();
|
||||
const wchar_t* week = msgMgr->getMessage(scWeekMsgId[utility::Calendar::getWeek(date)]);
|
||||
|
||||
swprintf(text, textLen, scTextDatePalengFormat, week, date.day, date.month);
|
||||
}
|
||||
#else
|
||||
void get_text_paleng(const utility::Date& date, wchar_t* text, u32 textLen);
|
||||
#endif
|
||||
|
||||
void show_ricon();
|
||||
void hide_ricon();
|
||||
@@ -226,8 +277,17 @@ namespace ipl {
|
||||
STATE_DONE,
|
||||
};
|
||||
|
||||
#ifdef IPL_BOARD_INLINE_GETTERS
|
||||
static Button* get_button() {
|
||||
return static_cast<Button*>(System::getScene(SCENE_BUTTON));
|
||||
}
|
||||
static Arrow* get_arrow() {
|
||||
return static_cast<Arrow*>(System::getScene(SCENE_ARROW));
|
||||
}
|
||||
#else
|
||||
static Button* get_button();
|
||||
static Arrow* get_arrow();
|
||||
#endif
|
||||
|
||||
static const int OBJECTS_ON_SCREEN = 10;
|
||||
|
||||
|
||||
@@ -3,7 +3,15 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
#ifdef IPL_ANM_CONTROLLER_FORWARD_GUI
|
||||
namespace ipl {
|
||||
namespace gui {
|
||||
class PaneManager;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#include "layout/iplGuiManager.h"
|
||||
#endif
|
||||
#include "layout/iplLayout.h"
|
||||
|
||||
namespace ipl {
|
||||
|
||||
@@ -404,7 +404,12 @@ namespace ipl {
|
||||
int mModuleIndex; // 0x400
|
||||
EGG::ExpHeap* mpCSHeap; // 0x404
|
||||
|
||||
static ESTicketView msTicketView;
|
||||
struct TicketViewStorage {
|
||||
ESTicketView view;
|
||||
u8 pad[8];
|
||||
};
|
||||
|
||||
static TicketViewStorage msTicketView;
|
||||
static ESTicketView msUnlockTicket;
|
||||
|
||||
static const char* mscBtnNames[BTN_MAX];
|
||||
|
||||
@@ -35,7 +35,14 @@ namespace ipl {
|
||||
virtual void onSend();
|
||||
virtual int sendMessageByNWC24(NWC24UserId userId, const wchar_t* wcString);
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
virtual void setFriendInfo(const NWC24FriendInfo& info) {
|
||||
mbToFriend = true;
|
||||
mFriendInfo = info;
|
||||
}
|
||||
#else
|
||||
virtual void setFriendInfo(const NWC24FriendInfo& info);
|
||||
#endif
|
||||
virtual void setPhoto(const GXTexObj& texObj);
|
||||
|
||||
virtual int sendToWii(NWC24UserId userId, const wchar_t* wcString);
|
||||
|
||||
@@ -62,6 +62,200 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
#ifdef IPL_CONTROLLER_NATIVE_HIERARCHY
|
||||
#ifdef IPL_CONTROLLER_INLINE_INTERFACE
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature implementation
|
||||
#else
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature;
|
||||
#endif
|
||||
class Interface {
|
||||
public:
|
||||
virtual ~Interface() = 0;
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getType() const, { return -1; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getChannel() const, { return -1; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool down(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool downTrg(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool upTrg(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinch() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchOffTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int decide() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool repeat(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(BOOL rumble(int type = 0), { return FALSE; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(void cancelRumbling(), { })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getHoldFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getTrigFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getReleaseFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getClassicHoldFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getClassicTrigFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getClassicReleaseFlag() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(math::VEC2 getDpdPos() const, { return math::VEC2(0.0f, 0.0f); })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(math::VEC2 getDpdProjectionPos() const, { return math::VEC2(0.0f, 0.0f); })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(math::VEC2 getHorizon() const, { return math::VEC2(0.0f, 0.0f); })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(f32 getDpdDistance() const, { return 0.0f; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(KPADStatus* getKPADStatus() const, { return NULL; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(PADStatus* getPADStatus() const, { return NULL; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool isValidBtn() const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool isValidDpd() const, { return false; })
|
||||
virtual void setForceInvalid(bool flag) = 0;
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getMainStickX() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getMainStickY() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getSubStickX() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int getSubStickY() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(void read(), { })
|
||||
};
|
||||
|
||||
#undef IPL_CONTROLLER_DEFAULT_VIRTUAL
|
||||
#ifdef IPL_CONTROLLER_INLINE_INTERFACE
|
||||
inline Interface::~Interface() {}
|
||||
#endif
|
||||
|
||||
class Base : public Interface {
|
||||
public:
|
||||
Base(int chan, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
unk_0x1C = 0;
|
||||
KPADEnableDPD(chan);
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
}
|
||||
|
||||
Base(int chan, int type, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = type;
|
||||
unk_0x1C = 0;
|
||||
KPADEnableDPD(chan);
|
||||
}
|
||||
|
||||
virtual ~Base();
|
||||
virtual int getType() const override;
|
||||
virtual int getChannel() const override;
|
||||
virtual int decide() const override;
|
||||
virtual BOOL rumble(int timer = 0) override;
|
||||
virtual void cancelRumbling() override;
|
||||
virtual void setForceInvalid(bool flag) override;
|
||||
virtual void read() override;
|
||||
|
||||
protected:
|
||||
u8 mButton;
|
||||
u32 unk_0x08;
|
||||
OSTick mLastRumbleTime;
|
||||
s32 mRumbleType;
|
||||
u32 mChan;
|
||||
u32 mType;
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D;
|
||||
u8 unk_0x1E;
|
||||
KPADStatus* unk_0x20;
|
||||
};
|
||||
|
||||
class Revolution : public Base {
|
||||
public:
|
||||
Revolution(int chan, KPADStatus& status) : Base(chan, status) {}
|
||||
Revolution(int chan, int type, KPADStatus& status);
|
||||
virtual ~Revolution();
|
||||
virtual bool down(u32 button) const override;
|
||||
virtual bool downTrg(u32 button) const override;
|
||||
virtual bool upTrg(u32 button) const override;
|
||||
virtual int pinch() const override;
|
||||
virtual int pinchTrg() const override;
|
||||
virtual int pinchOffTrg() const override;
|
||||
virtual bool repeat(u32 button) const override;
|
||||
virtual f32 getDpdDistance() const override;
|
||||
virtual KPADStatus* getKPADStatus() const override;
|
||||
virtual int getReleaseFlag() const override;
|
||||
virtual int getTrigFlag() const override;
|
||||
virtual int getHoldFlag() const override;
|
||||
virtual math::VEC2 getDpdPos() const override;
|
||||
virtual math::VEC2 getDpdProjectionPos() const override;
|
||||
virtual math::VEC2 getHorizon() const override;
|
||||
virtual bool isValidBtn() const override;
|
||||
virtual bool isValidDpd() const override;
|
||||
virtual void read() override;
|
||||
};
|
||||
|
||||
class Classic : public Revolution {
|
||||
public:
|
||||
Classic(int chan, KPADStatus& status);
|
||||
virtual ~Classic();
|
||||
virtual bool down(u32 button) const override;
|
||||
virtual bool downTrg(u32 button) const override;
|
||||
virtual bool upTrg(u32 button) const override;
|
||||
virtual int getClassicHoldFlag() const override;
|
||||
virtual int getClassicTrigFlag() const override;
|
||||
virtual int getClassicReleaseFlag() const override;
|
||||
virtual math::VEC2 getDpdPos() const override;
|
||||
virtual math::VEC2 getDpdProjectionPos() const override;
|
||||
virtual math::VEC2 getHorizon() const override;
|
||||
virtual bool isValidDpd() const override;
|
||||
virtual void read() override;
|
||||
virtual BOOL isValidDpdClassic() const;
|
||||
|
||||
private:
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
};
|
||||
|
||||
class Master : public Interface {
|
||||
public:
|
||||
Master(Interface** controllers) : mpControllers(controllers) {}
|
||||
virtual ~Master();
|
||||
virtual bool down(u32 button) const override;
|
||||
virtual bool downTrg(u32 button) const override;
|
||||
virtual bool upTrg(u32 button) const override;
|
||||
virtual bool repeat(u32 button) const override;
|
||||
virtual int decide() const override;
|
||||
virtual void setForceInvalid(bool flag) override;
|
||||
|
||||
private:
|
||||
bool call(u32 button, bool (Interface::*func)(u32) const) const;
|
||||
Interface** mpControllers;
|
||||
};
|
||||
|
||||
class Core : public Revolution {
|
||||
public:
|
||||
Core(int chan, int type, KPADStatus& status) : Revolution(chan, type, status) {}
|
||||
virtual ~Core();
|
||||
};
|
||||
|
||||
class FreeStyle : public Revolution {
|
||||
public:
|
||||
FreeStyle(int chan, int type, KPADStatus& status) : Revolution(chan, type, status) {}
|
||||
virtual ~FreeStyle();
|
||||
};
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
Manager(EGG::Heap* heap);
|
||||
void read();
|
||||
Interface* getController(int chan);
|
||||
Interface* getMasterController();
|
||||
Interface* getYoungController();
|
||||
static void* alloc(u32 size);
|
||||
static int free(void* ptr);
|
||||
|
||||
private:
|
||||
static void* mpBuf;
|
||||
static EGG::Heap* mpParentHeap;
|
||||
static EGG::ExpHeap* mpHeap;
|
||||
static EGG::Allocator* mpAllocator;
|
||||
Interface* mControllers[4];
|
||||
u32 mControllerStorage[4][12];
|
||||
Master mMaster;
|
||||
KPADStatus mKPADStatus[4];
|
||||
s32 mInvalidCount[4];
|
||||
};
|
||||
#else
|
||||
class Base {
|
||||
public:
|
||||
Base(int chan, KPADStatus& arg1) {
|
||||
@@ -118,11 +312,11 @@ namespace ipl {
|
||||
|
||||
virtual bool setForceInvalid(bool flag); // 0x74
|
||||
|
||||
virtual f32 getMainStickX() const; // 0x78
|
||||
virtual f32 getMainStickY() const; // 0x7C
|
||||
virtual int getMainStickX() const; // 0x78
|
||||
virtual int getMainStickY() const; // 0x7C
|
||||
|
||||
virtual f32 getSubStickX() const; // 0x80
|
||||
virtual f32 getSubStickY() const; // 0x84
|
||||
virtual int getSubStickX() const; // 0x80
|
||||
virtual int getSubStickY() const; // 0x84
|
||||
|
||||
virtual void read(); // 0x88
|
||||
|
||||
@@ -169,10 +363,10 @@ namespace ipl {
|
||||
virtual math::VEC2 getDpdPos() const override;
|
||||
virtual math::VEC2 getDpdProjectionPos() const override;
|
||||
virtual math::VEC2 getHorizon() const override;
|
||||
virtual f32 getMainStickX() const override;
|
||||
virtual f32 getMainStickY() const override;
|
||||
virtual f32 getSubStickX() const override;
|
||||
virtual f32 getSubStickY() const override;
|
||||
virtual int getMainStickX() const override;
|
||||
virtual int getMainStickY() const override;
|
||||
virtual int getSubStickX() const override;
|
||||
virtual int getSubStickY() const override;
|
||||
virtual BOOL rumble(int type = 0) override;
|
||||
virtual void read() override;
|
||||
};
|
||||
@@ -228,6 +422,7 @@ namespace ipl {
|
||||
class Classic : public Revolution {
|
||||
public:
|
||||
Classic(int arg0, KPADStatus& arg1);
|
||||
virtual ~Classic();
|
||||
|
||||
virtual bool down(u32 button) const override;
|
||||
virtual bool downTrg(u32 button) const override;
|
||||
@@ -268,6 +463,7 @@ namespace ipl {
|
||||
static EGG::Allocator* mpAllocator;
|
||||
u8 dummy[0x2F8];
|
||||
};
|
||||
#endif
|
||||
} // namespace controller
|
||||
} // namespace ipl
|
||||
|
||||
|
||||
@@ -54,6 +54,9 @@ namespace ipl {
|
||||
const wchar_t* wcString; // 0x04
|
||||
u32 stringLimit; // 0x08
|
||||
u32 rowLimit; // 0x0C
|
||||
#ifdef IPL_ADDRESS_EDIT_CPP
|
||||
KeyboardSetting(KeyboardType keyboardType, const wchar_t* value, u32 limit, u32 rows);
|
||||
#endif
|
||||
} KeyboardSetting;
|
||||
|
||||
typedef struct State {
|
||||
|
||||
@@ -38,6 +38,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
const GXTexObj& getIconTexture() const { return mFaceTexObj; }
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
u8* getIconImage() const { return mpIconTex; }
|
||||
#endif
|
||||
u32 getIndex() const { return mFaceId; }
|
||||
|
||||
BOOL created() const { return mbCreated; }
|
||||
|
||||
@@ -19,6 +19,8 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
Manager(EGG::Heap* heap);
|
||||
@@ -151,6 +153,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -20,7 +20,12 @@ namespace ipl {
|
||||
|
||||
Date() : year(MIN_YEAR), month(MIN_MONTH), day(MIN_DAY) {}
|
||||
Date(int myYear, int myMonth, int myDay) : year(myYear), month(myMonth), day(myDay) {}
|
||||
#ifdef IPL_BOARD_DATE_CTOR_OUT_OF_LINE
|
||||
Date(const OSCalendarTime& cal);
|
||||
#else
|
||||
Date(const OSCalendarTime& cal) : year(cal.year), month(cal.mon + 1), day(cal.mday) {}
|
||||
#endif
|
||||
#line 24 "include/utility/iplCalendar.h"
|
||||
Date(const Date& date) : year(date.year), month(date.month), day(date.day) {}
|
||||
|
||||
static Date getMaxDate() {
|
||||
@@ -127,6 +132,9 @@ namespace ipl {
|
||||
return days[month - 1];
|
||||
}
|
||||
|
||||
#ifdef IPL_BOARD_WEEK_FUNCTION_OUT_OF_LINE
|
||||
static int getWeek(const Date& date) NO_INLINE;
|
||||
#else
|
||||
static int getWeek(const Date& date) NO_INLINE {
|
||||
int month, year, day;
|
||||
month = date.month;
|
||||
@@ -138,6 +146,8 @@ namespace ipl {
|
||||
}
|
||||
return (day + (((month * 13) + 8) / 5) + ((year / 400) + ((year + (year / 4)) - (year / 100)))) % 7;
|
||||
}
|
||||
#endif
|
||||
#line 147 "include/utility/iplCalendar.h"
|
||||
|
||||
static int getWeek(int year, int month, int day) NO_INLINE {
|
||||
if (month <= 2) {
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace EGG {
|
||||
|
||||
class SoundHeapMgr {
|
||||
public:
|
||||
SoundHeapMgr() NO_INLINE {}
|
||||
SoundHeapMgr();
|
||||
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
|
||||
@@ -17,14 +17,7 @@ namespace EGG {
|
||||
s32 soundThreadPrio; // 0x08
|
||||
s32 dvdThreadPrio; // 0x0C
|
||||
|
||||
Arg() NO_INLINE {
|
||||
pHeap = NULL;
|
||||
|
||||
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
|
||||
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
|
||||
|
||||
unk_0x04 = 0;
|
||||
}
|
||||
Arg();
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
@@ -7,6 +7,15 @@
|
||||
#include <revolution/ax.h>
|
||||
|
||||
namespace EGG {
|
||||
IAudioMgr::Arg::Arg() {
|
||||
pHeap = NULL;
|
||||
|
||||
soundThreadPrio = nw4r::snd::SoundSystem::DEFAULT_SOUND_THREAD_PRIORITY;
|
||||
dvdThreadPrio = nw4r::snd::SoundSystem::DEFAULT_DVD_THREAD_PRIORITY;
|
||||
|
||||
unk_0x04 = 0;
|
||||
}
|
||||
|
||||
SimpleAudioMgr::SimpleAudioMgrArg::SimpleAudioMgrArg() {
|
||||
soundHeapSize = DEFAULT_SOUND_HEAP_SIZE;
|
||||
}
|
||||
@@ -14,6 +23,8 @@ namespace EGG {
|
||||
SimpleAudioMgr::SimpleAudioMgr() : ArcPlayer(&getSoundHeap()) {
|
||||
}
|
||||
|
||||
SoundHeapMgr::SoundHeapMgr() {}
|
||||
|
||||
SimpleAudioMgr::~SimpleAudioMgr() {
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,19 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define SIGNAL_ACTION_DEFAULT ((__signal_func_ptr)0)
|
||||
#define SIGNAL_ACTION_IGNORE ((__signal_func_ptr)1)
|
||||
|
||||
#define SIGNAL_ABORT 1
|
||||
#define SIGNAL_UNK2 2
|
||||
#define SIGNAL_UNK3 3
|
||||
#define SIGNAL_UNK4 4
|
||||
#define SIGNAL_UNK5 5
|
||||
#define SIGNAL_UNK6 6
|
||||
#define SIGNAL_UNK7 7
|
||||
|
||||
typedef void (*__signal_func_ptr)(int);
|
||||
|
||||
int raise(int signal);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
112
libs/MSL/src/MSL_Common/FILE_POS.c
Normal file
112
libs/MSL/src/MSL_Common/FILE_POS.c
Normal file
@@ -0,0 +1,112 @@
|
||||
#include <errno.h>
|
||||
#include <internal/file_struct.h>
|
||||
#include <stdio.h>
|
||||
|
||||
enum file_kinds {
|
||||
file_closed,
|
||||
file_disk,
|
||||
file_console,
|
||||
file_unavailable
|
||||
};
|
||||
|
||||
enum io_states {
|
||||
neutral,
|
||||
writing,
|
||||
reading,
|
||||
rereading
|
||||
};
|
||||
|
||||
enum io_modes {
|
||||
io_read = 1,
|
||||
io_write = 2,
|
||||
io_append = 4
|
||||
};
|
||||
|
||||
int __flush_buffer(FILE* file, size_t* pos);
|
||||
|
||||
long _ftell(FILE* file) {
|
||||
int buf = 0;
|
||||
int pos;
|
||||
|
||||
unsigned char file_kind = file->mode.file_kind;
|
||||
if (!(file_kind == file_disk || file_kind == file_console) || file->state.error) {
|
||||
errno = EFPOS;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->state.io_state == neutral) {
|
||||
return file->pos;
|
||||
}
|
||||
|
||||
pos = file->buffer_pos + (file->buffer_ptr - file->buffer);
|
||||
|
||||
if (file->state.io_state >= rereading) {
|
||||
buf = file->state.io_state - reading;
|
||||
pos -= buf;
|
||||
}
|
||||
|
||||
if (!file->mode.binary_io) {
|
||||
int n = file->buffer_ptr - file->buffer - buf;
|
||||
unsigned char* p = file->buffer;
|
||||
|
||||
while (n-- != 0) {
|
||||
if (*p++ == '\n') {
|
||||
pos++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
||||
long ftell(FILE* stream) {
|
||||
return _ftell(stream);
|
||||
}
|
||||
|
||||
int _fseek(FILE* file, long offset, int whence) {
|
||||
if (file->mode.file_kind != file_disk || file->state.error != 0) {
|
||||
errno = EFPOS;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (file->state.io_state == writing) {
|
||||
if (__flush_buffer(file, 0) != 0) {
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
errno = EFPOS;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (whence == 1) {
|
||||
whence = 0;
|
||||
offset += _ftell(file);
|
||||
}
|
||||
|
||||
if ((whence != 2) && file->mode.io_mode != (io_read | io_write) && (file->state.io_state == reading || file->state.io_state == rereading)) {
|
||||
if ((offset >= file->pos) || offset < file->buffer_pos) {
|
||||
file->state.io_state = neutral;
|
||||
} else {
|
||||
file->buffer_ptr = file->buffer + (offset - file->buffer_pos);
|
||||
file->buffer_len = file->pos - offset;
|
||||
file->state.io_state = reading;
|
||||
}
|
||||
} else {
|
||||
file->state.io_state = neutral;
|
||||
}
|
||||
|
||||
if (file->state.io_state == neutral) {
|
||||
if (file->pos_proc != 0 && (*file->pos_proc)(file->handle, &offset, whence, file->ref)) {
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
errno = EFPOS;
|
||||
return -1;
|
||||
}
|
||||
|
||||
file->state.eof = 0;
|
||||
file->pos = offset;
|
||||
file->buffer_len = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
142
libs/MSL/src/MSL_Common/arith.c
Normal file
142
libs/MSL/src/MSL_Common/arith.c
Normal file
@@ -0,0 +1,142 @@
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
|
||||
typedef struct ldiv_t {
|
||||
long quot;
|
||||
long rem;
|
||||
} ldiv_t;
|
||||
|
||||
#undef abs
|
||||
|
||||
int abs(int n) {
|
||||
int mask = n >> 31;
|
||||
return (mask ^ n) - mask;
|
||||
}
|
||||
|
||||
long labs(long n) {
|
||||
long mask = n >> 31;
|
||||
return (mask ^ n) - mask;
|
||||
}
|
||||
|
||||
div_t div(int numerator, int denominator) {
|
||||
int n_sign, d_sign;
|
||||
div_t value;
|
||||
|
||||
n_sign = 1;
|
||||
d_sign = 1;
|
||||
if (numerator < 0) {
|
||||
numerator = -numerator;
|
||||
n_sign = -1;
|
||||
}
|
||||
if (denominator < 0) {
|
||||
denominator = -denominator;
|
||||
d_sign = -1;
|
||||
}
|
||||
value.quot = (numerator / denominator) * (n_sign * d_sign);
|
||||
value.rem = (numerator * n_sign) - (value.quot * denominator * d_sign);
|
||||
return value;
|
||||
}
|
||||
|
||||
int __msl_add(int* a, int b) {
|
||||
int val = *a;
|
||||
|
||||
if (b < 0) {
|
||||
if (val < 0 && b < (-LONG_MAX - 1) - val) {
|
||||
return 0;
|
||||
}
|
||||
} else if (val > 0 && b > LONG_MAX - val) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*a = val + b;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int __msl_ladd(long* a, long b) {
|
||||
long val = *a;
|
||||
|
||||
if (b < 0) {
|
||||
if (val < 0 && b < (-LONG_MAX - 1L) - val) {
|
||||
return 0;
|
||||
}
|
||||
} else if (val > 0 && b > LONG_MAX - val) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*a = val + b;
|
||||
return 1;
|
||||
}
|
||||
|
||||
int __msl_lmul(long* a, long b) {
|
||||
long val = *a;
|
||||
int sign = (val < 0) ^ (b < 0) ? -1 : 1;
|
||||
|
||||
if (val < 0) {
|
||||
val = -val;
|
||||
}
|
||||
if (b < 0) {
|
||||
b = -b;
|
||||
}
|
||||
|
||||
if (val > LONG_MAX / b) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*a = val * b * sign;
|
||||
return 1;
|
||||
}
|
||||
|
||||
ldiv_t __msl_div(long a, long b) {
|
||||
ldiv_t ret;
|
||||
long quotient, a_sign, b_sign, sign, remainder;
|
||||
|
||||
a_sign = 1;
|
||||
b_sign = 1;
|
||||
if (a < 0) {
|
||||
a = -a;
|
||||
a_sign = -1;
|
||||
}
|
||||
if (b < 0) {
|
||||
b = -b;
|
||||
b_sign = -1;
|
||||
}
|
||||
sign = a_sign * b_sign;
|
||||
quotient = (a / b) * sign;
|
||||
remainder = a * a_sign - b_sign * (quotient * b);
|
||||
|
||||
if (remainder != 0 && sign < 0) {
|
||||
quotient--;
|
||||
remainder += b * b_sign;
|
||||
}
|
||||
|
||||
ret.quot = quotient;
|
||||
ret.rem = remainder;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int __msl_mod(int a, int b) {
|
||||
int quotient, remainder, a_sign, b_sign, sign;
|
||||
|
||||
a_sign = 1;
|
||||
b_sign = 1;
|
||||
|
||||
if (a < 0) {
|
||||
a = -a;
|
||||
a_sign = -1;
|
||||
}
|
||||
if (b < 0) {
|
||||
b = -b;
|
||||
b_sign = -1;
|
||||
}
|
||||
|
||||
sign = a_sign * b_sign;
|
||||
quotient = (a / b) * sign;
|
||||
remainder = (a * a_sign) - (quotient * b * b_sign);
|
||||
|
||||
if (remainder && sign < 0) {
|
||||
quotient -= 1;
|
||||
remainder += b * b_sign;
|
||||
}
|
||||
|
||||
return remainder;
|
||||
}
|
||||
43
libs/MSL/src/MSL_Common/bsearch.c
Normal file
43
libs/MSL/src/MSL_Common/bsearch.c
Normal file
@@ -0,0 +1,43 @@
|
||||
#include <search.h>
|
||||
|
||||
void* bsearch(const void* key, const void* ptr, size_t count, size_t size, COMPARE_FUNC comp) {
|
||||
const char* p;
|
||||
int cmp;
|
||||
size_t low, high, mid;
|
||||
|
||||
if (key == NULL || ptr == NULL || count == 0 || size == 0 || comp == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
p = (const char*)ptr;
|
||||
cmp = comp(key, p);
|
||||
|
||||
if (cmp == 0) {
|
||||
return (void*)p;
|
||||
}
|
||||
|
||||
if (cmp < 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
low = 1;
|
||||
high = count - 1;
|
||||
|
||||
while (low <= high) {
|
||||
mid = (low + high) >> 1;
|
||||
p = (const char*)ptr + size * mid;
|
||||
cmp = comp(key, p);
|
||||
|
||||
if (cmp == 0) {
|
||||
return (void*)p;
|
||||
}
|
||||
|
||||
if (cmp < 0) {
|
||||
high = mid - 1;
|
||||
} else {
|
||||
low = mid + 1;
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
146
libs/MSL/src/MSL_Common/direct_io.c
Normal file
146
libs/MSL/src/MSL_Common/direct_io.c
Normal file
@@ -0,0 +1,146 @@
|
||||
#include <internal/file_struct.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <wchar.h>
|
||||
|
||||
enum file_kinds {
|
||||
file_closed,
|
||||
file_disk,
|
||||
file_console,
|
||||
file_unavailable
|
||||
};
|
||||
|
||||
enum io_states {
|
||||
neutral,
|
||||
writing,
|
||||
reading,
|
||||
rereading
|
||||
};
|
||||
|
||||
enum io_modes {
|
||||
io_read = 1,
|
||||
io_write = 2,
|
||||
io_append = 4
|
||||
};
|
||||
|
||||
enum buffer_modes {
|
||||
buffer_none,
|
||||
buffer_full,
|
||||
buffer_line
|
||||
};
|
||||
|
||||
void __prep_buffer(FILE* file);
|
||||
int __flush_buffer(FILE* file, size_t* pos);
|
||||
void __stdio_atexit(void);
|
||||
int _fseek(FILE* file, long offset, int whence);
|
||||
void* __memrchr(const void* ptr, int ch, size_t count);
|
||||
|
||||
size_t __fwrite(const void* ptr, size_t memb_size, size_t num_memb, FILE* file) {
|
||||
unsigned char* cur_ptr;
|
||||
size_t num_bytes, rem_bytes, bytes_written;
|
||||
int res, buff;
|
||||
|
||||
if (fwide(file, 0) == 0) {
|
||||
fwide(file, -1);
|
||||
}
|
||||
|
||||
rem_bytes = memb_size * num_memb;
|
||||
|
||||
if (rem_bytes == 0 || file->state.error || file->mode.file_kind == file_closed) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (file->mode.file_kind == file_console) {
|
||||
__stdio_atexit();
|
||||
}
|
||||
|
||||
buff = !file->mode.binary_io || file->mode.buffer_mode == buffer_line || file->mode.buffer_mode == buffer_full;
|
||||
|
||||
if (file->state.io_state == neutral && file->mode.io_mode & io_write) {
|
||||
if (file->mode.io_mode & io_append) {
|
||||
if (_fseek(file, 0, 2)) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
file->state.io_state = writing;
|
||||
__prep_buffer(file);
|
||||
}
|
||||
|
||||
if (file->state.io_state != writing) {
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
cur_ptr = (unsigned char*)ptr;
|
||||
bytes_written = 0;
|
||||
|
||||
if (rem_bytes && (file->buffer_ptr != file->buffer || buff)) {
|
||||
file->buffer_len = file->buffer_size - (file->buffer_ptr - file->buffer);
|
||||
|
||||
do {
|
||||
unsigned char* nw = NULL;
|
||||
num_bytes = file->buffer_len;
|
||||
|
||||
if (num_bytes > rem_bytes) {
|
||||
num_bytes = rem_bytes;
|
||||
}
|
||||
|
||||
if (file->mode.buffer_mode == buffer_full && num_bytes) {
|
||||
if ((nw = (unsigned char*)__memrchr(cur_ptr, '\n', num_bytes)) != NULL) {
|
||||
num_bytes = nw + 1 - cur_ptr;
|
||||
}
|
||||
}
|
||||
|
||||
if (num_bytes != 0) {
|
||||
memcpy(file->buffer_ptr, cur_ptr, num_bytes);
|
||||
cur_ptr += num_bytes;
|
||||
rem_bytes -= num_bytes;
|
||||
file->buffer_ptr += num_bytes;
|
||||
file->buffer_len -= num_bytes;
|
||||
}
|
||||
|
||||
if (file->buffer_len == 0 || nw != 0 || file->mode.buffer_mode == buffer_none) {
|
||||
res = __flush_buffer(file, 0);
|
||||
|
||||
if (res != 0) {
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
rem_bytes = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bytes_written += num_bytes;
|
||||
|
||||
} while (rem_bytes && buff);
|
||||
}
|
||||
|
||||
if (rem_bytes && buff == 0) {
|
||||
unsigned char* save_buf = file->buffer;
|
||||
size_t save_size = file->buffer_size;
|
||||
|
||||
file->buffer = cur_ptr;
|
||||
file->buffer_size = rem_bytes;
|
||||
file->buffer_ptr = cur_ptr + rem_bytes;
|
||||
|
||||
if (__flush_buffer(file, &num_bytes) != 0) {
|
||||
file->state.error = 1;
|
||||
file->buffer_len = 0;
|
||||
} else {
|
||||
bytes_written += num_bytes;
|
||||
}
|
||||
|
||||
file->buffer = save_buf;
|
||||
file->buffer_size = save_size;
|
||||
__prep_buffer(file);
|
||||
file->buffer_len = 0;
|
||||
}
|
||||
|
||||
if (file->mode.buffer_mode != buffer_line) {
|
||||
file->buffer_len = 0;
|
||||
}
|
||||
|
||||
return bytes_written / memb_size;
|
||||
}
|
||||
73
libs/MSL/src/MSL_Common/extras.c
Normal file
73
libs/MSL/src/MSL_Common/extras.c
Normal file
@@ -0,0 +1,73 @@
|
||||
#include <ctype.h>
|
||||
#include <internal/locale.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
|
||||
extern int __msl_strnicmp(const char*, const char*, int);
|
||||
extern char* __msl_itoa(int, char*, int);
|
||||
|
||||
int stricmp(const char* s1, const char* s2) {
|
||||
char c1, c2;
|
||||
|
||||
while (true) {
|
||||
c1 = tolower(*s1++);
|
||||
c2 = tolower(*s2++);
|
||||
|
||||
if (c1 < c2) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (c1 > c2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (c1 == 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int strnicmp(const char* s1, const char* s2, size_t n) {
|
||||
return __msl_strnicmp(s1, s2, n);
|
||||
}
|
||||
|
||||
int strcmpi(const char* s1, const char* s2) {
|
||||
return stricmp(s1, s2);
|
||||
}
|
||||
|
||||
char* itoa(int value, char* buffer, int radix) {
|
||||
return __msl_itoa(value, buffer, radix);
|
||||
}
|
||||
|
||||
int wcsnicmp(const char* s1, const char* s2, size_t n) {
|
||||
const wchar_t* p1 = (const wchar_t*)s1;
|
||||
const wchar_t* p2 = (const wchar_t*)s2;
|
||||
unsigned int c1;
|
||||
unsigned int c2;
|
||||
struct _loc_ctype_cmpt* ctype_cmpt = _current_locale.ctype_cmpt_ptr;
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
c1 = *p1++;
|
||||
c1 = (c1 >= 256) ? c1 : ctype_cmpt->wlower_map_ptr[(unsigned short)c1];
|
||||
c1 &= 0xFFFF;
|
||||
|
||||
c2 = *p2++;
|
||||
c2 = (c2 >= 256) ? c2 : ctype_cmpt->wlower_map_ptr[(unsigned short)c2];
|
||||
c2 &= 0xFFFF;
|
||||
|
||||
if (c1 < c2) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (c1 > c2) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (c1 == 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
10
libs/MSL/src/MSL_Common/math_sun.c
Normal file
10
libs/MSL/src/MSL_Common/math_sun.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <math.h>
|
||||
|
||||
double scalbn(double x, int n) {
|
||||
double man;
|
||||
int exponent;
|
||||
|
||||
man = frexp(x, &exponent);
|
||||
exponent += n;
|
||||
return ldexp(man, exponent);
|
||||
}
|
||||
97
libs/MSL/src/MSL_Common/mbstring.c
Normal file
97
libs/MSL/src/MSL_Common/mbstring.c
Normal file
@@ -0,0 +1,97 @@
|
||||
#include <internal/locale.h>
|
||||
#include <string.h>
|
||||
|
||||
int mbtowc(wchar_t* pwc, const char* s, size_t n) {
|
||||
return _current_locale.ctype_cmpt_ptr->decode_mb(pwc, s, n);
|
||||
}
|
||||
|
||||
int __mbtowc_noconv(wchar_t* pwc, const char* s, size_t n) {
|
||||
if (s == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (n == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (pwc != NULL) {
|
||||
*pwc = (unsigned char)*s;
|
||||
}
|
||||
|
||||
if (!*s) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int __wctomb_noconv(char* s, wchar_t wchar) {
|
||||
if (s == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*s = (char)wchar;
|
||||
return 1;
|
||||
}
|
||||
|
||||
size_t mbstowcs(wchar_t* dest, const char* src, size_t len) {
|
||||
int count;
|
||||
char* src_ptr;
|
||||
size_t slen;
|
||||
|
||||
slen = strlen(src);
|
||||
|
||||
if (dest != NULL) {
|
||||
src_ptr = (char*)src;
|
||||
|
||||
for (count = 0; count < len; count++) {
|
||||
if (*src_ptr) {
|
||||
int res = mbtowc(dest++, src_ptr, slen);
|
||||
|
||||
if (res > 0) {
|
||||
src_ptr += res;
|
||||
slen -= res;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
*dest = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
count = 0;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) {
|
||||
int result;
|
||||
int chars_written = 0;
|
||||
char temp[3];
|
||||
wchar_t* source;
|
||||
|
||||
if (s == NULL || pwcs == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
source = (wchar_t*)pwcs;
|
||||
|
||||
while (chars_written <= n) {
|
||||
if (!*source) {
|
||||
*(s + chars_written) = '\0';
|
||||
break;
|
||||
}
|
||||
|
||||
result = _current_locale.ctype_cmpt_ptr->encode_wc(temp, *source++);
|
||||
if (chars_written + result > n) {
|
||||
break;
|
||||
}
|
||||
|
||||
strncpy(s + chars_written, temp, result);
|
||||
chars_written += result;
|
||||
}
|
||||
|
||||
return chars_written;
|
||||
}
|
||||
6
libs/MSL/src/MSL_Common/misc_io.c
Normal file
6
libs/MSL/src/MSL_Common/misc_io.c
Normal file
@@ -0,0 +1,6 @@
|
||||
extern void (*__stdio_exit)(void);
|
||||
void __close_all(void);
|
||||
|
||||
void __stdio_atexit(void) {
|
||||
__stdio_exit = __close_all;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
73
libs/MSL/src/MSL_Common/qsort.c
Normal file
73
libs/MSL/src/MSL_Common/qsort.c
Normal file
@@ -0,0 +1,73 @@
|
||||
#include <search.h>
|
||||
|
||||
#define swap(dst, src, cnt) \
|
||||
do { \
|
||||
char* p; \
|
||||
char* q; \
|
||||
size_t n = cnt; \
|
||||
unsigned long tmp; \
|
||||
for (p = (char*)src - 1, q = (char*)dst - 1, n++; --n;) { \
|
||||
tmp = *++q; \
|
||||
*q = *++p; \
|
||||
*p = tmp; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
void qsort(void* table_base, size_t num_members, size_t member_size, COMPARE_FUNC compare_members) {
|
||||
size_t cur_ofs;
|
||||
size_t neg_size;
|
||||
size_t l, r, j;
|
||||
char* lp;
|
||||
char* rp;
|
||||
char* ip;
|
||||
char* jp;
|
||||
char* kp;
|
||||
|
||||
if (num_members < 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
r = num_members;
|
||||
l = (r / 2) + 1;
|
||||
lp = (char*)table_base + member_size * (l - 1);
|
||||
rp = (char*)table_base + member_size * (r - 1);
|
||||
neg_size = (long)(member_size - member_size * 2);
|
||||
cur_ofs = l * member_size;
|
||||
|
||||
for (;;) {
|
||||
if (l > 1) {
|
||||
l--;
|
||||
cur_ofs -= member_size;
|
||||
lp -= member_size;
|
||||
} else {
|
||||
swap(lp, rp, member_size);
|
||||
if (--r == 1) {
|
||||
return;
|
||||
}
|
||||
rp -= member_size;
|
||||
}
|
||||
|
||||
j = l;
|
||||
jp = (char*)table_base + (cur_ofs + neg_size);
|
||||
|
||||
while (j * 2 <= r) {
|
||||
j *= 2;
|
||||
ip = jp;
|
||||
jp = (char*)table_base + member_size * (j - 1);
|
||||
|
||||
if (j < r) {
|
||||
kp = jp + member_size;
|
||||
if (compare_members(jp, kp) < 0) {
|
||||
j++;
|
||||
jp = kp;
|
||||
}
|
||||
}
|
||||
|
||||
if (compare_members(ip, jp) < 0) {
|
||||
swap(ip, jp, member_size);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
30
libs/MSL/src/MSL_Common/signal.c
Normal file
30
libs/MSL/src/MSL_Common/signal.c
Normal file
@@ -0,0 +1,30 @@
|
||||
#include <signal.h>
|
||||
|
||||
int exit(int);
|
||||
|
||||
__signal_func_ptr signal_funcs[8];
|
||||
|
||||
int raise(int sig) {
|
||||
__signal_func_ptr signal_func;
|
||||
|
||||
if (sig < SIGNAL_ABORT || sig > SIGNAL_UNK7) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
signal_func = signal_funcs[sig - 1];
|
||||
|
||||
if (signal_func != SIGNAL_ACTION_IGNORE) {
|
||||
signal_funcs[sig - 1] = SIGNAL_ACTION_DEFAULT;
|
||||
}
|
||||
|
||||
if (signal_func == SIGNAL_ACTION_IGNORE || (signal_func == SIGNAL_ACTION_DEFAULT && sig == SIGNAL_ABORT)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (signal_func == SIGNAL_ACTION_DEFAULT) {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
(*signal_func)(sig);
|
||||
return 0;
|
||||
}
|
||||
382
libs/MSL/src/MSL_Common/strtoul.c
Normal file
382
libs/MSL/src/MSL_Common/strtoul.c
Normal file
@@ -0,0 +1,382 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
enum __ReadProcActions {
|
||||
__GetAChar,
|
||||
__UngetAChar,
|
||||
__TestForError
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
char* spNextChar;
|
||||
int nullCharDetected;
|
||||
} __InStrCtrl;
|
||||
|
||||
int __StringRead(void* ptr, int ch, int act);
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
|
||||
enum scan_states {
|
||||
start = 0x01,
|
||||
check_for_zero = 0x02,
|
||||
leading_zero = 0x04,
|
||||
need_digit = 0x08,
|
||||
digit_loop = 0x10,
|
||||
finished = 0x20,
|
||||
failure = 0x40
|
||||
};
|
||||
|
||||
#define final_state(scan_state) (scan_state & (finished | failure))
|
||||
#define success(scan_state) (scan_state & (leading_zero | digit_loop | finished))
|
||||
#define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar))
|
||||
#define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar)
|
||||
|
||||
unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative,
|
||||
int* overflow) {
|
||||
int scan_state = start;
|
||||
int count = 0;
|
||||
int spaces = 0;
|
||||
unsigned long value = 0;
|
||||
unsigned long value_max = 0;
|
||||
int c;
|
||||
|
||||
*negative = *overflow = 0;
|
||||
|
||||
if (base < 0 || base == 1 || base > 36 || max_width < 1) {
|
||||
scan_state = failure;
|
||||
} else {
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if (base != 0) {
|
||||
value_max = ULONG_MAX / base;
|
||||
}
|
||||
|
||||
while (count <= max_width && c != -1 && !final_state(scan_state)) {
|
||||
switch (scan_state) {
|
||||
case start: {
|
||||
if (isspace(c)) {
|
||||
c = fetch();
|
||||
count--;
|
||||
spaces++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '+') {
|
||||
c = fetch();
|
||||
} else if (c == '-') {
|
||||
c = fetch();
|
||||
*negative = 1;
|
||||
}
|
||||
|
||||
scan_state = check_for_zero;
|
||||
break;
|
||||
}
|
||||
|
||||
case check_for_zero: {
|
||||
if (base == 0 || base == 16) {
|
||||
if (c == '0') {
|
||||
scan_state = leading_zero;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
scan_state = need_digit;
|
||||
break;
|
||||
}
|
||||
|
||||
case leading_zero: {
|
||||
if (c == 'X' || c == 'x') {
|
||||
base = 16;
|
||||
scan_state = need_digit;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
if (base == 0) {
|
||||
base = 8;
|
||||
}
|
||||
|
||||
scan_state = digit_loop;
|
||||
break;
|
||||
}
|
||||
|
||||
case need_digit:
|
||||
case digit_loop: {
|
||||
if (base == 0) {
|
||||
base = 10;
|
||||
}
|
||||
|
||||
if (!value_max) {
|
||||
value_max = ULONG_MAX / base;
|
||||
}
|
||||
|
||||
if (isdigit(c)) {
|
||||
if ((c -= '0') >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
c += '0';
|
||||
break;
|
||||
}
|
||||
} else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
break;
|
||||
} else {
|
||||
c = toupper(c) - 'A' + 10;
|
||||
}
|
||||
|
||||
if (value > value_max) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value *= base;
|
||||
|
||||
if (c > (ULONG_MAX - value)) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value += c;
|
||||
scan_state = digit_loop;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!success(scan_state)) {
|
||||
count = 0;
|
||||
value = 0;
|
||||
*chars_scanned = 0;
|
||||
} else {
|
||||
count--;
|
||||
*chars_scanned = count + spaces;
|
||||
}
|
||||
|
||||
unfetch(c);
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long long __strtoull(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative,
|
||||
int* overflow) {
|
||||
int scan_state = start;
|
||||
int count = 0;
|
||||
int spaces = 0;
|
||||
unsigned long long value = 0;
|
||||
unsigned long long value_max = 0;
|
||||
int c;
|
||||
|
||||
*negative = *overflow = 0;
|
||||
|
||||
if (base < 0 || base == 1 || base > 36 || max_width < 1) {
|
||||
scan_state = failure;
|
||||
} else {
|
||||
c = fetch();
|
||||
}
|
||||
|
||||
if (base != 0) {
|
||||
value_max = ULLONG_MAX / base;
|
||||
}
|
||||
|
||||
while (count <= max_width && c != -1 && !final_state(scan_state)) {
|
||||
switch (scan_state) {
|
||||
case start: {
|
||||
if (isspace(c)) {
|
||||
c = fetch();
|
||||
count--;
|
||||
spaces++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '+') {
|
||||
c = fetch();
|
||||
} else if (c == '-') {
|
||||
c = fetch();
|
||||
*negative = 1;
|
||||
}
|
||||
|
||||
scan_state = check_for_zero;
|
||||
break;
|
||||
}
|
||||
|
||||
case check_for_zero: {
|
||||
if (base == 0 || base == 16) {
|
||||
if (c == '0') {
|
||||
scan_state = leading_zero;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
scan_state = need_digit;
|
||||
break;
|
||||
}
|
||||
|
||||
case leading_zero: {
|
||||
if (c == 'X' || c == 'x') {
|
||||
base = 16;
|
||||
scan_state = need_digit;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
|
||||
if (base == 0) {
|
||||
base = 8;
|
||||
}
|
||||
|
||||
scan_state = digit_loop;
|
||||
break;
|
||||
}
|
||||
|
||||
case need_digit:
|
||||
case digit_loop: {
|
||||
if (base == 0) {
|
||||
base = 10;
|
||||
}
|
||||
|
||||
if (!value_max) {
|
||||
value_max = ULLONG_MAX / base;
|
||||
}
|
||||
|
||||
if (isdigit(c)) {
|
||||
if ((c -= '0') >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
c += '0';
|
||||
break;
|
||||
}
|
||||
} else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) {
|
||||
if (scan_state == digit_loop) {
|
||||
scan_state = finished;
|
||||
} else {
|
||||
scan_state = failure;
|
||||
}
|
||||
|
||||
break;
|
||||
} else {
|
||||
c = toupper(c) - 'A' + 10;
|
||||
}
|
||||
|
||||
if (value > value_max) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value *= base;
|
||||
|
||||
if (c > (ULLONG_MAX - value)) {
|
||||
*overflow = 1;
|
||||
}
|
||||
|
||||
value += c;
|
||||
scan_state = digit_loop;
|
||||
c = fetch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!success(scan_state)) {
|
||||
count = 0;
|
||||
value = 0;
|
||||
*chars_scanned = 0;
|
||||
} else {
|
||||
count--;
|
||||
*chars_scanned = count + spaces;
|
||||
}
|
||||
|
||||
unfetch(c);
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long strtoul(const char* str, char** end, int base) {
|
||||
unsigned long value;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
value = __strtoul(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow) {
|
||||
value = ULONG_MAX;
|
||||
errno = ERANGE;
|
||||
} else if (negative) {
|
||||
value = -value;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
unsigned long long strtoull(const char* str, char** end, int base) {
|
||||
unsigned long long value;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
value = __strtoull(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow) {
|
||||
value = ULLONG_MAX;
|
||||
errno = ERANGE;
|
||||
} else if (negative) {
|
||||
value = -value;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
long strtol(const char* str, char** end, int base) {
|
||||
unsigned long uvalue;
|
||||
long svalue;
|
||||
int count, negative, overflow;
|
||||
__InStrCtrl isc;
|
||||
|
||||
isc.spNextChar = (char*)str;
|
||||
isc.nullCharDetected = 0;
|
||||
|
||||
uvalue = __strtoul(base, INT_MAX, &__StringRead, &isc, &count, &negative, &overflow);
|
||||
|
||||
if (end) {
|
||||
*end = (char*)str + count;
|
||||
}
|
||||
|
||||
if (overflow || (!negative && uvalue > LONG_MAX) || (negative && uvalue > -(unsigned long)LONG_MIN)) {
|
||||
svalue = (negative ? -(unsigned long)LONG_MIN : LONG_MAX);
|
||||
errno = ERANGE;
|
||||
} else {
|
||||
svalue = (negative ? -(long)uvalue : (long)uvalue);
|
||||
}
|
||||
|
||||
return svalue;
|
||||
}
|
||||
|
||||
int atoi(const char* str) {
|
||||
return (int)strtol(str, NULL, 10);
|
||||
}
|
||||
|
||||
long atol(const char* str) {
|
||||
return strtol(str, NULL, 10);
|
||||
}
|
||||
44
libs/MSL/src/MSL_Common/wchar_io.c
Normal file
44
libs/MSL/src/MSL_Common/wchar_io.c
Normal file
@@ -0,0 +1,44 @@
|
||||
#include "internal/file_struct.h"
|
||||
|
||||
enum file_kinds {
|
||||
file_closed
|
||||
};
|
||||
|
||||
enum file_orientation {
|
||||
file_unoriented,
|
||||
file_char_oriented,
|
||||
file_wide_oriented
|
||||
};
|
||||
|
||||
int fwide(FILE* file, int file_mode) {
|
||||
int orientation;
|
||||
int res;
|
||||
|
||||
if (file == NULL || file->mode.file_kind == file_closed) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
orientation = file->mode.file_orientation;
|
||||
|
||||
switch (orientation) {
|
||||
case file_unoriented:
|
||||
if (file_mode > 0) {
|
||||
file->mode.file_orientation = file_wide_oriented;
|
||||
} else if (file_mode < 0) {
|
||||
file->mode.file_orientation = file_char_oriented;
|
||||
}
|
||||
|
||||
res = file_mode;
|
||||
break;
|
||||
|
||||
case file_wide_oriented:
|
||||
res = 1;
|
||||
break;
|
||||
|
||||
case file_char_oriented:
|
||||
res = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
104
libs/MSL/src/MSL_Common/wctype.c
Normal file
104
libs/MSL/src/MSL_Common/wctype.c
Normal file
@@ -0,0 +1,104 @@
|
||||
const unsigned int __wctype_mapC[128] = {
|
||||
0x00040004, 0x00040004, 0x00040004, 0x00040004,
|
||||
0x00040106, 0x01040104, 0x01040104, 0x00040004,
|
||||
0x00040004, 0x00040004, 0x00040004, 0x00040004,
|
||||
0x00040004, 0x00040004, 0x00040004, 0x00040004,
|
||||
0x014200D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
|
||||
0x00D000D0, 0x00D000D0, 0x00D000D0, 0x00D000D0,
|
||||
0x04580458, 0x04580458, 0x04580458, 0x04580458,
|
||||
0x04580458, 0x00D000D0, 0x00D000D0, 0x00D000D0,
|
||||
0x00D00651, 0x06510651, 0x06510651, 0x06510251,
|
||||
0x02510251, 0x02510251, 0x02510251, 0x02510251,
|
||||
0x02510251, 0x02510251, 0x02510251, 0x02510251,
|
||||
0x02510251, 0x025100D0, 0x00D000D0, 0x00D000D0,
|
||||
0x00D00471, 0x04710471, 0x04710471, 0x04710071,
|
||||
0x00710071, 0x00710071, 0x00710071, 0x00710071,
|
||||
0x00710071, 0x00710071, 0x00710071, 0x00710071,
|
||||
0x00710071, 0x007100D0, 0x00D000D0, 0x00D00004,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
};
|
||||
|
||||
const unsigned int __wlower_mapC[128] = {
|
||||
0x00000001, 0x00020003, 0x00040005, 0x00060007,
|
||||
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
|
||||
0x00100011, 0x00120013, 0x00140015, 0x00160017,
|
||||
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
|
||||
0x00200021, 0x00220023, 0x00240025, 0x00260027,
|
||||
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
|
||||
0x00300031, 0x00320033, 0x00340035, 0x00360037,
|
||||
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
|
||||
0x00400061, 0x00620063, 0x00640065, 0x00660067,
|
||||
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
|
||||
0x00700071, 0x00720073, 0x00740075, 0x00760077,
|
||||
0x00780079, 0x007A005B, 0x005C005D, 0x005E005F,
|
||||
0x00600061, 0x00620063, 0x00640065, 0x00660067,
|
||||
0x00680069, 0x006A006B, 0x006C006D, 0x006E006F,
|
||||
0x00700071, 0x00720073, 0x00740075, 0x00760077,
|
||||
0x00780079, 0x007A007B, 0x007C007D, 0x007E007F,
|
||||
0x00800081, 0x00820083, 0x00840085, 0x00860087,
|
||||
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
|
||||
0x00900091, 0x00920093, 0x00940095, 0x00960097,
|
||||
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
|
||||
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
|
||||
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
|
||||
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
|
||||
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
|
||||
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
|
||||
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
|
||||
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
|
||||
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
|
||||
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
|
||||
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
|
||||
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
|
||||
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
|
||||
};
|
||||
|
||||
const unsigned int __wupper_mapC[128] = {
|
||||
0x00000001, 0x00020003, 0x00040005, 0x00060007,
|
||||
0x00080009, 0x000A000B, 0x000C000D, 0x000E000F,
|
||||
0x00100011, 0x00120013, 0x00140015, 0x00160017,
|
||||
0x00180019, 0x001A001B, 0x001C001D, 0x001E001F,
|
||||
0x00200021, 0x00220023, 0x00240025, 0x00260027,
|
||||
0x00280029, 0x002A002B, 0x002C002D, 0x002E002F,
|
||||
0x00300031, 0x00320033, 0x00340035, 0x00360037,
|
||||
0x00380039, 0x003A003B, 0x003C003D, 0x003E003F,
|
||||
0x00400041, 0x00420043, 0x00440045, 0x00460047,
|
||||
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
|
||||
0x00500051, 0x00520053, 0x00540055, 0x00560057,
|
||||
0x00580059, 0x005A005B, 0x005C005D, 0x005E005F,
|
||||
0x00600041, 0x00420043, 0x00440045, 0x00460047,
|
||||
0x00480049, 0x004A004B, 0x004C004D, 0x004E004F,
|
||||
0x00500051, 0x00520053, 0x00540055, 0x00560057,
|
||||
0x00580059, 0x005A007B, 0x007C007D, 0x007E007F,
|
||||
0x00800081, 0x00820083, 0x00840085, 0x00860087,
|
||||
0x00880089, 0x008A008B, 0x008C008D, 0x008E008F,
|
||||
0x00900091, 0x00920093, 0x00940095, 0x00960097,
|
||||
0x00980099, 0x009A009B, 0x009C009D, 0x009E009F,
|
||||
0x00A000A1, 0x00A200A3, 0x00A400A5, 0x00A600A7,
|
||||
0x00A800A9, 0x00AA00AB, 0x00AC00AD, 0x00AE00AF,
|
||||
0x00B000B1, 0x00B200B3, 0x00B400B5, 0x00B600B7,
|
||||
0x00B800B9, 0x00BA00BB, 0x00BC00BD, 0x00BE00BF,
|
||||
0x00C000C1, 0x00C200C3, 0x00C400C5, 0x00C600C7,
|
||||
0x00C800C9, 0x00CA00CB, 0x00CC00CD, 0x00CE00CF,
|
||||
0x00D000D1, 0x00D200D3, 0x00D400D5, 0x00D600D7,
|
||||
0x00D800D9, 0x00DA00DB, 0x00DC00DD, 0x00DE00DF,
|
||||
0x00E000E1, 0x00E200E3, 0x00E400E5, 0x00E600E7,
|
||||
0x00E800E9, 0x00EA00EB, 0x00EC00ED, 0x00EE00EF,
|
||||
0x00F000F1, 0x00F200F3, 0x00F400F5, 0x00F600F7,
|
||||
0x00F800F9, 0x00FA00FB, 0x00FC00FD, 0x00FE00FF,
|
||||
};
|
||||
160
libs/MSL/src/MSL_Common/wstring.c
Normal file
160
libs/MSL/src/MSL_Common/wstring.c
Normal file
@@ -0,0 +1,160 @@
|
||||
#include <wchar.h>
|
||||
|
||||
size_t wcslen(const wchar_t* str) {
|
||||
const wchar_t* p = str - 1;
|
||||
size_t len = -1;
|
||||
|
||||
do {
|
||||
len++;
|
||||
} while (*++p != 0);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
wchar_t* wcscpy(wchar_t* dest, const wchar_t* src) {
|
||||
const wchar_t* s = src - 1;
|
||||
wchar_t* d = dest - 1;
|
||||
wchar_t c;
|
||||
|
||||
do {
|
||||
c = *++s;
|
||||
*++d = c;
|
||||
} while (c != 0);
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
wchar_t* wcsncpy(wchar_t* dest, const wchar_t* src, size_t num) {
|
||||
const wchar_t* s = src - 1;
|
||||
wchar_t* d = dest - 1;
|
||||
wchar_t c;
|
||||
size_t n = num + 1;
|
||||
|
||||
while (--n != 0) {
|
||||
c = *++s;
|
||||
*++d = c;
|
||||
if (c == 0) {
|
||||
while (--n != 0) {
|
||||
*++d = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
wchar_t* wcscat(wchar_t* dest, const wchar_t* src) {
|
||||
const wchar_t* s = src - 1;
|
||||
wchar_t* d = dest - 1;
|
||||
|
||||
while (*++d != 0)
|
||||
;
|
||||
d--;
|
||||
do {
|
||||
*++d = *++s;
|
||||
} while (*s != 0);
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
wchar_t* wcsncat(wchar_t* dest, const wchar_t* src, size_t num) {
|
||||
const wchar_t* s = src - 1;
|
||||
wchar_t* d = dest - 1;
|
||||
wchar_t c;
|
||||
size_t n;
|
||||
|
||||
while (*++d != 0)
|
||||
;
|
||||
d--;
|
||||
n = num + 1;
|
||||
|
||||
while (--n != 0) {
|
||||
c = *++s;
|
||||
*++d = c;
|
||||
if (c == 0) {
|
||||
d--;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
*++d = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t num) {
|
||||
wchar_t c2;
|
||||
wchar_t c1;
|
||||
const wchar_t* p1;
|
||||
const wchar_t* p2;
|
||||
size_t n;
|
||||
|
||||
p1 = s1 - 1;
|
||||
p2 = s2 - 1;
|
||||
n = num + 1;
|
||||
|
||||
while (--n != 0) {
|
||||
c1 = *++p1;
|
||||
c2 = *++p2;
|
||||
if (c1 != c2) {
|
||||
return (int)(c1 - c2);
|
||||
}
|
||||
if (c1 == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
wchar_t* wcschr(wchar_t* ws, wchar_t wc) {
|
||||
wchar_t* p = ws - 1;
|
||||
wchar_t ch;
|
||||
|
||||
while ((ch = *++p) != 0) {
|
||||
if (ch == wc) {
|
||||
return p;
|
||||
}
|
||||
}
|
||||
|
||||
if (wc == 0) {
|
||||
return p;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2) {
|
||||
const wchar_t* p1;
|
||||
wchar_t c;
|
||||
wchar_t c1;
|
||||
wchar_t c2;
|
||||
|
||||
c = *s2;
|
||||
p1 = s1 - 1;
|
||||
if (c == 0) {
|
||||
return (wchar_t*)s1;
|
||||
}
|
||||
|
||||
while ((c1 = *++p1) != 0) {
|
||||
if (c1 == c) {
|
||||
wchar_t ic1;
|
||||
const wchar_t* ps1;
|
||||
const wchar_t* p2;
|
||||
ps1 = p1 - 1;
|
||||
p2 = s2 - 1;
|
||||
do {
|
||||
ic1 = *++ps1;
|
||||
c2 = *++p2;
|
||||
if (ic1 != c2) {
|
||||
break;
|
||||
}
|
||||
} while (ic1 != 0);
|
||||
|
||||
if (c2 == 0) {
|
||||
return (wchar_t*)p1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -50,6 +50,10 @@ namespace nw4r {
|
||||
|
||||
f32 FrSqrt(f32 x);
|
||||
u32 CntBit1(u32 x);
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
inline f32 FSqrt(f32 x) { return (x <= 0.0f) ? 0.0f : x * FrSqrt(x); }
|
||||
#endif
|
||||
} // namespace math
|
||||
} // namespace nw4r
|
||||
|
||||
|
||||
@@ -118,6 +118,10 @@ namespace nw4r {
|
||||
return *this;
|
||||
}
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
VEC2 operator-() const { return VEC2(-x, -y); }
|
||||
#endif
|
||||
|
||||
VEC2 operator+(const VEC2& rhs) const { return VEC2(x + rhs.x, y + rhs.y); }
|
||||
VEC2 operator-(const VEC2& rhs) const { return VEC2(x - rhs.x, y - rhs.y); }
|
||||
VEC2 operator*(f32 val) const { return VEC2(val * x, val * y); }
|
||||
@@ -130,6 +134,10 @@ namespace nw4r {
|
||||
bool operator!=(const VEC2& rhs) const { return x != rhs.x || y != rhs.y; }
|
||||
} VEC2;
|
||||
|
||||
#ifdef IPL_ADDRESS_MATCHING
|
||||
inline f32 VEC2LenSq(const VEC2* p) { return p->x * p->x + p->y * p->y; }
|
||||
#endif
|
||||
|
||||
typedef struct VEC3 VEC3;
|
||||
|
||||
inline VEC3* VEC3Transform(VEC3* pOut, const MTX34* pMtx, const VEC3* pVec);
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace nw4r {
|
||||
b = blue;
|
||||
a = alpha;
|
||||
}
|
||||
} Color;
|
||||
} ATTRIBUTE_ALIGN(4) Color;
|
||||
} // namespace ut
|
||||
} // namespace nw4r
|
||||
|
||||
|
||||
@@ -16,7 +16,9 @@ namespace nw4r {
|
||||
#endif
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
void SetWidth(f32 width) { right = left + width; }
|
||||
void SetHeight(f32 height) { bottom = top + height; }
|
||||
|
||||
@@ -37,6 +37,9 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
const detail::RuntimeTypeInfo* pDerivedTypeInfo = detail::GetTypeInfoFromPtr_(static_cast<TDerived>(NULL));
|
||||
if (pPtr->GetRuntimeTypeInfo()->IsDerivedFrom(pDerivedTypeInfo)) {
|
||||
@@ -44,6 +47,7 @@ namespace nw4r {
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
} // namespace ut
|
||||
} // namespace nw4r
|
||||
|
||||
|
||||
@@ -34,20 +34,29 @@ namespace nw4r {
|
||||
const u32* flags0A;
|
||||
const u32* flags0C;
|
||||
|
||||
int i, j;
|
||||
int i;
|
||||
int entryI;
|
||||
const HeaderedGlyphGroups* offsetPGlgr;
|
||||
const u8* offsetFlags;
|
||||
u32 loadedSheetCount, loadedSmth0ASize, loadedSmth0CSize;
|
||||
u32 flagWord;
|
||||
const u8* offsetFlags;
|
||||
const char* groupName;
|
||||
const u32* offsetData;
|
||||
int j;
|
||||
|
||||
u32 sheetOffsetsSize;
|
||||
u32 loadedSheetsSize;
|
||||
u32 neededCharacterSize;
|
||||
u32 baseSize;
|
||||
|
||||
u32 count0CWork;
|
||||
|
||||
u32& neededCharacterSizeRef = neededCharacterSize;
|
||||
|
||||
u32 loadedSizeRef;
|
||||
|
||||
u32 groupOffset;
|
||||
|
||||
if (!ArchiveFontBase::IsValidResource(fontData, 0x4000)) {
|
||||
return 0;
|
||||
}
|
||||
@@ -55,29 +64,30 @@ namespace nw4r {
|
||||
font = (ArchiveFontBinaryLayout*)fontData;
|
||||
pGlgr = &font->glgr;
|
||||
|
||||
countName = font->glgr.inner.nameCount;
|
||||
countSheet = font->glgr.inner.sheetCount;
|
||||
count0A = font->glgr.inner.smthCount_0x0a;
|
||||
count0C = font->glgr.inner.smthCount_0x0c;
|
||||
countName = pGlgr->inner.nameCount;
|
||||
countSheet = pGlgr->inner.sheetCount;
|
||||
count0A = pGlgr->inner.smthCount_0x0a;
|
||||
count0C = pGlgr->inner.smthCount_0x0c;
|
||||
count0CWork = count0C;
|
||||
|
||||
stepSheets = ((s32)countSheet + 0x1f) / 32 * 4;
|
||||
step0A = ((s32)count0A + 0x1f) / 32 * 4;
|
||||
step0C = ((s32)count0C + 0x1f) / 32 * 4;
|
||||
step0C = ((s32)count0CWork + 0x1f) / 32 * 4;
|
||||
|
||||
dataSheetsOff = ROUNDUP(offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets) + countName * sizeof(u16), 4);
|
||||
data0AOff = ROUNDUP(dataSheetsOff + countSheet * sizeof(u32), 4);
|
||||
data0COff = ROUNDUP(data0AOff + count0A * sizeof(u32), 4);
|
||||
dataSheets = lyt::detail::ConvertOffsToPtr<u32>(fontData, dataSheetsOff);
|
||||
data0A = lyt::detail::ConvertOffsToPtr<u32>(fontData, data0AOff);
|
||||
data0C = lyt::detail::ConvertOffsToPtr<u32>(fontData, data0COff);
|
||||
dataSheets = (const u32*)((u32)dataSheetsOff + (u32)fontData);
|
||||
data0A = (const u32*)((u32)data0AOff + (u32)fontData);
|
||||
data0C = (const u32*)((u32)data0COff + (u32)fontData);
|
||||
|
||||
flagsSheetsOff = ROUNDUP(data0COff + count0C * sizeof(u32), 4);
|
||||
flagsSheetsOff = ROUNDUP(data0COff + count0CWork * sizeof(u32), 4);
|
||||
flags0AOff = ROUNDUP(flagsSheetsOff + stepSheets * countName, 4);
|
||||
flags0COff = ROUNDUP(flags0AOff + step0A * countName, 4);
|
||||
|
||||
flagsSheets = lyt::detail::ConvertOffsToPtr<u32>(fontData, flagsSheetsOff);
|
||||
flags0A = lyt::detail::ConvertOffsToPtr<u32>(fontData, flags0AOff);
|
||||
flags0C = lyt::detail::ConvertOffsToPtr<u32>(fontData, flags0COff);
|
||||
flagsSheets = (const u32*)((u32)flagsSheetsOff + (u32)fontData);
|
||||
flags0A = (const u32*)((u32)flags0AOff + (u32)fontData);
|
||||
flags0C = (const u32*)((u32)flags0COff + (u32)fontData);
|
||||
|
||||
loadedSheetCount = 0;
|
||||
loadedSmth0ASize = 0;
|
||||
@@ -90,7 +100,7 @@ namespace nw4r {
|
||||
flagWord = 0;
|
||||
for (j = 0, offsetPGlgr = pGlgr; j < pGlgr->inner.nameCount;
|
||||
offsetPGlgr = (const HeaderedGlyphGroups*)((const u8*)offsetPGlgr + 2), j++) {
|
||||
groupName = (const char*)fontData + offsetPGlgr->inner.nameOffsets[0];
|
||||
groupName = (const char*)((u32)offsetPGlgr->inner.nameOffsets[0] + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * stepSheets, 4));
|
||||
}
|
||||
@@ -101,12 +111,13 @@ namespace nw4r {
|
||||
// getLoadedSheetCount(pGlgr, flagsSheets, stepSheets, fontData, includedGroups, &loadedSheetCount);
|
||||
|
||||
// Get the SIZE of unk_0x0a that should be loaded
|
||||
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 32, i++) {
|
||||
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0a; i++) {
|
||||
offsetFlags = (const u8*)flags0A + i * sizeof(u32);
|
||||
|
||||
flagWord = 0;
|
||||
for (j = 0; j < pGlgr->inner.nameCount; j++) {
|
||||
groupName = (const char*)fontData + pGlgr->inner.nameOffsets[j];
|
||||
groupOffset = pGlgr->inner.nameOffsets[j];
|
||||
groupName = (const char*)(groupOffset + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0A, 4));
|
||||
}
|
||||
@@ -121,12 +132,13 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
// Get the SIZE of unk_0x0C that should be loaded
|
||||
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 32, i++) {
|
||||
for (i = 0; i * 32 < pGlgr->inner.smthCount_0x0c; i++) {
|
||||
offsetFlags = (const u8*)flags0C + i * sizeof(u32);
|
||||
|
||||
flagWord = 0;
|
||||
for (j = 0; j < pGlgr->inner.nameCount; j++) {
|
||||
groupName = (const char*)fontData + pGlgr->inner.nameOffsets[j];
|
||||
groupOffset = pGlgr->inner.nameOffsets[j];
|
||||
groupName = (const char*)(groupOffset + (u32)fontData);
|
||||
if (*includedGroups == '\0' || detail::ArchiveFontBase::IncludeName(includedGroups, groupName)) {
|
||||
flagWord |= *(const u32*)((const u8*)offsetFlags + ROUNDDOWN(j * step0C, 4));
|
||||
}
|
||||
@@ -145,13 +157,14 @@ namespace nw4r {
|
||||
sheetOffsetsSize = ROUNDUP(pGlgr->inner.sheetCount * 2, 4);
|
||||
loadedSheetsSize = ROUNDUP(loadedSheetCount * pGlgr->inner.uncompSheetSize, 4);
|
||||
|
||||
neededCharacterSize = sizeof(CXUncompContextHuffman);
|
||||
if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman)) {
|
||||
neededCharacterSize = loadedSmth0ASize + loadedSmth0CSize;
|
||||
loadedSizeRef = loadedSmth0ASize + loadedSmth0CSize;
|
||||
neededCharacterSizeRef = sizeof(CXUncompContextHuffman);
|
||||
if (loadedSizeRef >= sizeof(CXUncompContextHuffman)) {
|
||||
neededCharacterSize = loadedSizeRef;
|
||||
}
|
||||
|
||||
baseSize = OSRoundUp32B(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize);
|
||||
return baseSize + neededCharacterSize + loadedSheetsSize;
|
||||
return (baseSize + loadedSheetsSize) + neededCharacterSize;
|
||||
}
|
||||
|
||||
detail::ArchiveFontBase::ConstructState ArchiveFont::StreamingConstruct(ConstructContext* ctx, const void* fontData, u32 fontDataSize) {
|
||||
@@ -164,8 +177,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
state = CONSTRUCT_STATE_WORKING;
|
||||
reader = &ctx->mReader;
|
||||
reader->Attach(fontData, fontDataSize);
|
||||
CachedStreamReader& readerRef = ctx->mReader;
|
||||
reader = &readerRef;
|
||||
readerRef.Attach(fontData, fontDataSize);
|
||||
|
||||
while (state == CONSTRUCT_STATE_WORKING) {
|
||||
switch (ctx->mNextCmd) {
|
||||
|
||||
@@ -57,6 +57,46 @@ void RFLiInitCtrlBuf(MEMiHeapHead* sysHeap) {
|
||||
}
|
||||
}
|
||||
|
||||
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
|
||||
RFLiCtrlManager* manager;
|
||||
RFLiCtrlBuffer* buffer;
|
||||
u16 flag;
|
||||
|
||||
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
|
||||
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
|
||||
|
||||
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (index >= RFL_MAX_CTRL_BUFFER) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
manager = RFLiGetCtrlBufManager();
|
||||
if (manager == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!manager->mIsLoaded[chan]) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
flag = (1 << index);
|
||||
buffer = manager->mBuffer[chan];
|
||||
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
RFLiConvertRaw2Info(&buffer->mData[index], dst);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL RFLiCheckCtrlBufferCore(const RFLiCtrlBuffer* buffer, u8 index, RFLiCtrlCheckType type) {
|
||||
u16 flag = (1 << index);
|
||||
|
||||
@@ -771,46 +811,6 @@ int RFLiSetControllerData(const RFLiCharInfo* src, s32 chan, u8 index) {
|
||||
return setDataCore_(src, chan, index, FALSE);
|
||||
}
|
||||
|
||||
int RFLiGetControllerData(RFLiCharInfo* dst, s32 chan, u8 index, BOOL hiddenAvailable) {
|
||||
RFLiCtrlManager* manager;
|
||||
RFLiCtrlBuffer* buffer;
|
||||
u16 flag;
|
||||
|
||||
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1412);
|
||||
RFLi_ASSERTLINE_RANGE(index, 0, RFL_MAX_CTRL_BUFFER, 1413);
|
||||
|
||||
if (chan < 0 || chan >= WPAD_MAX_CONTROLLERS) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (index >= RFL_MAX_CTRL_BUFFER) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
manager = RFLiGetCtrlBufManager();
|
||||
if (manager == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!manager->mIsLoaded[chan]) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
flag = (1 << index);
|
||||
buffer = manager->mBuffer[chan];
|
||||
if (!RFLiIsValidID((RFLCreateID*)&buffer->mData[index].createID)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!hiddenAvailable && (buffer->mSecretFlag & flag) != 0) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
RFLiConvertRaw2Info(&buffer->mData[index], dst);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
RFLErrcode RFLUnloadController(s32 chan) {
|
||||
RFLi_ASSERTLINE_RANGE(chan, 0, WPAD_MAX_CONTROLLERS, 1461);
|
||||
|
||||
|
||||
@@ -204,7 +204,7 @@ void RFLi_MakeRandomFace_Core(RFLiCharInfo* pCharInfo, RFLi_SEX argSex, RFLi_AGE
|
||||
pCharInfo->personal.localonly = FALSE;
|
||||
}
|
||||
|
||||
u8 RFLi_GetFacelineType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetFacelineType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 facelineTypeTable[RFLSex_All * RFLAge_All * RFLRace_All][10] = {
|
||||
/* Male, Child, Black */ {0, 0, 0, 1, 1, 1, 2, 3, 4, 5},
|
||||
@@ -272,7 +272,7 @@ u8 RFLi_GetHairType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
return hair_parts[index][RFLi_GetRandU32(hair_parts_num[index])];
|
||||
}
|
||||
|
||||
u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
u8 eye_parts[RFLSex_All * RFLAge_All * RFLRace_All][48] = {
|
||||
/* Male, Child, Black */ { 2, 3, 5, 7, 8, 9, 11, 12, 13, 15, 16, 18, 27, 29, 32, 34, 36, 38, 39, 41, 43, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
@@ -307,7 +307,7 @@ u8 RFLi_GetEyeType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
return eye_parts[index][RFLi_GetRandU32(eye_parts_num[index])];
|
||||
}
|
||||
|
||||
u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 eyebrow_parts[RFLSex_All * RFLAge_All * RFLRace_All][24] = {
|
||||
/* Male, Child, Black */ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 18, 20, 0, 0, 0, 0, 0, 0},
|
||||
@@ -342,7 +342,7 @@ u8 RFLi_GetEyebrowType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
return eyebrow_parts[index][RFLi_GetRandU32(eyebrow_parts_num[index])];
|
||||
}
|
||||
|
||||
u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
u8 nose_parts[RFLSex_All * RFLAge_All * RFLRace_All][12] = {
|
||||
/* Male, Child, Black */ { 0, 1, 2, 3, 4, 5, 7, 8, 10, 0, 0, 0},
|
||||
@@ -377,7 +377,7 @@ u8 RFLi_GetNoseType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
return nose_parts[index][RFLi_GetRandU32(nose_parts_num[index])];
|
||||
}
|
||||
|
||||
u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
u8 mouth_parts[RFLSex_All * RFLAge_All * RFLRace_All][24] = {
|
||||
/* Male, Child, Black */ { 0, 2, 3, 6, 7, 8, 9, 10, 12, 14, 15, 17, 18, 19, 21, 22, 23, 0, 0, 0, 0, 0, 0, 0},
|
||||
@@ -412,7 +412,7 @@ u8 RFLi_GetMouthType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
return mouth_parts[index][RFLi_GetRandU32(mouth_parts_num[index])];
|
||||
}
|
||||
|
||||
u8 RFLi_GetFaceTexType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetFaceTexType(RFLi_SEX sex, RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 faceTexTypeTable[RFLSex_All * RFLAge_All * RFLRace_All][20] = {
|
||||
/* Male, Child, Black */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3},
|
||||
@@ -507,7 +507,7 @@ u8 RFLi_GetGlassType(RFLi_AGE age) {
|
||||
}
|
||||
}
|
||||
|
||||
u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
|
||||
static u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 faceColorTable[RFLSex_All * RFLRace_All][10] = {
|
||||
/* Male, Black */ { 2, 2, 4, 4, 4, 4, 5, 5, 5, 5 },
|
||||
@@ -526,7 +526,7 @@ u8 RFLi_GetFaceColor(RFLi_SEX sex, RFLi_RACE race) {
|
||||
return faceColorTable[(sex * RFLRace_All) + race][RFLi_GetRandU32(GET_ARRAY_LENGTH(faceColorTable[0]))];
|
||||
}
|
||||
|
||||
u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
|
||||
static u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 hairColorTable[RFLAge_All * RFLRace_All][20] = {
|
||||
/* Black, Child */ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||
@@ -547,7 +547,7 @@ u8 RFLi_GetHairColor(RFLi_AGE age, RFLi_RACE race) {
|
||||
return hairColorTable[(race * 4 - race) + age][RFLi_GetRandU32(GET_ARRAY_LENGTH(hairColorTable[0]))];
|
||||
}
|
||||
|
||||
u8 RFLi_GetEyeColor(RFLi_RACE race) {
|
||||
static u8 RFLi_GetEyeColor(RFLi_RACE race) {
|
||||
// clang-format off
|
||||
static const u8 eyeColorTable[RFLRace_All][10] = {
|
||||
/* Black */ {0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
|
||||
@@ -561,6 +561,6 @@ u8 RFLi_GetEyeColor(RFLi_RACE race) {
|
||||
return eyeColorTable[race][RFLi_GetRandU32(GET_ARRAY_LENGTH(eyeColorTable[0]))];
|
||||
}
|
||||
|
||||
u32 RFLi_GetRandU32(u32 max) {
|
||||
static u32 RFLi_GetRandU32(u32 max) {
|
||||
return OSGetTick() % max;
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ void RFLiEndWorking(RFLErrcode errcode) {
|
||||
RFLiEndWorkingReason(errcode, 0);
|
||||
}
|
||||
|
||||
NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
inline NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
NANDCommandBlock* block = &RFLiGetAccInfo(type)->commandBlock;
|
||||
RFLiCallbackTag* store = &RFLiGetAccInfo(type)->callbackTag;
|
||||
|
||||
@@ -147,7 +147,7 @@ NANDCommandBlock* RFLiSetCommandBlock(RFLiFileType type, RFLiAsyncTag tag) {
|
||||
return block;
|
||||
}
|
||||
|
||||
RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
inline RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
RFLiCallbackTag* stored;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(block, 312);
|
||||
@@ -159,7 +159,7 @@ RFLiAsyncTag RFLiGetTag(NANDCommandBlock* block) {
|
||||
return stored->tag;
|
||||
}
|
||||
|
||||
RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
inline RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
RFLiCallbackTag* stored;
|
||||
|
||||
RFLi_ASSERTLINE_NULL(block, 335);
|
||||
@@ -171,7 +171,7 @@ RFLiFileType RFLiGetType(NANDCommandBlock* block) {
|
||||
return stored->type;
|
||||
}
|
||||
|
||||
NANDFileInfo* RFLiGetWorkingFile(RFLiFileType type) {
|
||||
inline NANDFileInfo* RFLiGetWorkingFile(RFLiFileType type) {
|
||||
RFLi_ASSERTLINE_RANGE(type, RFLiFileType_Database, RFLiFileType_Max, 356);
|
||||
|
||||
if (!RFLAvailable()) {
|
||||
|
||||
@@ -202,7 +202,7 @@ void RFLExit() {
|
||||
}
|
||||
}
|
||||
|
||||
RFLErrcode RFLiBootLoad() {
|
||||
static inline RFLErrcode RFLiBootLoad() {
|
||||
RFLiBootLoadAsync();
|
||||
return RFLWaitAsync();
|
||||
}
|
||||
@@ -223,7 +223,7 @@ static void bootloadDB2Res_() {
|
||||
}
|
||||
}
|
||||
|
||||
RFLErrcode RFLiBootLoadAsync() {
|
||||
static inline RFLErrcode RFLiBootLoadAsync() {
|
||||
return RFLiBootLoadDatabaseAsync(bootloadDB2Res_);
|
||||
}
|
||||
|
||||
@@ -249,7 +249,7 @@ void RFLiFree(void* block) {
|
||||
MEMFreeToExpHeap(RFLiGetManager()->mTmpHeap, block);
|
||||
}
|
||||
|
||||
u32 RFLiGetUsedWorkSize() {
|
||||
static inline u32 RFLiGetUsedWorkSize() {
|
||||
if (RFLAvailable()) {
|
||||
MEMiHeapHead* heap = RFLiGetManager()->mTmpHeap;
|
||||
return MEMGetAllocatableSizeForExpHeap(heap) - MEMGetTotalFreeSizeForExpHeap(heap);
|
||||
@@ -397,7 +397,7 @@ BOOL RFLiNeedRepairError() {
|
||||
return ((*list & (1 << RFLiFileBrokenType_DBBroken)) != 0) ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
BOOL RFLiCriticalError() {
|
||||
static inline BOOL RFLiCriticalError() {
|
||||
u8* list = &sRFLBrokenType;
|
||||
BOOL ret = FALSE; // Unused
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ ziU32 Zi8GetZHuwdPtr(ziU32* arg0, ziU16* arg1 ZI_NEED_WORK) {
|
||||
return 0;
|
||||
} else {
|
||||
*arg1 = ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1][1] / 3;
|
||||
*arg0 = ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1][0];
|
||||
*arg0 = (ziU32)ZI_WORK->unk_0x124[ZI_WORK->unk_0x12C - 1];
|
||||
*arg0 += 8;
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return 1;
|
||||
|
||||
534
libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c
Normal file
534
libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c
Normal file
@@ -0,0 +1,534 @@
|
||||
#include <zi8clib/zierror.h>
|
||||
|
||||
extern ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
extern ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx ZI_NEED_WORK);
|
||||
|
||||
ziU32 Zi8_8148302C(ziU16 key, ziU8* table ZI_NEED_WORK) {
|
||||
ziU32 value;
|
||||
ziU16 count;
|
||||
ziU32 i;
|
||||
|
||||
count = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
for (i = 0; (ziU16)i < count; i++) {
|
||||
value = (ziU16)(((ziU16)table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 7] << 8) |
|
||||
table[((i & 0xFFFF) << 3) + (i & 0xFFFF) + 8]);
|
||||
if (key == value) {
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
Zi8LogError(0x96A, ZI_WORK);
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
void Zi8_81483118(ziGetParam* param, ziU8* output) {
|
||||
ziU8 i;
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
output[i] = 0;
|
||||
}
|
||||
|
||||
switch (param->elementCount) {
|
||||
case 9:
|
||||
output[4] |= (ziU8)((param->elements[8] & 0xF) << 4);
|
||||
case 8:
|
||||
output[3] = param->elements[7] & 0xF;
|
||||
case 7:
|
||||
output[3] |= (ziU8)((param->elements[6] & 0xF) << 4);
|
||||
case 6:
|
||||
output[2] = param->elements[5] & 0xF;
|
||||
case 5:
|
||||
output[2] |= (ziU8)((param->elements[4] & 0xF) << 4);
|
||||
case 4:
|
||||
output[1] = param->elements[3] & 0xF;
|
||||
case 3:
|
||||
output[1] |= (ziU8)((param->elements[2] & 0xF) << 4);
|
||||
case 2:
|
||||
output[0] = param->elements[1] & 0xF;
|
||||
case 1:
|
||||
output[0] |= (ziU8)((param->elements[0] & 0xF) << 4);
|
||||
case 0:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ziU32 Zi8_81483264(const ziGetParam* param ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8LogError(0x164, ZI_WORK);
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
((ziU16*)param->scratch)[i] = 0;
|
||||
}
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8_81483308(ziGetParam* param, ziU16 key, ziU8* count ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8ReplaceLastError(0x164, ZI_WORK);
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
if (key == ((ziU16*)param->scratch)[i]) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
((ziU16*)param->scratch)[*count] = key;
|
||||
if (++*count >= param->maxCandidates) {
|
||||
*count = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziBool Zi8_814833F0(const ziGetParam* param, ziU16 key ZI_NEED_WORK) {
|
||||
ziU8 i;
|
||||
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->scratch == ZI8_NULL) {
|
||||
Zi8ReplaceLastError(0x164, ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < param->maxCandidates; i++) {
|
||||
if (key == ((ziU16*)param->scratch)[i]) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
ziU8* inserted ZI_NEED_WORK) {
|
||||
ziBool matches;
|
||||
ziS32 entry;
|
||||
ziS32 tableA;
|
||||
ziS32 tableB;
|
||||
ziU16 tableCount;
|
||||
ziU8 matched;
|
||||
ziU32 j;
|
||||
ziS32 i;
|
||||
ziU8 candidateIndex;
|
||||
union {
|
||||
ziU32 words[13];
|
||||
ziU8 bytes[52];
|
||||
} local;
|
||||
|
||||
matched = 0;
|
||||
local.words[0] = 0;
|
||||
local.bytes[4] = 0;
|
||||
Zi8LogError(0x64, ZI_WORK);
|
||||
if (param->elementCount == 0) {
|
||||
if (*remaining >= *count) {
|
||||
for (i = 0; i < *count; i++) {
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
*remaining = *remaining - *count;
|
||||
*count = 0;
|
||||
} else {
|
||||
for (i = 0; i < *remaining; i++) {
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
for (i = 0; i < ((ziS32)*count - (ziS32)*remaining); i++) {
|
||||
param->candidates[i] = param->candidates[(ziU32)*remaining + i];
|
||||
}
|
||||
*count = *count - (ziU8)*remaining;
|
||||
*remaining = 0;
|
||||
}
|
||||
return 1;
|
||||
} else if (param->elementCount <= 9) {
|
||||
tableA = Zi8GetTableAddress(param->language, 9, ZI_WORK);
|
||||
tableB = Zi8GetTableAddress(param->language, 10, ZI_WORK);
|
||||
if (tableA == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
return 0;
|
||||
} else if (tableB == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
return 0;
|
||||
} else {
|
||||
tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local.bytes);
|
||||
i = 0;
|
||||
while (i < tableCount && matched < *count) {
|
||||
matches = ZI8_TRUE;
|
||||
entry = (i << 3) + tableA + i;
|
||||
j = 0;
|
||||
if (param->elementCount > 1) {
|
||||
for (j = 0; (j & 0xFF) < (ziU32)(param->elementCount >> 1); j++) {
|
||||
if (local.bytes[j & 0xFF] != *((ziU8*)entry + (j & 0xFF))) {
|
||||
matches = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (matches && (param->elementCount & 1) != 0 &&
|
||||
((local.bytes[j & 0xFF] & 0xF0) != (*((ziU8*)entry + (j & 0xFF)) & 0xF0))) {
|
||||
matches = ZI8_FALSE;
|
||||
}
|
||||
if (matches) {
|
||||
for (candidateIndex = 0; candidateIndex < *count; candidateIndex++) {
|
||||
if (param->candidates[candidateIndex] ==
|
||||
(ziU16)((*((ziU8*)entry + 7) << 8) | *((ziU8*)entry + 8))) {
|
||||
matched++;
|
||||
param->candidates[candidateIndex] =
|
||||
param->candidates[candidateIndex] & 0x7FFF;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if ((ziU16)matched >= *remaining) {
|
||||
matched = *count;
|
||||
*count = 0;
|
||||
for (i = 0; i < matched; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
if (*remaining == 0) {
|
||||
if (*count != i) {
|
||||
param->candidates[*count] = param->candidates[i];
|
||||
}
|
||||
*count = *count + 1;
|
||||
} else {
|
||||
*remaining = *remaining - 1;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
}
|
||||
*remaining = 0;
|
||||
} else {
|
||||
for (i = 0; i < *count; i++) {
|
||||
if ((param->candidates[i] & 0x8000) == 0) {
|
||||
param->candidates[i] = param->candidates[i] | 0x8000;
|
||||
Zi8_81483308(param, param->candidates[i], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
*remaining = *remaining - (ziU16)matched;
|
||||
*count = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
*count = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ziU32 Zi8GetKOcandidates(ziGetParam* param, ziU8* options ZI_NEED_WORK) {
|
||||
ziBool bVar1;
|
||||
ziU8 bVar2;
|
||||
ziS32 iVar4;
|
||||
ziU32 uVar6;
|
||||
ziU8* pbVar7;
|
||||
union {
|
||||
ziU32 words[10];
|
||||
ziU8 bytes[40];
|
||||
} local_28;
|
||||
ziU8 local_57;
|
||||
ziU8 local_56;
|
||||
ziU8 local_55;
|
||||
ziU8 local_54;
|
||||
ziU8 local_53;
|
||||
ziS8 local_52;
|
||||
ziU16 local_50;
|
||||
ziU16 local_4E;
|
||||
ziU16 local_4C;
|
||||
ziU16 local_4A;
|
||||
ziU16 local_48;
|
||||
ziS32 local_44;
|
||||
ziS32 local_2C;
|
||||
ziS32 local_30;
|
||||
ziU32 local_34;
|
||||
ziU32 local_38;
|
||||
ziU32 local_3C;
|
||||
ziU32 local_40;
|
||||
|
||||
local_4E = 0xFFFF;
|
||||
local_34 = 0;
|
||||
local_28.words[0] = 0;
|
||||
local_28.bytes[4] = 0;
|
||||
local_52 = 0;
|
||||
local_53 = 0;
|
||||
local_54 = 0;
|
||||
local_55 = 0;
|
||||
local_50 = param->firstCandidate;
|
||||
local_3C = 0;
|
||||
local_40 = 0;
|
||||
local_57 = 0;
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
Zi8_81483264(param, ZI_WORK);
|
||||
iVar4 = Zi8GetTableAddress(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
local_2C = Zi8GetTableAddress(ZI8_LANG_KO, 10, ZI_WORK);
|
||||
if (iVar4 == 0) {
|
||||
Zi8ReplaceLastError(0x76C, ZI_WORK);
|
||||
uVar6 = 0;
|
||||
} else {
|
||||
if (local_2C == 0) {
|
||||
Zi8ReplaceLastError(0x776, ZI_WORK);
|
||||
uVar6 = 0;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
if (*options == 0) {
|
||||
param->letters = 0;
|
||||
param->count = 0;
|
||||
param->candidates[0] = 0;
|
||||
}
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
if (param->wordCharCount != 0) {
|
||||
local_48 = Zi8_8148302C(param->currentWord[0], (ziU8*)iVar4, ZI_WORK);
|
||||
if ((local_48 != 0xFFFF) &&
|
||||
((((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 8) != 0)) {
|
||||
local_38 = (ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 6] |
|
||||
((ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 4] & 3) << 16 |
|
||||
(ziU32)((ziU8*)iVar4)[((ziU32)local_48 * 9) + 5] << 8;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
pbVar7 = (ziU8*)(local_2C + local_38);
|
||||
LAB_00010D44:
|
||||
if (local_52 != 0) {
|
||||
local_48 = Zi8_8148302C(param->currentWord[local_53], (ziU8*)iVar4, ZI_WORK);
|
||||
if (local_48 == (ziU16)((*pbVar7 & 0x1F) << 8 | pbVar7[1])) {
|
||||
local_52 = local_52 - 1;
|
||||
local_53 = local_53 + 1;
|
||||
if ((*pbVar7 & 0x40) == 0) {
|
||||
pbVar7 = pbVar7 + 2;
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
local_52 = param->wordCharCount - 1;
|
||||
local_53 = 1;
|
||||
} else {
|
||||
local_53 = 1;
|
||||
local_52 = param->wordCharCount - 1;
|
||||
}
|
||||
}
|
||||
if (local_52 == 0) {
|
||||
local_48 = (*pbVar7 & 0x1F) << 8 | pbVar7[1];
|
||||
local_4C = (ziU16)(((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[7] << 8 |
|
||||
((ziU8*)((ziU32)local_48 * 9 + (ziU32)local_48 + (ziU32)iVar4))[8]);
|
||||
if (param->wordCharCount == 1) {
|
||||
if (local_48 == local_4E) {
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
local_52 = param->wordCharCount;
|
||||
goto LAB_00011114;
|
||||
}
|
||||
local_4E = local_48;
|
||||
if (param->elementCount == 0) {
|
||||
if (local_50 == 0) {
|
||||
if (*options != 0) {
|
||||
local_3C = local_3C + 1;
|
||||
if ((ziS32)local_3C < *(ziS32*)(options + 0xC)) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
} else {
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (local_40 = 0;
|
||||
(local_40 < local_54 &&
|
||||
(local_4C != param->candidates[local_40]));
|
||||
local_40 = local_40 + 1) {
|
||||
}
|
||||
if ((local_40 == local_54) &&
|
||||
(Zi8_814833F0(param, local_4C, ZI_WORK) == 0)) {
|
||||
param->candidates[local_54] = local_4C;
|
||||
local_54 = local_54 + 1;
|
||||
param->count = param->count + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (bVar2 < param->maxCandidates) {
|
||||
goto LAB_000110E8;
|
||||
}
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
if (param->maxCandidates <= local_54) {
|
||||
if (*options == 0) {
|
||||
uVar6 = local_54;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_3C = local_3C + local_54;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_3C) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
param->count = 0;
|
||||
param->letters = 0;
|
||||
local_54 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
LAB_000110E8:
|
||||
for (; (*pbVar7 & 0x40) == 0; pbVar7 = pbVar7 + 2) {
|
||||
}
|
||||
local_52 = param->wordCharCount;
|
||||
LAB_00011114:
|
||||
local_52 = local_52 + -1;
|
||||
local_53 = 1;
|
||||
pbVar7 = pbVar7 + 2;
|
||||
if ((*pbVar7 & 0x80) != 0) {
|
||||
goto LAB_00011124;
|
||||
}
|
||||
goto LAB_00010D44;
|
||||
}
|
||||
}
|
||||
LAB_00011124:
|
||||
local_34 = local_3C;
|
||||
if (local_54 != 0) {
|
||||
Zi8_814834AC(param, &local_50, &local_54, &local_57, ZI_WORK);
|
||||
uVar6 = local_34;
|
||||
if ((*options != 0) &&
|
||||
(local_3C = local_3C + local_54, uVar6 = local_3C,
|
||||
*(ziS32*)(options + 0xC) <= (ziS32)local_3C)) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
local_34 = uVar6;
|
||||
param->count = local_54;
|
||||
param->letters = local_54;
|
||||
}
|
||||
if (param->elementCount < 10) {
|
||||
if ((param->elementCount == 0) || (*options != 0)) {
|
||||
local_56 = 1;
|
||||
} else {
|
||||
local_56 = 0;
|
||||
}
|
||||
local_4A = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, local_28.bytes);
|
||||
do {
|
||||
for (local_30 = 0; local_30 < (ziS32)(ziU32)local_4A; local_30 = local_30 + 1) {
|
||||
bVar1 = ZI8_TRUE;
|
||||
local_44 = iVar4 + local_30 * 9;
|
||||
local_55 = 0;
|
||||
if (1 < param->elementCount) {
|
||||
for (local_55 = 0;
|
||||
(ziU32)local_55 < (ziU32)((ziS32)(ziU32)param->elementCount >> 1);
|
||||
local_55 = local_55 + 1) {
|
||||
if (local_28.bytes[local_55] != *(ziU8*)(local_44 + local_55)) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((bVar1 && ((param->elementCount & 1) != 0)) &&
|
||||
((local_28.bytes[local_55] & 0xF0) !=
|
||||
(*(ziU8*)(local_44 + local_55) & 0xF0))) {
|
||||
bVar1 = ZI8_FALSE;
|
||||
}
|
||||
if (bVar1) {
|
||||
bVar2 = local_56;
|
||||
if ((param->elementCount & 1) == 0) {
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF0) == 0) {
|
||||
if (local_56 == 0) {
|
||||
goto LAB_000113B0;
|
||||
}
|
||||
bVar2 = *options;
|
||||
}
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
} else {
|
||||
if ((*(ziU8*)(local_44 + local_55) & 0xF) != 0) {
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
if (local_56 != 0) {
|
||||
bVar2 = *options;
|
||||
goto LAB_000113AC;
|
||||
}
|
||||
}
|
||||
LAB_000113AC:
|
||||
if (bVar2 == 0) {
|
||||
goto LAB_00011478;
|
||||
}
|
||||
LAB_000113B0:
|
||||
if (local_50 == 0) {
|
||||
if (*options == 0) {
|
||||
param->candidates[local_54] =
|
||||
(ziU16)((*(ziU8*)(local_30 * 9 + iVar4 + 7) << 8) |
|
||||
*(ziU8*)(local_30 * 9 + iVar4 + 8));
|
||||
local_54 = local_54 + 1;
|
||||
bVar2 = param->letters + 1;
|
||||
param->letters = bVar2;
|
||||
if (param->maxCandidates <= bVar2) {
|
||||
uVar6 = param->letters;
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
} else {
|
||||
local_34 = local_34 + 1;
|
||||
if (*(ziS32*)(options + 0xC) <= (ziS32)local_34) {
|
||||
uVar6 = *(ziU32*)(options + 0xC);
|
||||
goto LAB_000114C4;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
local_50 = local_50 + -1;
|
||||
}
|
||||
}
|
||||
LAB_00011478:
|
||||
;
|
||||
}
|
||||
local_56 = local_56 + 1;
|
||||
} while (local_56 < 2);
|
||||
uVar6 = local_34;
|
||||
if (*options == 0) {
|
||||
uVar6 = param->letters;
|
||||
}
|
||||
} else {
|
||||
param->letters = 0;
|
||||
uVar6 = 0;
|
||||
}
|
||||
}
|
||||
LAB_000114C4:
|
||||
return uVar6;
|
||||
}
|
||||
@@ -55,7 +55,7 @@ typedef struct AXFX_REVERBHI_EXP {
|
||||
f32 sendGain; // 0x144
|
||||
} AXFX_REVERBHI_EXP;
|
||||
|
||||
u32 AXFXReverbHiExpGetMemSize(const AXFX_REVERBHI_EXP* fx);
|
||||
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx);
|
||||
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx);
|
||||
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx);
|
||||
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx);
|
||||
|
||||
447
libs/RVL_SDK/src/axfx/AXFXReverbHiExp.c
Normal file
447
libs/RVL_SDK/src/axfx/AXFXReverbHiExp.c
Normal file
@@ -0,0 +1,447 @@
|
||||
#include <private/axfx.h>
|
||||
#include <revolution/AXFX.h>
|
||||
#include <revolution/MEM.h>
|
||||
#include <revolution/OS.h>
|
||||
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
|
||||
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx);
|
||||
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx);
|
||||
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx);
|
||||
static BOOL __InitParams(AXFX_REVERBHI_EXP* fx);
|
||||
|
||||
static u32 __EarlySizeTable[8][3] = {{157, 479, 829}, {317, 809, 1117}, {479, 941, 1487}, {641, 1259, 1949},
|
||||
{797, 1667, 2579}, {967, 1901, 2903}, {1123, 2179, 3413}, {1279, 2477, 3889}};
|
||||
|
||||
static f32 __EarlyCoefTable[8][3] = {{0.4f, -1.0f, 0.3f}, {0.5f, -0.95f, 0.3f}, {0.6f, -0.9f, 0.3f}, {0.75f, -0.85f, 0.3f},
|
||||
{-0.9f, 0.8f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}, {-1.0f, 0.7f, 0.3f}};
|
||||
|
||||
static u32 __FilterSizeTable[7][8] = {{1789, 1999, 2333, 433, 149, 47, 73, 67}, {149, 293, 449, 251, 103, 47, 73, 67},
|
||||
{947, 1361, 1531, 433, 137, 47, 73, 67}, {1279, 1531, 1973, 509, 149, 47, 73, 67},
|
||||
{1531, 1847, 2297, 563, 179, 47, 73, 67}, {1823, 2357, 2693, 571, 137, 47, 73, 67},
|
||||
{1823, 2357, 2693, 571, 179, 47, 73, 67}};
|
||||
|
||||
u32 AXFXReverbHiExpGetMemSize(AXFX_REVERBHI_EXP* fx) {
|
||||
u32 sum = 0;
|
||||
u32 i = 0;
|
||||
|
||||
sum += __EarlySizeTable[7][2];
|
||||
sum += (int)(fx->preDelayTimeMax * 32000);
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
sum += __FilterSizeTable[6][i];
|
||||
}
|
||||
|
||||
sum *= 3;
|
||||
|
||||
for (i = 5; i < 8; i++) {
|
||||
sum += __FilterSizeTable[6][i];
|
||||
}
|
||||
|
||||
sum *= 4;
|
||||
|
||||
return sum;
|
||||
}
|
||||
|
||||
BOOL AXFXReverbHiExpInit(AXFX_REVERBHI_EXP* fx) {
|
||||
u32 ch, i;
|
||||
BOOL result = TRUE;
|
||||
BOOL mask = OSDisableInterrupts();
|
||||
|
||||
fx->active = 1;
|
||||
|
||||
if (fx->preDelayTimeMax < 0.0f) {
|
||||
AXFXReverbHiExpShutdown(fx);
|
||||
OSRestoreInterrupts(mask);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
fx->earlyMaxLength = __EarlySizeTable[8 - 1][2];
|
||||
fx->preDelayMaxLength = (u32)(fx->preDelayTimeMax * 32000);
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
fx->combMaxLength[i] = __FilterSizeTable[6][i];
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
fx->allpassMaxLength[i] = __FilterSizeTable[6][3 + i];
|
||||
}
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
fx->lastAllpassMaxLength[ch] = __FilterSizeTable[6][5 + ch];
|
||||
}
|
||||
|
||||
result = __AllocDelayLine(fx);
|
||||
if (result == FALSE) {
|
||||
AXFXReverbHiExpShutdown(fx);
|
||||
OSRestoreInterrupts(mask);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
__BzeroDelayLines(fx);
|
||||
result = __InitParams(fx);
|
||||
if (result == FALSE) {
|
||||
AXFXReverbHiExpShutdown(fx);
|
||||
OSRestoreInterrupts(mask);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
fx->active &= ~1;
|
||||
OSRestoreInterrupts(mask);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL AXFXReverbHiExpSettings(AXFX_REVERBHI_EXP* fx) {
|
||||
BOOL mask = OSDisableInterrupts();
|
||||
fx->active = fx->active | 1;
|
||||
AXFXReverbHiExpShutdown(fx);
|
||||
|
||||
if (!AXFXReverbHiExpInit(fx)) {
|
||||
AXFXReverbHiExpShutdown(fx);
|
||||
OSRestoreInterrupts(mask);
|
||||
return FALSE;
|
||||
} else {
|
||||
fx->active |= 2;
|
||||
fx->active &= ~1;
|
||||
OSRestoreInterrupts(mask);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void AXFXReverbHiExpShutdown(AXFX_REVERBHI_EXP* fx) {
|
||||
BOOL mask = OSDisableInterrupts();
|
||||
fx->active |= 1;
|
||||
__FreeDelayLine(fx);
|
||||
OSRestoreInterrupts(mask);
|
||||
}
|
||||
|
||||
void AXFXReverbHiExpCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBHI_EXP* fx) {
|
||||
u32 ch, i;
|
||||
u32 samp;
|
||||
s32* input[3];
|
||||
f32 data;
|
||||
f32 output[3];
|
||||
f32* earlyLine;
|
||||
f32 earlyOut;
|
||||
f32* preDelayLine;
|
||||
f32 preDelayOut;
|
||||
f32 filterOut;
|
||||
f32* combLine;
|
||||
f32 combOutOne;
|
||||
f32* allpass;
|
||||
f32 outTmp;
|
||||
f32 allpassIn;
|
||||
f32 allpassCoef;
|
||||
f32 lpfOut;
|
||||
f32 lpfCoef1;
|
||||
f32 lpfCoef2;
|
||||
f32 fusedOut[3];
|
||||
f32 fusedGain;
|
||||
f32 crosstalkGain;
|
||||
f32 crosstalkL;
|
||||
f32 crosstalkR;
|
||||
f32 crosstalkS;
|
||||
s32* inBusData[3];
|
||||
s32* outBusData[3];
|
||||
|
||||
if (fx->active != 0) {
|
||||
fx->active &= ~2;
|
||||
return;
|
||||
}
|
||||
|
||||
input[0] = bufferUpdate->left;
|
||||
input[1] = bufferUpdate->right;
|
||||
input[2] = bufferUpdate->surround;
|
||||
|
||||
if (fx->busIn != NULL) {
|
||||
inBusData[0] = fx->busIn->left;
|
||||
inBusData[1] = fx->busIn->right;
|
||||
inBusData[2] = fx->busIn->surround;
|
||||
}
|
||||
|
||||
if (fx->busOut != NULL) {
|
||||
outBusData[0] = fx->busOut->left;
|
||||
outBusData[1] = fx->busOut->right;
|
||||
outBusData[2] = fx->busOut->surround;
|
||||
}
|
||||
|
||||
lpfCoef1 = 1.0f - fx->lpfCoef;
|
||||
lpfCoef2 = fx->lpfCoef;
|
||||
allpassCoef = fx->allpassCoef;
|
||||
fusedGain = fx->fusedGain * 0.6f;
|
||||
crosstalkGain = fx->crosstalk * 0.5f;
|
||||
|
||||
for (samp = 0; samp < 96; samp++) {
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
if (fx->busIn != NULL) {
|
||||
data = (f32)(*(input[ch]) + *(inBusData[ch]++));
|
||||
} else {
|
||||
data = (f32)(*input[ch]);
|
||||
}
|
||||
|
||||
earlyLine = fx->earlyLine[ch];
|
||||
earlyOut = earlyLine[fx->earlyPos[0]] * fx->earlyCoef[0] + earlyLine[fx->earlyPos[1]] * fx->earlyCoef[1] +
|
||||
earlyLine[fx->earlyPos[2]] * fx->earlyCoef[2];
|
||||
|
||||
earlyLine[fx->earlyPos[2]] = data;
|
||||
|
||||
if (fx->preDelayLength != 0) {
|
||||
preDelayLine = fx->preDelayLine[ch];
|
||||
preDelayOut = preDelayLine[fx->preDelayPos];
|
||||
preDelayLine[fx->preDelayPos] = data;
|
||||
} else {
|
||||
preDelayOut = data;
|
||||
}
|
||||
|
||||
filterOut = 0.0f;
|
||||
for (i = 0; i < 3; i++) {
|
||||
combLine = fx->combLine[ch][i];
|
||||
combOutOne = combLine[fx->combPos[i]];
|
||||
combLine[fx->combPos[i]] = preDelayOut + (combOutOne * fx->combCoef[i]);
|
||||
filterOut += combOutOne;
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
allpass = fx->allpassLine[ch][i];
|
||||
outTmp = allpass[fx->allpassPos[i]];
|
||||
allpassIn = filterOut + outTmp * allpassCoef;
|
||||
allpass[fx->allpassPos[i]] = allpassIn;
|
||||
filterOut = outTmp - allpassIn * allpassCoef;
|
||||
}
|
||||
|
||||
lpfOut = lpfCoef1 * filterOut + lpfCoef2 * fx->lastLpfOut[ch];
|
||||
fx->lastLpfOut[ch] = lpfOut;
|
||||
allpass = fx->lastAllpassLine[ch];
|
||||
outTmp = allpass[fx->lastAllpassPos[ch]];
|
||||
allpassIn = lpfOut + outTmp * allpassCoef;
|
||||
allpass[fx->lastAllpassPos[ch]] = allpassIn;
|
||||
fusedOut[ch] = outTmp - allpassIn * allpassCoef;
|
||||
if (++fx->lastAllpassPos[ch] >= fx->lastAllpassLength[ch]) {
|
||||
fx->lastAllpassPos[ch] = 0;
|
||||
}
|
||||
|
||||
fusedOut[ch] *= fusedGain;
|
||||
fusedOut[ch] += earlyOut;
|
||||
}
|
||||
|
||||
crosstalkL = fusedOut[1] + fusedOut[2];
|
||||
crosstalkR = fusedOut[0] + fusedOut[2];
|
||||
crosstalkS = fusedOut[0] + fusedOut[1];
|
||||
|
||||
output[0] = fusedOut[0] + crosstalkL * crosstalkGain;
|
||||
output[1] = fusedOut[1] + crosstalkR * crosstalkGain;
|
||||
output[2] = fusedOut[2] + crosstalkS * crosstalkGain;
|
||||
|
||||
*(input[0]++) = (s32)(output[0] * fx->outGain);
|
||||
*(input[1]++) = (s32)(output[1] * fx->outGain);
|
||||
*(input[2]++) = (s32)(output[2] * fx->outGain);
|
||||
|
||||
if (fx->busOut != NULL) {
|
||||
*(outBusData[0]++) = (s32)(output[0] * fx->sendGain);
|
||||
*(outBusData[1]++) = (s32)(output[1] * fx->sendGain);
|
||||
*(outBusData[2]++) = (s32)(output[2] * fx->sendGain);
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (++fx->earlyPos[i] >= fx->earlyLength) {
|
||||
fx->earlyPos[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (fx->preDelayLength != 0) {
|
||||
if (++fx->preDelayPos >= fx->preDelayLength) {
|
||||
fx->preDelayPos = 0;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (++fx->combPos[i] >= fx->combLength[i]) {
|
||||
fx->combPos[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (++fx->allpassPos[i] >= fx->allpassLength[i]) {
|
||||
fx->allpassPos[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static BOOL __AllocDelayLine(AXFX_REVERBHI_EXP* fx) {
|
||||
u32 ch, i;
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
fx->earlyLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->earlyMaxLength);
|
||||
if (fx->earlyLine[ch] == NULL)
|
||||
return FALSE;
|
||||
|
||||
if (fx->preDelayMaxLength != 0) {
|
||||
fx->preDelayLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->preDelayMaxLength);
|
||||
if (fx->preDelayLine[ch] == NULL)
|
||||
return FALSE;
|
||||
} else {
|
||||
fx->preDelayLine[ch] = NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
fx->combLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->combMaxLength[i]);
|
||||
if (fx->combLine[ch][i] == NULL)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
fx->allpassLine[ch][i] = (f32*)__AXFXAlloc(sizeof(f32) * fx->allpassMaxLength[i]);
|
||||
if (fx->allpassLine[ch][i] == NULL)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
fx->lastAllpassLine[ch] = (f32*)__AXFXAlloc(sizeof(f32) * fx->lastAllpassMaxLength[ch]);
|
||||
if (fx->lastAllpassLine[ch] == NULL)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void __BzeroDelayLines(AXFX_REVERBHI_EXP* fx) {
|
||||
u32 ch, i;
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
if (fx->earlyLine[ch] != NULL) {
|
||||
memset(fx->earlyLine[ch], 0, sizeof(f32) * fx->earlyMaxLength);
|
||||
}
|
||||
|
||||
if (fx->preDelayLine[ch] != NULL) {
|
||||
memset(fx->preDelayLine[ch], 0, sizeof(f32) * fx->preDelayMaxLength);
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (fx->combLine[ch][i] != NULL) {
|
||||
memset(fx->combLine[ch][i], 0, sizeof(f32) * fx->combMaxLength[i]);
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (fx->allpassLine[ch][i] != NULL) {
|
||||
memset(fx->allpassLine[ch][i], 0, sizeof(f32) * fx->allpassMaxLength[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (fx->lastAllpassLine[ch] != NULL) {
|
||||
memset(fx->lastAllpassLine[ch], 0, sizeof(f32) * fx->lastAllpassMaxLength[ch]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void __FreeDelayLine(AXFX_REVERBHI_EXP* fx) {
|
||||
u32 ch, i;
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
if (fx->earlyLine[ch] != NULL) {
|
||||
__AXFXFree(fx->earlyLine[ch]);
|
||||
fx->earlyLine[ch] = NULL;
|
||||
}
|
||||
|
||||
if (fx->preDelayLine[ch] != NULL) {
|
||||
__AXFXFree(fx->preDelayLine[ch]);
|
||||
fx->preDelayLine[ch] = NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (fx->combLine[ch][i] != NULL) {
|
||||
__AXFXFree(fx->combLine[ch][i]);
|
||||
fx->combLine[ch][i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (fx->allpassLine[ch][i] != NULL) {
|
||||
__AXFXFree(fx->allpassLine[ch][i]);
|
||||
fx->allpassLine[ch][i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (fx->lastAllpassLine[ch] != NULL) {
|
||||
__AXFXFree(fx->lastAllpassLine[ch]);
|
||||
fx->lastAllpassLine[ch] = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DECOMP_FORCE_LITERAL(AXFXReverbHiExp_c, -3.0f, 10.0);
|
||||
|
||||
static BOOL __InitParams(AXFX_REVERBHI_EXP* reverb) {
|
||||
u32 ch, i;
|
||||
|
||||
if (reverb->earlyMode >= 8)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->preDelayTime < 0.0f || reverb->preDelayTime > reverb->preDelayTimeMax)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->fusedMode >= 6)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->fusedTime < 0.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->coloration < 0.0f || reverb->coloration > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->damping < 0.0f || reverb->damping > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->crosstalk < 0.0f || reverb->crosstalk > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->earlyGain < 0.0f || reverb->earlyGain > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->fusedGain < 0.0f || reverb->fusedGain > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->outGain < 0.0f || reverb->outGain > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
if (reverb->sendGain < 0.0f || reverb->sendGain > 1.0f)
|
||||
return FALSE;
|
||||
|
||||
reverb->earlyLength = __EarlySizeTable[reverb->earlyMode][2];
|
||||
for (i = 0; i < 3; i++) {
|
||||
reverb->earlyPos[i] = reverb->earlyLength - __EarlySizeTable[reverb->earlyMode][i];
|
||||
reverb->earlyCoef[i] = __EarlyCoefTable[reverb->earlyMode][i] * reverb->earlyGain * 0.6f;
|
||||
}
|
||||
|
||||
reverb->preDelayPos = 0;
|
||||
reverb->preDelayLength = (u32)(reverb->preDelayTime * (f32)32000);
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
reverb->combPos[i] = 0;
|
||||
reverb->combLength[i] = __FilterSizeTable[reverb->fusedMode][i];
|
||||
reverb->combCoef[i] = pow(10.0f, (-3.0f * (f32)(reverb->combLength[i]) / (f32)(reverb->fusedTime * 32000)));
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
reverb->allpassPos[i] = 0;
|
||||
reverb->allpassLength[i] = __FilterSizeTable[reverb->fusedMode][3 + i];
|
||||
}
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
reverb->lastAllpassPos[ch] = 0;
|
||||
reverb->lastAllpassLength[ch] = __FilterSizeTable[reverb->fusedMode][5 + ch];
|
||||
}
|
||||
|
||||
reverb->allpassCoef = reverb->coloration;
|
||||
reverb->lpfCoef = 1.0f - reverb->damping;
|
||||
if (reverb->lpfCoef > 0.95f)
|
||||
reverb->lpfCoef = 0.95f;
|
||||
|
||||
for (ch = 0; ch < 3; ch++) {
|
||||
reverb->lastLpfOut[ch] = 0.0f;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1,35 +1,55 @@
|
||||
#include <revolution/verdefs.h>
|
||||
|
||||
#include <revolution/os.h>
|
||||
|
||||
#include <private/nand.h>
|
||||
#include <revolution/nand.h>
|
||||
|
||||
#include <private/es.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
SDKDefineVersion(CNTCACHE, "Apr 20 2010", "14:15:28");
|
||||
char lbl_81693350[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,
|
||||
0x30, 0x20, 0x31, 0x34, 0x3a, 0x31, 0x35, 0x3a, 0x32, 0x38, 0x20, 0x28, 0x30, 0x78, 0x34, 0x31,
|
||||
0x39, 0x39, 0x5f, 0x36, 0x30, 0x38, 0x33, 0x31, 0x29, 0x20, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00,
|
||||
0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x32, 0x2f, 0x63, 0x6e, 0x74, 0x63, 0x61, 0x63, 0x68,
|
||||
0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69,
|
||||
0x74, 0x6c, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x30, 0x31, 0x36, 0x6c, 0x6c, 0x78, 0x20,
|
||||
0x00, 0x00, 0x00, 0x00, 0x2f, 0x74, 0x6d, 0x70, 0x2f, 0x63, 0x6e, 0x74, 0x63, 0x61, 0x63, 0x68,
|
||||
0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0x00, 0x00, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x32,
|
||||
0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
|
||||
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] = {
|
||||
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};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
extern void _savegpr_26();
|
||||
extern void _restgpr_26();
|
||||
|
||||
OSMutex _CNTCACHEMutex;
|
||||
|
||||
int _CNTCACHEUnused816997A8;
|
||||
long long _CNTCACHEUnused816997A8;
|
||||
int _CNTCACHEUnused816997A4;
|
||||
|
||||
BOOL _CNTCACHEInitialized;
|
||||
|
||||
void CNTCACHEClear();
|
||||
BOOL _CNTCACHEIsTitleRemovable(ESTitleId titleId);
|
||||
void _CNTCACHEDeleteTitle();
|
||||
void _CNTCACHEDeleteContent();
|
||||
|
||||
|
||||
void CNTCACHEInit(int unk0, int unk1) {
|
||||
if (_CNTCACHEInitialized == FALSE) {
|
||||
BOOL old;
|
||||
|
||||
OSRegisterVersion(GetVersion(CNTCACHE));
|
||||
OSRegisterVersion(__CNTCACHEVersion);
|
||||
|
||||
OSInitMutex(&_CNTCACHEMutex);
|
||||
ES_InitLib();
|
||||
@@ -41,87 +61,492 @@ void CNTCACHEInit(int unk0, int unk1) {
|
||||
CNTCACHEClear();
|
||||
|
||||
_CNTCACHEUnused816997A4 = unk0;
|
||||
_CNTCACHEUnused816997A8 = unk1;
|
||||
*((int*)&_CNTCACHEUnused816997A8) = unk1;
|
||||
}
|
||||
asm void CNTCACHEClear() {
|
||||
clrlwi r11, r1, 0x1b
|
||||
mr r12, r1
|
||||
subfic r11, r11, -0x500
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, lbl_81693350@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
addi r3, r30, 0x50
|
||||
addi r4, r1, 0x24
|
||||
li r27, 1
|
||||
li r5, 3
|
||||
bl NANDPrivateOpen
|
||||
cmpwi r3, -0xc
|
||||
mr r28, r3
|
||||
bne L_d4
|
||||
li r28, 0
|
||||
b L_28c
|
||||
L_d4:
|
||||
cmpwi r3, 0
|
||||
beq L_e0
|
||||
b L_268
|
||||
L_e0:
|
||||
addi r3, r1, 0x24
|
||||
addi r4, r1, 0x20
|
||||
bl NANDGetLength
|
||||
cmpwi r3, 0
|
||||
mr r28, r3
|
||||
beq L_fc
|
||||
b L_268
|
||||
L_fc:
|
||||
li r26, 0
|
||||
li r31, 0
|
||||
b L_25c
|
||||
L_108:
|
||||
lwz r25, 0x20(r1)
|
||||
cmplwi r25, 0x400
|
||||
ble L_118
|
||||
li r25, 0x400
|
||||
L_118:
|
||||
addi r24, r1, 0xc0
|
||||
addi r0, r25, 0x1f
|
||||
addi r3, r1, 0x24
|
||||
mr r4, r24
|
||||
rlwinm r5, r0, 0, 0, 0x1a
|
||||
bl NANDRead
|
||||
cmpw r3, r25
|
||||
beq L_140
|
||||
li r28, -0x14b3
|
||||
b L_268
|
||||
L_140:
|
||||
mr r4, r24
|
||||
li r28, 0
|
||||
mtctr r25
|
||||
cmplwi r25, 0
|
||||
ble L_16c
|
||||
L_154:
|
||||
lbz r0, 0(r4)
|
||||
cmpwi r0, 0xa
|
||||
bne L_164
|
||||
b L_170
|
||||
L_164:
|
||||
addi r4, r4, 1
|
||||
bdnz L_154
|
||||
L_16c:
|
||||
li r4, 0
|
||||
L_170:
|
||||
cmpwi r4, 0
|
||||
bne L_224
|
||||
li r28, 0
|
||||
b L_268
|
||||
b L_224
|
||||
L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
beq L_1d4
|
||||
addi r4, r30, 0xb4
|
||||
bl strcmp
|
||||
cmpwi r3, 0
|
||||
bne L_1bc
|
||||
bl _CNTCACHEDeleteTitle
|
||||
b L_1d4
|
||||
L_1bc:
|
||||
mr r3, r29
|
||||
addi r4, r30, 0xc0
|
||||
bl strcmp
|
||||
cmpwi r3, 0
|
||||
bne L_1d4
|
||||
bl _CNTCACHEDeleteContent
|
||||
L_1d4:
|
||||
lwz r0, 0x20(r1)
|
||||
addi r23, r23, 1
|
||||
add r24, r24, r23
|
||||
subf r0, r23, r0
|
||||
subf r25, r23, r25
|
||||
mr r4, r24
|
||||
stw r0, 0x20(r1)
|
||||
add r26, r26, r23
|
||||
mtctr r25
|
||||
cmplwi r25, 0
|
||||
ble L_218
|
||||
L_200:
|
||||
lbz r0, 0(r4)
|
||||
cmpwi r0, 0xa
|
||||
bne L_210
|
||||
b L_21c
|
||||
L_210:
|
||||
addi r4, r4, 1
|
||||
bdnz L_200
|
||||
L_218:
|
||||
li r4, 0
|
||||
L_21c:
|
||||
cmpwi r4, 0
|
||||
beq L_22c
|
||||
L_224:
|
||||
cmpwi r25, 0
|
||||
bgt L_184
|
||||
L_22c:
|
||||
lwz r0, 0x20(r1)
|
||||
cmpwi r0, 0
|
||||
beq L_25c
|
||||
mr r4, r26
|
||||
addi r3, r1, 0x24
|
||||
li r5, 0
|
||||
bl NANDSeek
|
||||
cmplw r3, r26
|
||||
beq L_258
|
||||
li r28, -0x14b3
|
||||
b L_268
|
||||
L_258:
|
||||
li r28, 0
|
||||
L_25c:
|
||||
lwz r0, 0x20(r1)
|
||||
cmpwi r0, 0
|
||||
bne L_108
|
||||
L_268:
|
||||
addi r3, r1, 0x24
|
||||
bl NANDClose
|
||||
addi r3, r30, 0x50
|
||||
li r29, 0
|
||||
bl NANDPrivateDelete
|
||||
cmpwi r3, 0
|
||||
addi r3, r30, 0x84
|
||||
bl NANDPrivateDelete
|
||||
cmpwi r3, 0
|
||||
L_28c:
|
||||
cmpwi r29, 0
|
||||
beq L_29c
|
||||
addi r3, r1, 0x24
|
||||
bl NANDClose
|
||||
L_29c:
|
||||
cmpwi r27, 0
|
||||
beq L_2b0
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSUnlockMutex
|
||||
L_2b0:
|
||||
mr r3, r28
|
||||
lwz r10, 0(r1)
|
||||
mr r11, r10
|
||||
bl _restgpr_23
|
||||
lwz r0, 4(r10)
|
||||
mtlr r0
|
||||
mr r1, r10
|
||||
blr
|
||||
}
|
||||
|
||||
void _CNTCACHEDeleteTitle() {
|
||||
char* tok = strtok(NULL, " \n");
|
||||
while (tok != NULL) {
|
||||
ESTitleId titleId;
|
||||
|
||||
errno = 0;
|
||||
titleId = strtoull(tok, NULL, 16);
|
||||
|
||||
if (errno == 0 && NANDTitleIdHi(titleId) != 0x00000001) {
|
||||
BOOL result = _CNTCACHEIsTitleRemovable(titleId);
|
||||
if (result == TRUE) {
|
||||
ES_DeleteTitle(titleId);
|
||||
} else if (result == FALSE) {
|
||||
ES_DeleteTitleContent(titleId);
|
||||
}
|
||||
}
|
||||
tok = strtok(NULL, " \n");
|
||||
}
|
||||
asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
stw r29, 0x14(r1)
|
||||
stw r28, 0x10(r1)
|
||||
bl strtok
|
||||
li r30, 0
|
||||
li r31, -1
|
||||
b L_370
|
||||
L_304:
|
||||
stw r30, errno(r0)
|
||||
li r4, 0
|
||||
li r5, 0x10
|
||||
bl strtoull
|
||||
lwz r0, errno(r0)
|
||||
mr r28, r4
|
||||
mr r29, r3
|
||||
cmpwi r0, 0
|
||||
bne L_364
|
||||
and r0, r3, r31
|
||||
cmplwi r0, 1
|
||||
beq L_364
|
||||
bl _CNTCACHEIsTitleRemovable
|
||||
cmpwi r3, 1
|
||||
bne L_350
|
||||
mr r4, r28
|
||||
mr r3, r29
|
||||
bl ES_DeleteTitle
|
||||
b L_364
|
||||
L_350:
|
||||
cmpwi r3, 0
|
||||
bne L_364
|
||||
mr r4, r28
|
||||
mr r3, r29
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
bne L_304
|
||||
lwz r0, 0x24(r1)
|
||||
lwz r31, 0x1c(r1)
|
||||
lwz r30, 0x18(r1)
|
||||
lwz r29, 0x14(r1)
|
||||
lwz r28, 0x10(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
}
|
||||
|
||||
static int GetSavePath(ESTitleId titleId) {
|
||||
char nandPath[64] ALIGN32;
|
||||
|
||||
s32 ret;
|
||||
u32 usedBlocks = 1;
|
||||
u32 usedINodes = 1;
|
||||
|
||||
snprintf(nandPath, (int)sizeof(nandPath), "/title/%08x/%08x/data", NANDTitleIdHi(titleId), NANDTitleIdLo(titleId));
|
||||
ret = NANDSecretGetUsage(nandPath, &usedBlocks, &usedINodes);
|
||||
|
||||
if (ret == NAND_RESULT_NOEXISTS) {
|
||||
ret = 2;
|
||||
} else if (ret >= NAND_RESULT_OK) {
|
||||
if (usedINodes == 1 && usedBlocks == 0) {
|
||||
ret = 1;
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
clrlwi r11, r1, 0x1b
|
||||
mr r12, r1
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, lbl_81693420@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, lbl_81693420@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
addi r3, r1, 0x40
|
||||
stw r29, -0xc(r12)
|
||||
mr r29, r4
|
||||
li r4, -1
|
||||
stw r0, 0x20(r1)
|
||||
and r6, r30, r4
|
||||
and r7, r29, r4
|
||||
li r4, 0x40
|
||||
stw r0, 0x24(r1)
|
||||
crclr 4*cr1+eq
|
||||
bl snprintf
|
||||
addi r3, r1, 0x40
|
||||
addi r4, r1, 0x20
|
||||
addi r5, r1, 0x24
|
||||
bl NANDSecretGetUsage
|
||||
cmpwi r3, -0xc
|
||||
mr r4, r3
|
||||
bne L_418
|
||||
li r4, 2
|
||||
b L_444
|
||||
L_418:
|
||||
cmpwi r3, 0
|
||||
blt L_444
|
||||
lwz r0, 0x24(r1)
|
||||
cmplwi r0, 1
|
||||
bne L_440
|
||||
lwz r0, 0x20(r1)
|
||||
cmpwi r0, 0
|
||||
bne L_440
|
||||
li r4, 1
|
||||
b L_444
|
||||
L_440:
|
||||
li r4, 0
|
||||
L_444:
|
||||
cmpwi r4, 1
|
||||
bne L_4bc
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
addi r31, r1, 0x80
|
||||
addi r6, r1, 0x28
|
||||
li r5, 0
|
||||
bl ES_GetTmdView
|
||||
cmpwi r3, 0
|
||||
beq L_470
|
||||
b L_4c0
|
||||
L_470:
|
||||
lwz r0, 0x28(r1)
|
||||
cmplwi r0, 0x2060
|
||||
ble L_484
|
||||
li r3, -0x400
|
||||
b L_4c0
|
||||
L_484:
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
mr r5, r31
|
||||
addi r6, r1, 0x28
|
||||
bl ES_GetTmdView
|
||||
cmpwi r3, 0
|
||||
beq L_4a4
|
||||
b L_4c0
|
||||
L_4a4:
|
||||
lhz r0, 0xd8(r1)
|
||||
rlwinm. r0, r0, 0x18, 0x18, 0x1f
|
||||
bne L_4b8
|
||||
li r4, 1
|
||||
b L_4bc
|
||||
L_4b8:
|
||||
li r4, 0
|
||||
L_4bc:
|
||||
mr r3, r4
|
||||
L_4c0:
|
||||
lwz r10, 0(r1)
|
||||
lwz r0, 4(r10)
|
||||
lwz r31, -4(r10)
|
||||
lwz r30, -8(r10)
|
||||
lwz r29, -0xc(r10)
|
||||
mtlr r0
|
||||
mr r1, r10
|
||||
blr
|
||||
}
|
||||
|
||||
static int GetTmdView(ESTitleId titleId, ESTmdView* tmdView) {
|
||||
s32 ret;
|
||||
u32* tmdSize = NULL;
|
||||
|
||||
ret = ES_GetTmdView(titleId, NULL, tmdSize);
|
||||
if (ret != ES_ERR_OK) {
|
||||
return ret;
|
||||
}
|
||||
if (*tmdSize > OSRoundUp32B(sizeof(ESTmdView))) {
|
||||
ret = -1024;
|
||||
goto out;
|
||||
}
|
||||
ret = ES_GetTmdView(titleId, tmdView, tmdSize);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
ESTmdView tmd ALIGN32;
|
||||
s32 ret = -1;
|
||||
|
||||
ret = GetSavePath(titleId);
|
||||
if (ret == 1) {
|
||||
ret = GetTmdView(titleId, &tmd);
|
||||
if (ret != ES_ERR_OK) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (tmd.head.titleVersion >> 8 == 0) {
|
||||
ret = 1;
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
goto out;
|
||||
}
|
||||
|
||||
out:
|
||||
return ret;
|
||||
asm void _CNTCACHEDeleteContent() {
|
||||
clrlwi r11, r1, 0x1b
|
||||
mr r12, r1
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
stw r31, errno(r0)
|
||||
li r5, 0x10
|
||||
bl strtoull
|
||||
lwz r0, errno(r0)
|
||||
mr r29, r4
|
||||
mr r30, r3
|
||||
cmpwi r0, 0
|
||||
bne L_708
|
||||
li r0, -1
|
||||
and r5, r3, r0
|
||||
addis r0, r5, -1
|
||||
cmplwi r0, 5
|
||||
bne L_708
|
||||
addi r28, r1, 0x80
|
||||
addi r6, r1, 0x28
|
||||
li r5, 0
|
||||
bl ES_GetTmdView
|
||||
cmpwi r3, -0x6a
|
||||
beq L_708
|
||||
cmpwi r3, 0
|
||||
bne L_708
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
mr r5, r28
|
||||
addi r6, r1, 0x28
|
||||
bl ES_GetTmdView
|
||||
cmpwi r3, 0
|
||||
bne L_708
|
||||
lwz r3, 0x94(r1)
|
||||
rlwinm. r0, r3, 0, 0x1c, 0x1c
|
||||
beq L_6f0
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, lbl_81693420@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
li r4, 0
|
||||
li r5, 0xa
|
||||
bl strtoul
|
||||
lwz r0, errno(r0)
|
||||
cmpwi r0, 0
|
||||
bne L_6dc
|
||||
cmplwi r3, 0x1fe
|
||||
bgt L_6dc
|
||||
lhz r0, 0xda(r1)
|
||||
li r4, 0
|
||||
mtctr r0
|
||||
cmplwi r0, 0
|
||||
ble L_6dc
|
||||
L_5e8:
|
||||
add r5, r28, r4
|
||||
lhz r0, 0x60(r5)
|
||||
cmplw r3, r0
|
||||
bne L_6d4
|
||||
lhz r0, 0x62(r5)
|
||||
rlwinm. r0, r0, 0, 0x10, 0x10
|
||||
bne L_6dc
|
||||
lwz r5, 0x5c(r5)
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
bl ES_DeleteContent
|
||||
cmpwi r3, 0
|
||||
bne L_6dc
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
addi r6, r1, 0x2c
|
||||
li r5, 0
|
||||
bl ES_ListTitleContentsOnCard
|
||||
cmpwi r3, 0
|
||||
bne L_6dc
|
||||
lwz r0, 0x2c(r1)
|
||||
cmpwi r0, 0
|
||||
bne L_6dc
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, lbl_81693420@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
li r4, 0x40
|
||||
crclr 4*cr1+eq
|
||||
bl snprintf
|
||||
addi r3, r1, 0x40
|
||||
addi r4, r1, 0x20
|
||||
addi r5, r1, 0x24
|
||||
bl NANDSecretGetUsage
|
||||
cmpwi r3, -0xc
|
||||
mr r0, r3
|
||||
bne L_690
|
||||
li r0, 2
|
||||
b L_6bc
|
||||
L_690:
|
||||
cmpwi r3, 0
|
||||
blt L_6bc
|
||||
lwz r0, 0x24(r1)
|
||||
cmplwi r0, 1
|
||||
bne L_6b8
|
||||
lwz r0, 0x20(r1)
|
||||
cmpwi r0, 0
|
||||
bne L_6b8
|
||||
li r0, 1
|
||||
b L_6bc
|
||||
L_6b8:
|
||||
li r0, 0
|
||||
L_6bc:
|
||||
cmpwi r0, 1
|
||||
bne L_6dc
|
||||
mr r4, r29
|
||||
mr r3, r30
|
||||
bl ES_DeleteTitle
|
||||
b L_6dc
|
||||
L_6d4:
|
||||
addi r4, r4, 0x10
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
bne L_5b0
|
||||
L_6f0:
|
||||
lwz r5, 0x28(r1)
|
||||
addi r3, r1, 0x80
|
||||
li r4, 0
|
||||
addi r0, r5, 0x1f
|
||||
rlwinm r5, r0, 0, 0, 0x1a
|
||||
bl memset
|
||||
L_708:
|
||||
lwz r10, 0(r1)
|
||||
mr r11, r10
|
||||
bl _restgpr_26
|
||||
lwz r0, 4(r10)
|
||||
mtlr r0
|
||||
mr r1, r10
|
||||
blr
|
||||
}
|
||||
|
||||
8
libs/RVL_SDK/src/fa/api/FAFclose.c
Normal file
8
libs/RVL_SDK/src/fa/api/FAFclose.c
Normal file
@@ -0,0 +1,8 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 pfstub_fclose(FAFILE* stream);
|
||||
|
||||
FAError FAFclose(FAFILE* stream) {
|
||||
s32 error = pfstub_fclose(stream);
|
||||
return (-error | error) >> 31;
|
||||
}
|
||||
8
libs/RVL_SDK/src/fa/api/FAFinfo.c
Normal file
8
libs/RVL_SDK/src/fa/api/FAFinfo.c
Normal file
@@ -0,0 +1,8 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 pfstub_finfo(FAFILE* stream, FAFileInfo* info);
|
||||
|
||||
FAError FAFinfo(FAFILE* stream, FAFileInfo* info) {
|
||||
s32 error = pfstub_finfo(stream, info);
|
||||
return (-error | error) >> 31;
|
||||
}
|
||||
7
libs/RVL_SDK/src/fa/api/FAFread.c
Normal file
7
libs/RVL_SDK/src/fa/api/FAFread.c
Normal file
@@ -0,0 +1,7 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern size_t pfstub_fread(void* buffer, size_t size, size_t count, FAFILE* stream);
|
||||
|
||||
size_t FAFread(void* buffer, size_t size, size_t count, FAFILE* stream) {
|
||||
return pfstub_fread(buffer, size, count, stream);
|
||||
}
|
||||
7
libs/RVL_SDK/src/fa/api/FAFwrite.c
Normal file
7
libs/RVL_SDK/src/fa/api/FAFwrite.c
Normal file
@@ -0,0 +1,7 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern size_t pfstub_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream);
|
||||
|
||||
size_t FAFwrite(void* buffer, size_t size, size_t count, FAFILE* stream) {
|
||||
return pfstub_fwrite(buffer, size, count, stream);
|
||||
}
|
||||
2
libs/RVL_SDK/src/fa/api/FAInitDiskManager.c
Normal file
2
libs/RVL_SDK/src/fa/api/FAInitDiskManager.c
Normal file
@@ -0,0 +1,2 @@
|
||||
int FADiskInitializedPadding;
|
||||
int FADiskInitialized;
|
||||
10
libs/RVL_SDK/src/fa/pf_closedir.c
Normal file
10
libs/RVL_SDK/src/fa/pf_closedir.c
Normal file
@@ -0,0 +1,10 @@
|
||||
typedef int s32;
|
||||
|
||||
extern s32 PFDIR_closedir(void* dir);
|
||||
extern s32 PFAPI_convertReturnValue(s32 err);
|
||||
|
||||
s32 pf2_closedir(void* dir) {
|
||||
s32 err = PFDIR_closedir(dir);
|
||||
err = PFAPI_convertReturnValue(err);
|
||||
return err;
|
||||
}
|
||||
10
libs/RVL_SDK/src/fa/pf_errnum.c
Normal file
10
libs/RVL_SDK/src/fa/pf_errnum.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFVOL_errnum(void);
|
||||
extern s32 PFAPI_convertError(s32 error);
|
||||
|
||||
FAError pf2_errnum() {
|
||||
s32 error = PFVOL_errnum();
|
||||
error = PFAPI_convertError(error);
|
||||
return error;
|
||||
}
|
||||
7
libs/RVL_SDK/src/fa/pf_fatfs.c
Normal file
7
libs/RVL_SDK/src/fa/pf_fatfs.c
Normal file
@@ -0,0 +1,7 @@
|
||||
#include <revolution/types.h>
|
||||
|
||||
extern s32 PFVOL_InitModule(u32 config, void* param);
|
||||
|
||||
s32 PFFATFS_initializeFATFS(u32 config, void* param) {
|
||||
return PFVOL_InitModule(config, param);
|
||||
}
|
||||
10
libs/RVL_SDK/src/fa/pf_fclose.c
Normal file
10
libs/RVL_SDK/src/fa/pf_fclose.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_fclose(FAFILE* stream);
|
||||
extern s32 PFAPI_convertReturnValue(s32 error);
|
||||
|
||||
FAError pf2_fclose(FAFILE* stream) {
|
||||
s32 error = PFFILE_fclose(stream);
|
||||
error = PFAPI_convertReturnValue(error);
|
||||
return error;
|
||||
}
|
||||
10
libs/RVL_SDK/src/fa/pf_feof.c
Normal file
10
libs/RVL_SDK/src/fa/pf_feof.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_feof(FAFILE* stream);
|
||||
extern s32 PFAPI_convertReturnValue4feof(s32 error);
|
||||
|
||||
FAError pf2_feof(FAFILE* stream) {
|
||||
s32 error = PFFILE_feof(stream);
|
||||
error = PFAPI_convertReturnValue4feof(error);
|
||||
return error;
|
||||
}
|
||||
10
libs/RVL_SDK/src/fa/pf_ferror.c
Normal file
10
libs/RVL_SDK/src/fa/pf_ferror.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_ferror(FAFILE* stream);
|
||||
extern s32 PFAPI_convertError(s32 error);
|
||||
|
||||
FAError pf2_ferror(FAFILE* stream) {
|
||||
s32 error = PFFILE_ferror(stream);
|
||||
error = PFAPI_convertError(error);
|
||||
return error;
|
||||
}
|
||||
12
libs/RVL_SDK/src/fa/pf_flock.c
Normal file
12
libs/RVL_SDK/src/fa/pf_flock.c
Normal file
@@ -0,0 +1,12 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_flock(FAFILE* stream, s32 mode);
|
||||
extern s32 PFAPI_convertReturnValue(s32 error);
|
||||
|
||||
FAError pf2_flock(FAFILE* stream, s32 mode) {
|
||||
s32 error;
|
||||
mode |= 8;
|
||||
error = PFFILE_flock(stream, mode);
|
||||
error = PFAPI_convertReturnValue(error);
|
||||
return error;
|
||||
}
|
||||
9
libs/RVL_SDK/src/fa/pf_fread.c
Normal file
9
libs/RVL_SDK/src/fa/pf_fread.c
Normal file
@@ -0,0 +1,9 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_fread(void* buffer, size_t size, size_t count, FAFILE* stream, size_t* countRead);
|
||||
|
||||
size_t pf2_fread(void* buffer, size_t size, size_t count, FAFILE* stream) {
|
||||
size_t countRead;
|
||||
PFFILE_fread(buffer, size, count, stream, &countRead);
|
||||
return countRead;
|
||||
}
|
||||
10
libs/RVL_SDK/src/fa/pf_fsync.c
Normal file
10
libs/RVL_SDK/src/fa/pf_fsync.c
Normal file
@@ -0,0 +1,10 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_fsync(FAFILE* stream);
|
||||
extern s32 PFAPI_convertReturnValue(s32 error);
|
||||
|
||||
FAError pf2_fsync(FAFILE* stream) {
|
||||
s32 error = PFFILE_fsync(stream);
|
||||
error = PFAPI_convertReturnValue(error);
|
||||
return error;
|
||||
}
|
||||
9
libs/RVL_SDK/src/fa/pf_fwrite.c
Normal file
9
libs/RVL_SDK/src/fa/pf_fwrite.c
Normal file
@@ -0,0 +1,9 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
extern s32 PFFILE_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream, size_t* countWritten);
|
||||
|
||||
size_t pf2_fwrite(void* buffer, size_t size, size_t count, FAFILE* stream) {
|
||||
size_t countWritten;
|
||||
PFFILE_fwrite(buffer, size, count, stream, &countWritten);
|
||||
return countWritten;
|
||||
}
|
||||
@@ -66,6 +66,7 @@ void __OSEVStart();
|
||||
void __OSEVEnd();
|
||||
#define __OSEVSize ((u32)__OSEVEnd - (u32)__OSEVStart)
|
||||
void __OSEVSetNumber();
|
||||
void __OSDBJumpTarget();
|
||||
|
||||
void __DBVECTOR();
|
||||
|
||||
@@ -795,7 +796,7 @@ static asm void __OSDBJump() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
entry __OSDBJUMPSTART
|
||||
bla OS_ADDR_DB_INTEGRATOR_HOOK
|
||||
bla __OSDBJumpTarget
|
||||
entry __OSDBJUMPEND
|
||||
#endif // __MWERKS__
|
||||
// clang-format on
|
||||
@@ -831,6 +832,7 @@ entry __OSEVStart
|
||||
mflr r3
|
||||
stw r3, OSContext.lr(r4)
|
||||
mfctr r3
|
||||
entry __OSDBJumpTarget
|
||||
stw r3, OSContext.ctr(r4)
|
||||
mfxer r3
|
||||
stw r3, OSContext.xer(r4)
|
||||
|
||||
2020
libs/RVL_SDK/src/wpad/WPADHIDParser.c
Normal file
2020
libs/RVL_SDK/src/wpad/WPADHIDParser.c
Normal file
File diff suppressed because it is too large
Load Diff
@@ -46,7 +46,7 @@ void CDBRecordKeyGetKeyStr(CDBRecordKey* recordKey, char* keyString);
|
||||
|
||||
void CDBRecordKeySetSerialNumber(CDBRecordKey* recordKey, int serialNum);
|
||||
|
||||
void CDBRecordKeyCopy(CDBRecordKey* recordKey, CDBRecordKey* newRecordKey);
|
||||
void CDBRecordKeyCopy(CDBRecordKey* recordKey, const CDBRecordKey* newRecordKey);
|
||||
|
||||
BOOL CDBRecordKeyCompare(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);
|
||||
int CDBRecordKeyCompareByDate(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);
|
||||
|
||||
@@ -16,7 +16,7 @@ int STD_strnlen(const char* str, u32 len);
|
||||
|
||||
int Util_xtoi(char ch);
|
||||
|
||||
void* Mail_memcpy(void* dest, void* src, u32 len);
|
||||
void* Mail_memcpy(void* dest, const void* src, u32 len);
|
||||
void* Mail_memset(void* dest, int fill, u32 count);
|
||||
|
||||
int Mail_strlen(const char* str);
|
||||
|
||||
@@ -11,9 +11,7 @@ static char CDB_ATTR_MAGIC[] = "CDBFILE";
|
||||
static const u32 CDB_ATTR_VERSION = 0x02000000;
|
||||
static const u32 CDB_ATTR_VERSION_PADDING = 0;
|
||||
|
||||
static u32 s_seed = 0;
|
||||
|
||||
u32 CDBAttrGetDescOffset(CDBAttr* attr) {
|
||||
static u32 CDBAttrGetDescOffset(CDBAttr* attr) {
|
||||
return attr->buf.version == 1 ? 0x0D : offsetof(CDBAttrBuf, descLength);
|
||||
}
|
||||
|
||||
@@ -171,28 +169,18 @@ void CDBAttrGetKeyStr(CDBAttr* attr, char* keyString) {
|
||||
memcpy(keyString, attr->buf.keyString, CDB_ATTR_BUF_KEY_STRING_LEN);
|
||||
}
|
||||
|
||||
u32 CDBAttrSetIV(CDBAttr* attr, u32 seed);
|
||||
|
||||
void CDBAttrInitIV(CDBAttr* attr) {
|
||||
int i, j;
|
||||
u32 seed;
|
||||
static u32 s_seed = 0;
|
||||
int i;
|
||||
|
||||
if (s_seed == 0) {
|
||||
s_seed = OSGetTick();
|
||||
}
|
||||
|
||||
s_seed = CDBAttrSetIV(attr, s_seed);
|
||||
}
|
||||
|
||||
u32 CDBAttrSetIV(CDBAttr* attr, u32 seed) {
|
||||
int i, j;
|
||||
for (i = 0; i < 2; i++) {
|
||||
for (j = 0; j < 8; j++) {
|
||||
seed = 1566083941 * seed + 2531011;
|
||||
attr->buf.iv[(i * 8) + j] = (s8)(seed >> 16);
|
||||
}
|
||||
for (i = 0; i < CDB_ATTR_BUF_KEY_IV_LEN; i++) {
|
||||
s_seed = 1566083941 * s_seed + 2531011;
|
||||
attr->buf.iv[i] = (s8)(s_seed >> 16);
|
||||
}
|
||||
return seed;
|
||||
}
|
||||
|
||||
void CDBAttrGetIV(CDBAttr* attr, u8* iv) {
|
||||
|
||||
@@ -324,25 +324,37 @@ CDBErr CDBConvKeyToFullPath(CDBRecordKey* recordKey, char* fullPath) {
|
||||
}
|
||||
|
||||
void CDBConvKeyStrToFullPath_(char* keyString, char* fullPath, CDBLocation location, u64* wiiId) {
|
||||
char fileNameStr[8];
|
||||
char yearStr[8];
|
||||
char monthStr[8];
|
||||
char dayStr[8];
|
||||
char hourStr[8];
|
||||
char minStr[8];
|
||||
|
||||
char codeStr[8];
|
||||
char typeStr[8];
|
||||
char serialNumStr[8];
|
||||
char fileNameStr[8];
|
||||
|
||||
char typeStr[5];
|
||||
CDBDate epoch;
|
||||
int year;
|
||||
int month;
|
||||
int day;
|
||||
int hour;
|
||||
int min;
|
||||
char serialNumStr[4];
|
||||
char fileSerial[4];
|
||||
CDBDate fileEpoch;
|
||||
char fileEpochStr[40];
|
||||
|
||||
CDBConvKeyStrToEpochValue(keyString, &epoch);
|
||||
{
|
||||
union {
|
||||
char storage[20];
|
||||
struct {
|
||||
char prefix[8];
|
||||
char value[12];
|
||||
} epoch;
|
||||
} epochBuffer;
|
||||
strncpy(epochBuffer.epoch.value, CDBKeyStrEpoch(keyString), CDB_KEYSTR_EPOCH_SIZE);
|
||||
epochBuffer.epoch.value[CDB_KEYSTR_EPOCH_SIZE] = 0;
|
||||
sscanf(epochBuffer.epoch.value, "%ul", &epoch);
|
||||
}
|
||||
CDBConvEpochValueToDate(epoch, &year, &month, &day, &hour, &min, NULL);
|
||||
|
||||
CDBConvYearValueToYearStr(yearStr, year);
|
||||
@@ -354,7 +366,12 @@ void CDBConvKeyStrToFullPath_(char* keyString, char* fullPath, CDBLocation locat
|
||||
CDBConvKeyStrToCode(keyString, codeStr);
|
||||
CDBConvKeyStrToSerialNumber(keyString, serialNumStr);
|
||||
CDBConvKeyStrToType(keyString, typeStr);
|
||||
CDBConvKeyStrToFileName(keyString, fileNameStr);
|
||||
strncpy(fileEpochStr, CDBKeyStrEpoch(keyString), CDB_KEYSTR_EPOCH_SIZE);
|
||||
fileEpochStr[CDB_KEYSTR_EPOCH_SIZE] = 0;
|
||||
sscanf(fileEpochStr, "%ul", &fileEpoch);
|
||||
strncpy(fileSerial, CDBKeyStrSerialNumber(keyString), CDB_KEYSTR_SERIAL_NUMBER_SIZE);
|
||||
fileSerial[CDB_KEYSTR_SERIAL_NUMBER_SIZE] = 0;
|
||||
sprintf(fileNameStr, "%08X.%s", fileEpoch, fileSerial);
|
||||
|
||||
if (location == CDB_FS_LOCATION_NAND || location == CDB_FS_LOCATION_SD) {
|
||||
CDBConvFileNameStrToFullPath(fullPath, yearStr, monthStr, dayStr, hourStr, minStr, codeStr, typeStr, fileNameStr, location, wiiId);
|
||||
|
||||
3621
libs/RevoEX/src/cdb/CDBDatabase.c
Normal file
3621
libs/RevoEX/src/cdb/CDBDatabase.c
Normal file
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern const char lbl_816979E8[8] = "/";
|
||||
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
|
||||
#pragma pop
|
||||
|
||||
void CDBFSConcatenatePath(char* path, const char* concatPath) {
|
||||
|
||||
@@ -29,23 +29,25 @@ BOOL CDBRecordKeyIsValid(CDBRecordKey* recordKey) {
|
||||
}
|
||||
|
||||
void CDBRecordKeyInit(CDBRecordKey* recordKey, CDBDate epoch, int gameCode, u16 makerCode, int serialNumber, char* fileType, int unk) {
|
||||
char typeStr[8];
|
||||
char gcStr[8];
|
||||
char mcStr[8];
|
||||
struct {
|
||||
char mcStr[4];
|
||||
char typeStr[8];
|
||||
char gcStr[8];
|
||||
} strings;
|
||||
|
||||
u32 typeLength;
|
||||
|
||||
CDBConvMCValueToMCStr(makerCode, mcStr);
|
||||
CDBConvGCValueToGCStr(gameCode, gcStr);
|
||||
CDBConvMCValueToMCStr(makerCode, strings.mcStr);
|
||||
CDBConvGCValueToGCStr(gameCode, strings.gcStr);
|
||||
|
||||
recordKey->wiiId = CDBGetWiiId();
|
||||
recordKey->location = unk;
|
||||
|
||||
typeLength = strlen(typeStr);
|
||||
strcpy(typeStr, fileType);
|
||||
CDBToLower(typeStr, typeLength);
|
||||
typeLength = strlen(fileType);
|
||||
strcpy(strings.typeStr, fileType);
|
||||
CDBToLower(((char*)strings.typeStr), typeLength);
|
||||
|
||||
sprintf(recordKey->keyString, "%010u_%s_%s_%03d.%s", epoch, gcStr, mcStr, serialNumber, typeStr);
|
||||
sprintf(recordKey->keyString, "%010u_%s_%s_%03d.%s", epoch, strings.gcStr, strings.mcStr, serialNumber, strings.typeStr);
|
||||
}
|
||||
|
||||
void CDBRecordKeySetSerialNumber(CDBRecordKey* recordKey, int serialNum) {
|
||||
@@ -72,9 +74,8 @@ void CDBRecordKeyInitFromFileName2(CDBRecordKey* recordKey, char* keyString, cha
|
||||
recordKey->location = CDB_FS_LOCATION_SD;
|
||||
}
|
||||
|
||||
void CDBRecordKeyCopy(CDBRecordKey* recordKey, CDBRecordKey* newRecordKey) {
|
||||
void CDBRecordKeyCopy(CDBRecordKey* recordKey, const CDBRecordKey* newRecordKey) {
|
||||
strcpy(recordKey->keyString, newRecordKey->keyString);
|
||||
|
||||
recordKey->wiiId = newRecordKey->wiiId;
|
||||
recordKey->location = newRecordKey->location;
|
||||
}
|
||||
@@ -136,6 +137,156 @@ CDBRecordKey* CDBRecordKeyArrayEnd(CDBRecordKeyArray* recordArray) {
|
||||
return recordArray->records + recordArray->size;
|
||||
}
|
||||
|
||||
#pragma dont_inline on
|
||||
|
||||
int CDBRecordKeyArrayDicInsertR(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey, int first, int last) {
|
||||
int index;
|
||||
int result;
|
||||
|
||||
if (first == last || first == last - 1) {
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + first);
|
||||
if (result < 0) {
|
||||
return first;
|
||||
}
|
||||
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + last);
|
||||
if (result >= 0) {
|
||||
last++;
|
||||
}
|
||||
return last;
|
||||
}
|
||||
|
||||
index = first + (last - first) / 2;
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + index);
|
||||
if (result < 0) {
|
||||
return CDBRecordKeyArrayDicInsertR(recordArray, recordKey, first, index);
|
||||
}
|
||||
if (result > 0) {
|
||||
return CDBRecordKeyArrayDicInsertR(recordArray, recordKey, index, last);
|
||||
}
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
CDBRecordKey* CDBRecordKeyArrayDicInsert(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey) {
|
||||
int size = recordArray->size;
|
||||
int index;
|
||||
int moveCount;
|
||||
CDBRecordKey* record;
|
||||
|
||||
if (size == 0) {
|
||||
if (size < recordArray->capacity) {
|
||||
record = recordArray->records + size;
|
||||
CDBRecordKeyCopy(record, recordKey);
|
||||
recordArray->size++;
|
||||
}
|
||||
return recordKey;
|
||||
}
|
||||
|
||||
if (recordArray->capacity <= size) {
|
||||
if (recordArray->reverse == 1) {
|
||||
if (size != 0) {
|
||||
record = recordArray->records + (size - 1);
|
||||
} else {
|
||||
record = recordArray->records;
|
||||
}
|
||||
if (CDBRecordKeyCompare(record, recordKey) < 0) {
|
||||
return record;
|
||||
}
|
||||
|
||||
recordArray->size--;
|
||||
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, recordArray->size - 1);
|
||||
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
|
||||
if (recordArray->capacity <= recordArray->size) {
|
||||
moveCount -= sizeof(CDBRecordKey);
|
||||
}
|
||||
if (moveCount > 0) {
|
||||
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
|
||||
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
|
||||
moveCount);
|
||||
}
|
||||
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
|
||||
if (recordArray->size < recordArray->capacity) {
|
||||
recordArray->size++;
|
||||
}
|
||||
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
|
||||
}
|
||||
|
||||
record = recordArray->records;
|
||||
if (CDBRecordKeyCompare(recordKey, record) < 0) {
|
||||
return record;
|
||||
}
|
||||
|
||||
recordArray->size--;
|
||||
if (recordArray->size >= 0 && recordArray->capacity - 1 >= 0) {
|
||||
memmove(recordArray->records, recordArray->records + 1, recordArray->size * sizeof(CDBRecordKey));
|
||||
}
|
||||
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, recordArray->size - 1);
|
||||
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
|
||||
if (recordArray->capacity <= recordArray->size) {
|
||||
moveCount -= sizeof(CDBRecordKey);
|
||||
}
|
||||
if (moveCount > 0) {
|
||||
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
|
||||
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
|
||||
moveCount);
|
||||
}
|
||||
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
|
||||
if (recordArray->size < recordArray->capacity) {
|
||||
recordArray->size++;
|
||||
}
|
||||
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
|
||||
}
|
||||
|
||||
index = CDBRecordKeyArrayDicInsertR(recordArray, recordKey, 0, size - 1);
|
||||
moveCount = (recordArray->size - index) * sizeof(CDBRecordKey);
|
||||
if (recordArray->capacity <= recordArray->size) {
|
||||
moveCount -= sizeof(CDBRecordKey);
|
||||
}
|
||||
if (moveCount > 0) {
|
||||
memmove((CDBRecordKey*)((char*)recordArray->records + (index + 1) * sizeof(CDBRecordKey)),
|
||||
(CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)),
|
||||
moveCount);
|
||||
}
|
||||
CDBRecordKeyCopy((CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey)), recordKey);
|
||||
if (recordArray->size < recordArray->capacity) {
|
||||
recordArray->size++;
|
||||
}
|
||||
return (CDBRecordKey*)((char*)recordArray->records + index * sizeof(CDBRecordKey));
|
||||
}
|
||||
|
||||
int CDBRecordKeyArrayDicFindR(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey, int first, int last) {
|
||||
int index;
|
||||
int result;
|
||||
|
||||
if (first == last || first == last - 1) {
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + first);
|
||||
if (result == 0) {
|
||||
return first;
|
||||
}
|
||||
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + last);
|
||||
if (result != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return last;
|
||||
}
|
||||
|
||||
index = first + (last - first) / 2;
|
||||
result = CDBRecordKeyCompare(recordKey, recordArray->records + index);
|
||||
if (result < 0) {
|
||||
return CDBRecordKeyArrayDicFindR(recordArray, recordKey, first, index);
|
||||
}
|
||||
if (result > 0) {
|
||||
return CDBRecordKeyArrayDicFindR(recordArray, recordKey, index, last);
|
||||
}
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
#pragma dont_inline reset
|
||||
|
||||
CDBRecordKey* CDBRecordKeyArrayDicFind(CDBRecordKeyArray* recordArray, CDBRecordKey* recordKey) {
|
||||
int size = recordArray->size;
|
||||
int index;
|
||||
|
||||
@@ -9,19 +9,32 @@
|
||||
#include <revolution/dvd.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
typedef struct {
|
||||
u32 used;
|
||||
u8 padding[0xC00C];
|
||||
u32 flags;
|
||||
u32 unk;
|
||||
} CDBDatabaseInstanceWork;
|
||||
|
||||
static OSMutex s_mutex;
|
||||
static BOOL s_mutexInitialized = FALSE;
|
||||
|
||||
static BOOL s_fatalVFFlag = FALSE;
|
||||
|
||||
// This was likely a local originally, but oh well!
|
||||
s32 CDBPrintDebugLevel = CDB_VERBOSE_LEVEL_NONE;
|
||||
|
||||
static u8 s_cdbWiiId[OSRoundUp32B(CDB_WIIID_DAT_SIZE)] ALIGN32;
|
||||
static CDBDatabaseInstanceWork* s_databasePool;
|
||||
static u8* s_recordPool;
|
||||
u8* CDBDatabaseWorkBuf;
|
||||
static VFErr s_lastVFError;
|
||||
static s32 s_lastNANDError;
|
||||
|
||||
static u8 s_cdbWiiId[OSRoundUp32B(CDB_WIIID_DAT_SIZE)] ALIGN32;
|
||||
static u8* s_recordPool;
|
||||
extern void CDBDatabaseInstanceInit(void* instance, int flag, CDBDatabase* database);
|
||||
extern BOOL CDBDatabaseInstanceIsUsed(void* instance);
|
||||
extern void CDBRecordInstanceInit(void* instance, CDBRecord* record, int flag);
|
||||
extern BOOL CDBRecordInstanceIsUsed(void* instance);
|
||||
extern BOOL CDBRecordKeyCompare(CDBRecordKey* recordKey1, CDBRecordKey* recordKey2);
|
||||
|
||||
void MutexInitialized() {
|
||||
s_mutexInitialized = TRUE;
|
||||
@@ -35,6 +48,216 @@ void CDBUnlock() {
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
void CDBDatabaseInstancePoolInit(void* work) {
|
||||
u32* workPointer = (u32*)work;
|
||||
|
||||
s_databasePool = (CDBDatabaseInstanceWork*)workPointer;
|
||||
s_databasePool[0].used = 0;
|
||||
s_databasePool[1].used = 0;
|
||||
if (((u32)(workPointer + 0x7880) & 0x3f) != 0) {
|
||||
CDBReportWarn("割り当てられた領域が64バイトアライメントされていません(%d)\n", (u64)((u32)(workPointer + 0x7880) & 0x3f));
|
||||
}
|
||||
CDBCryptBufSysInit((CDBCryptBuf*)(workPointer + 0x7880));
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex(&s_mutex);
|
||||
}
|
||||
CDBDatabaseWorkBuf = (u8*)workPointer + 0x19660;
|
||||
}
|
||||
|
||||
void CDBRecordPoolInit(void* work) {
|
||||
int i;
|
||||
|
||||
s_recordPool = (u8*)work + 0x18030;
|
||||
for (i = 0; i < 5; i++) {
|
||||
*(u32*)(s_recordPool + i * 0x470 + 0x18) = 0;
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex((OSMutex*)(s_recordPool + i * 0x470));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flag) {
|
||||
CDBDatabaseInstanceWork* databaseInstance;
|
||||
CDBDatabaseInstanceWork* requestedInstance;
|
||||
u32 writeFlag;
|
||||
int i;
|
||||
|
||||
if (s_recordPool == NULL) {
|
||||
OSPanic(__FILE__, 0x185, "(CDB) error : CDBInit() is not called\n");
|
||||
}
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
requestedInstance = database->instance;
|
||||
if (requestedInstance != NULL) {
|
||||
for (i = 0, databaseInstance = s_databasePool; i < 2; i++, databaseInstance++) {
|
||||
if (requestedInstance == databaseInstance) {
|
||||
if (requestedInstance->flags == 0) {
|
||||
CDBReportFatal("CDBDatabaseAllocate system error\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_FATAL_ERROR;
|
||||
}
|
||||
CDBReportError("database descripter has opened already\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1c;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("database descripter is not initialized\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x18;
|
||||
}
|
||||
|
||||
writeFlag = flag & CDB_RECORD_ALLOC_WRITE;
|
||||
for (i = 0, databaseInstance = s_databasePool; i < 2; i++, databaseInstance++) {
|
||||
if (databaseInstance->used != 0) {
|
||||
if ((databaseInstance->flags & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the database as WRITE mode; another database discripter opened the database as WRITE mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
if (writeFlag != 0) {
|
||||
CDBReportError("can't open the database as WRITE mode; other database discripter(s) opened the database as READ mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (s_databasePool[i].used == 0) {
|
||||
CDBDatabaseInstanceInit(s_databasePool + i, flag, database);
|
||||
database->instance = s_databasePool + i;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("can't open databases any more\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_CRYPT_ALLOC_FAIL;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseFree(CDBDatabase* database) {
|
||||
int offset;
|
||||
int i;
|
||||
u32* databaseInstance = database->instance;
|
||||
BOOL hasOpenRecord = FALSE;
|
||||
|
||||
if (databaseInstance == NULL) {
|
||||
return 0x1b;
|
||||
}
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset) &&
|
||||
*(CDBDatabase**)(s_recordPool + offset + 0x468) == database) {
|
||||
CDBReportError("can't close database; record %s is opened\n", s_recordPool + offset + 0x438);
|
||||
hasOpenRecord = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasOpenRecord) {
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x21;
|
||||
}
|
||||
|
||||
databaseInstance[0] = 0;
|
||||
database->instance = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseCheckOpenDatabase() {
|
||||
int i;
|
||||
BOOL hasOpenDatabase = FALSE;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (CDBDatabaseInstanceIsUsed(s_databasePool + i)) {
|
||||
CDBReportError("database is opened\n");
|
||||
hasOpenDatabase = TRUE;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex(&s_mutex);
|
||||
if (hasOpenDatabase) {
|
||||
return 0x22;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseCheckOpenRecord() {
|
||||
int offset;
|
||||
int i;
|
||||
BOOL hasOpenRecord = FALSE;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset)) {
|
||||
CDBReportError("record %s is opened\n", s_recordPool + offset + 0x438);
|
||||
hasOpenRecord = TRUE;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex(&s_mutex);
|
||||
if (hasOpenRecord) {
|
||||
return 0x21;
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
char s_recordOnSDMessage[] = "record %s on SD is opened\n";
|
||||
|
||||
CDBErr CDBRecordAllocate(CDBRecord* record, int flag) {
|
||||
int writeFlag;
|
||||
int offset;
|
||||
int i;
|
||||
CDBDatabaseInstanceWork* databaseInstance = ((CDBDatabase*)*(CDBDatabase**)record)->instance;
|
||||
|
||||
OSLockMutex(&s_mutex);
|
||||
if (databaseInstance == NULL) {
|
||||
CDBReportError("can't open the record; database is closed\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1b;
|
||||
}
|
||||
|
||||
if ((databaseInstance->flags & CDB_RECORD_ALLOC_WRITE) == 0 && (flag & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; database is readonly mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x1a;
|
||||
}
|
||||
|
||||
writeFlag = flag & CDB_RECORD_ALLOC_WRITE;
|
||||
for (i = 0, offset = 0; i < 5; i++, offset += 0x470) {
|
||||
if (CDBRecordInstanceIsUsed(s_recordPool + offset) &&
|
||||
CDBRecordKeyCompare(&record->key, (CDBRecordKey*)(s_recordPool + offset + 0x438)) == FALSE &&
|
||||
*(s32*)((u8*)record + 0x30) == *(s32*)(s_recordPool + offset + 0x460)) {
|
||||
if ((*(u32*)(s_recordPool + offset + 0x1c) & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; another record discripter opened the record as WRITE mode\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
if (writeFlag != 0) {
|
||||
CDBReportError("can't open the record as WRITE mode; other record discripter(s) opened the record as READ mode \n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return 0x19;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 5; i++) {
|
||||
if (!CDBRecordInstanceIsUsed(s_recordPool + i * 0x470)) {
|
||||
offset = i * 0x470;
|
||||
CDBRecordInstanceInit(s_recordPool + offset, record, flag);
|
||||
record->file = s_recordPool + offset;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
|
||||
CDBReportError("can't open record any more\n");
|
||||
OSUnlockMutex(&s_mutex);
|
||||
return CDB_ERROR_CRYPT_ALLOC_FAIL;
|
||||
}
|
||||
|
||||
CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
CDBRecordFile* recordFile = record->file;
|
||||
|
||||
@@ -73,18 +296,6 @@ void CDBSetFatalVFErrorFlag() {
|
||||
s_fatalVFFlag = TRUE;
|
||||
}
|
||||
|
||||
void CDBRecordPoolInit(void* work) {
|
||||
int i;
|
||||
|
||||
s_recordPool = (u8*)work + 0x18030;
|
||||
for (i = 0; i < 5; i++) {
|
||||
*(u32*)(s_recordPool + i * 0x470 + 0x18) = 0;
|
||||
if (!s_mutexInitialized) {
|
||||
OSInitMutex((OSMutex*)(s_recordPool + i * 0x470));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CDBTryToCreate_wiiiddat(u8* data) {
|
||||
NANDFileInfo fileInfo;
|
||||
u32 nandCheck;
|
||||
@@ -92,7 +303,7 @@ void CDBTryToCreate_wiiiddat(u8* data) {
|
||||
// Requires 1 NAND block and 1 NAND node
|
||||
s32 ret = NANDCheck(1, 1, &nandCheck);
|
||||
if (ret != NAND_RESULT_OK) {
|
||||
CDBReportError("failed NANDCheck\n");
|
||||
CDBReportFatal("failed NANDCheck\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -327,6 +538,29 @@ void CDBCheckMakerCodeStr(char* makerCodeStr) {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL CDBRecordBelongedDBOpenedAsRW(CDBRecord* record) {
|
||||
int i;
|
||||
CDBDatabaseInstanceWork* databaseInstance = NULL;
|
||||
CDBDatabaseInstanceWork* databasePool;
|
||||
|
||||
if (record == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
databasePool = s_databasePool;
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (databasePool[i].used != 0 && (databasePool[i].flags & CDB_RECORD_ALLOC_WRITE) != 0) {
|
||||
databaseInstance = databasePool + i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (databaseInstance == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static int s_vfSync = 1;
|
||||
|
||||
CDBErr CDBSetVFSyncMode(int sync) {
|
||||
|
||||
585
libs/RevoEX/src/ncd/ncdsystem.c
Normal file
585
libs/RevoEX/src/ncd/ncdsystem.c
Normal file
@@ -0,0 +1,585 @@
|
||||
#include <private/ipc.h>
|
||||
#include <private/ios.h>
|
||||
#include <private/nwc24/NWC24Schedule.h>
|
||||
#include <revolution/ncd.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#define NCD_IPC_HEAP_SIZE 0x1B60
|
||||
#define NCD_MAX_PROFILE 3
|
||||
|
||||
static NCDConfig* ncdCommonBuffer;
|
||||
static u32 ncdInitialized;
|
||||
|
||||
struct NCDMutex {
|
||||
OSMutex mutex;
|
||||
u8 padding[8];
|
||||
} ncdMutex;
|
||||
s32 ncdCommonResult[8] ATTRIBUTE_ALIGN(32);
|
||||
IOSIoVector ncdCommonVector[4] ATTRIBUTE_ALIGN(32);
|
||||
|
||||
const char* __NCDVersion = "<< RVL_SDK - NCD \trelease build: Dec 12 2008 03:06:03 (0x4199_60831) >>";
|
||||
const char* __NCDUnofficialVersion = "<< RVL_SDK - NCD \trelease build: Dec 12 2008 03:06:03 (0x4199_60831) UNOFFICIAL >>";
|
||||
|
||||
static void LockRight(void);
|
||||
static NCDErr ExecConfigCommand(const char* name, NCDConfig* config, u32 command);
|
||||
NCDErr NCDiGetWirelessMacAddress(u8* macAddr);
|
||||
|
||||
NCDErr NCDReadConfig(NCDConfig* config) {
|
||||
if (config == NULL) {
|
||||
return -3;
|
||||
}
|
||||
|
||||
return ExecConfigCommand("NCDReadConfig", config, 5);
|
||||
}
|
||||
|
||||
NCDErr NCDWriteConfig(const NCDConfig* config) {
|
||||
BOOL enabled;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
if (!(ncdInitialized & 2)) {
|
||||
OSRegisterVersion(__NCDUnofficialVersion);
|
||||
ncdInitialized |= 2;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
|
||||
if (config == NULL) {
|
||||
return -3;
|
||||
}
|
||||
|
||||
return ExecConfigCommand("NCDWriteConfig", (NCDConfig*)config, 6);
|
||||
}
|
||||
|
||||
NCDErr NCDSetIfConfig(NCDIfConfig* ifConfig) {
|
||||
union {
|
||||
BOOL enabled;
|
||||
NCDConfig* config;
|
||||
} state;
|
||||
NCDErr lockErr;
|
||||
NCDProfile* profile;
|
||||
NCDErr result;
|
||||
s32 i;
|
||||
u32 count;
|
||||
|
||||
state.enabled = OSDisableInterrupts();
|
||||
if (!(ncdInitialized & 2)) {
|
||||
OSRegisterVersion(__NCDUnofficialVersion);
|
||||
ncdInitialized |= 2;
|
||||
}
|
||||
OSRestoreInterrupts(state.enabled);
|
||||
|
||||
|
||||
if (ifConfig == NULL) {
|
||||
return -3;
|
||||
}
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
lockErr = NWC24iLockSocket();
|
||||
if (lockErr == 0) {
|
||||
result = ExecConfigCommand("NCDSetIfConfig", NULL, 3);
|
||||
if (result == 0) {
|
||||
state.config = ncdCommonBuffer;
|
||||
|
||||
if (ifConfig->selectedMedia != 1 && ifConfig->selectedMedia != 2) {
|
||||
state.config->selectedMedia = 0;
|
||||
} else {
|
||||
state.config->selectedMedia = ifConfig->selectedMedia;
|
||||
profile = state.config->profiles;
|
||||
i = 0;
|
||||
state.config->linkTimeout = ifConfig->linkTimeout;
|
||||
count = 0;
|
||||
for (; i < NCD_MAX_PROFILE; i++, profile++) {
|
||||
if (state.config->profiles[i].flags & 0x80) {
|
||||
switch (ifConfig->selectedMedia) {
|
||||
case 1:
|
||||
state.config->profiles[i].flags &= ~1;
|
||||
memcpy(&profile->netif, &ifConfig->netif, 0x15c);
|
||||
break;
|
||||
case 2:
|
||||
state.config->profiles[i].flags |= 1;
|
||||
memcpy(&profile->netif, &ifConfig->netif, 4);
|
||||
break;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
if (count == 0) {
|
||||
state.config->profiles[0].flags |= 0x80;
|
||||
switch (ifConfig->selectedMedia) {
|
||||
case 1:
|
||||
state.config->profiles[0].flags &= ~1;
|
||||
memcpy(&state.config->profiles[0].netif.wireless, &ifConfig->netif, 0x15c);
|
||||
break;
|
||||
case 2:
|
||||
state.config->profiles[0].flags |= 1;
|
||||
memcpy(&state.config->profiles[0].netif.wired, &ifConfig->netif, 4);
|
||||
break;
|
||||
}
|
||||
memset(&state.config->profiles[0].adjust, 0, 0xc);
|
||||
state.config->profiles[0].flags |= 6;
|
||||
memset(&state.config->profiles[0].ip, 0, 0x14);
|
||||
state.config->profiles[0].flags &= ~0x10;
|
||||
memset(&state.config->profiles[0].proxy, 0, 0x79c);
|
||||
}
|
||||
}
|
||||
result = ExecConfigCommand("NCDSetIfConfig", NULL, 4);
|
||||
}
|
||||
NWC24iUnlockSocket();
|
||||
} else if (lockErr == -0x16) {
|
||||
result = -4;
|
||||
} else if (lockErr == -0x1d) {
|
||||
result = -8;
|
||||
} else {
|
||||
result = -2;
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return result;
|
||||
}
|
||||
|
||||
NCDErr NCDSetIpConfig(NCDIpConfig* ipConfig) {
|
||||
NCDErr err;
|
||||
BOOL enabled;
|
||||
s32 i;
|
||||
u32 count;
|
||||
NCDConfig* config;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
if (!(ncdInitialized & 2)) {
|
||||
OSRegisterVersion(__NCDUnofficialVersion);
|
||||
ncdInitialized |= 2;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
|
||||
if (ipConfig == NULL) {
|
||||
return -3;
|
||||
}
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
err = NWC24iLockSocket();
|
||||
if (err == 0) {
|
||||
err = ExecConfigCommand("NCDSetIpConfig", NULL, 3);
|
||||
if (err == 0) {
|
||||
i = 0;
|
||||
count = 0;
|
||||
config = ncdCommonBuffer;
|
||||
for (; i < NCD_MAX_PROFILE; i++) {
|
||||
if (config->profiles[i].flags & 0x80) {
|
||||
NCDProfile* profile = &config->profiles[i];
|
||||
|
||||
memcpy(&profile->adjust, &ipConfig->adjust, 0xc);
|
||||
if (ipConfig->useDhcp == 1) {
|
||||
config->profiles[i].flags |= 6;
|
||||
memcpy(&profile->ip, &ipConfig->ip, 0x14);
|
||||
} else {
|
||||
config->profiles[i].flags &= ~6;
|
||||
memcpy(&profile->ip, &ipConfig->ip, 0x14);
|
||||
}
|
||||
if (ipConfig->useProxy == 1) {
|
||||
config->profiles[i].flags |= 0x10;
|
||||
memcpy(&profile->proxy, &ipConfig->proxy, 0x79c);
|
||||
} else {
|
||||
config->profiles[i].flags &= ~0x10;
|
||||
memset(&profile->proxy, 0, 0x79c);
|
||||
}
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
if (count == 0) {
|
||||
NCDProfile* profile = config->profiles;
|
||||
profile->flags |= 0x80;
|
||||
memcpy(&profile->adjust, &ipConfig->adjust, 0xc);
|
||||
if (ipConfig->useDhcp == 1) {
|
||||
profile->flags |= 6;
|
||||
memcpy(&profile->ip, &ipConfig->ip, 0x14);
|
||||
} else {
|
||||
profile->flags &= ~6;
|
||||
memcpy(&profile->ip, &ipConfig->ip, 0x14);
|
||||
}
|
||||
if (ipConfig->useProxy == 1) {
|
||||
profile->flags |= 0x10;
|
||||
memcpy(&profile->proxy, &ipConfig->proxy, 0x79c);
|
||||
} else {
|
||||
profile->flags &= ~0x10;
|
||||
memset(&profile->proxy, 0, 0x79c);
|
||||
}
|
||||
profile->flags = profile->flags & ~1;
|
||||
memset(&profile->netif, 0, 0x15c);
|
||||
}
|
||||
err = ExecConfigCommand("NCDSetIpConfig", NULL, 4);
|
||||
}
|
||||
NWC24iUnlockSocket();
|
||||
} else if (err == -0x16) {
|
||||
err = -4;
|
||||
} else if (err == -0x1d) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
NCDErr NCDGetCurrentIpConfig(NCDIpConfig* ipConfig) {
|
||||
NCDErr err = 0;
|
||||
NCDConfig* config;
|
||||
s32 idx;
|
||||
|
||||
if (ipConfig == NULL) {
|
||||
return -3;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
err = ExecConfigCommand("NCDGetCurrentIpConfig", 0, 3);
|
||||
if (err == 0) {
|
||||
config = ncdCommonBuffer;
|
||||
idx = ncdCommonResult[1];
|
||||
|
||||
if (idx < 0 || idx >= NCD_MAX_PROFILE) {
|
||||
err = -7;
|
||||
} else {
|
||||
memcpy(&ipConfig->adjust, &config->profiles[idx].adjust, 0xc);
|
||||
|
||||
if (config->profiles[idx].flags & 0x6) {
|
||||
ipConfig->useDhcp = TRUE;
|
||||
memcpy(&ipConfig->ip, &config->profiles[idx].ip, 0x14);
|
||||
} else {
|
||||
ipConfig->useDhcp = FALSE;
|
||||
memcpy(&ipConfig->ip, &config->profiles[idx].ip, 0x14);
|
||||
}
|
||||
|
||||
if (config->profiles[idx].flags & 0x10) {
|
||||
ipConfig->useProxy = TRUE;
|
||||
memcpy(&ipConfig->proxy, &config->profiles[idx].proxy, 0x79c);
|
||||
} else {
|
||||
ipConfig->useProxy = FALSE;
|
||||
memset(&ipConfig->proxy, 0, 0x79c);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
NCDErr NCDGetLinkStatus(void) {
|
||||
NCDErr err;
|
||||
s32 fd;
|
||||
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
fd = IOS_Open("/dev/net/ncd/manage", 0);
|
||||
if (fd < 0) {
|
||||
if (fd == -6) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
} else {
|
||||
ncdCommonVector[0].base = (u8*)ncdCommonResult;
|
||||
ncdCommonVector[0].length = sizeof(ncdCommonResult);
|
||||
if (IOS_Ioctlv(fd, 7, 0, 1, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
if (err == 0) {
|
||||
err = ncdCommonResult[1];
|
||||
err = err >= 0 ? err : -1;
|
||||
}
|
||||
}
|
||||
if (IOS_Close(fd) < 0) {
|
||||
err = -1;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
BOOL NCDIsInterfaceDecided(void) {
|
||||
NCDErr err = NCDGetLinkStatus();
|
||||
|
||||
switch (err) {
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
return TRUE;
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
NCDErr NCDGetWirelessMacAddress(u8* macAddr) {
|
||||
return NCDiGetWirelessMacAddress(macAddr);
|
||||
}
|
||||
|
||||
NCDErr NCDiGetWirelessMacAddress(u8* macAddr) {
|
||||
NCDErr err = 0;
|
||||
s32 fd;
|
||||
|
||||
if (macAddr == NULL) {
|
||||
return -3;
|
||||
}
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
fd = IOS_Open("/dev/net/ncd/manage", 0);
|
||||
if (fd < 0) {
|
||||
if (fd == -6) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
} else {
|
||||
ncdCommonVector[0].base = (u8*)ncdCommonResult;
|
||||
ncdCommonVector[0].length = sizeof(ncdCommonResult);
|
||||
ncdCommonVector[1].base = (u8*)ncdCommonBuffer;
|
||||
ncdCommonVector[1].length = NCD_MAC_ADDRESS_LENGTH;
|
||||
if (IOS_Ioctlv(fd, 8, 0, 2, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
if (err == 0) {
|
||||
memcpy(macAddr, ncdCommonBuffer, NCD_MAC_ADDRESS_LENGTH);
|
||||
}
|
||||
}
|
||||
if (IOS_Close(fd) < 0) {
|
||||
err = -1;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
NCDErr NCDLockWirelessDriver(void) {
|
||||
NCDErr err;
|
||||
s32 fd;
|
||||
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
fd = IOS_Open("/dev/net/ncd/manage", 0);
|
||||
if (fd < 0) {
|
||||
if (fd == -6) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
} else {
|
||||
ncdCommonVector[0].base = (u8*)ncdCommonResult;
|
||||
ncdCommonVector[0].length = sizeof(ncdCommonResult);
|
||||
if (IOS_Ioctlv(fd, 1, 0, 1, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
if (err == 0) {
|
||||
err = ncdCommonResult[1];
|
||||
err = err > 0 ? err : -1;
|
||||
}
|
||||
}
|
||||
if (IOS_Close(fd) < 0) {
|
||||
err = -1;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
NCDErr NCDUnlockWirelessDriver(s32 id) {
|
||||
NCDErr err;
|
||||
s32 fd;
|
||||
|
||||
if (id <= 0) {
|
||||
return -3;
|
||||
}
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
fd = IOS_Open("/dev/net/ncd/manage", 0);
|
||||
if (fd < 0) {
|
||||
if (fd == -6) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
} else {
|
||||
ncdCommonVector[0].base = (u8*)ncdCommonBuffer;
|
||||
ncdCommonVector[0].length = 4;
|
||||
ncdCommonVector[1].base = (u8*)ncdCommonResult;
|
||||
ncdCommonVector[1].length = sizeof(ncdCommonResult);
|
||||
ncdCommonBuffer->version = id;
|
||||
if (IOS_Ioctlv(fd, 2, 1, 1, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
}
|
||||
if (IOS_Close(fd) < 0) {
|
||||
err = -1;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
s32 NCDRestoreConfig(void) {
|
||||
NCDErr err;
|
||||
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
err = NWC24iLockSocket();
|
||||
if (err == 0) {
|
||||
err = ExecConfigCommand("NCDRestoreConfig", NULL, 5);
|
||||
if (err == 0) {
|
||||
err = ExecConfigCommand("NCDRestoreConfig", NULL, 4);
|
||||
}
|
||||
NWC24iUnlockSocket();
|
||||
} else if (err == -0x16) {
|
||||
err = -4;
|
||||
} else if (err == -0x1d) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
NCDErr NCDiGetEnabledConfigList(u32* list0, u32* list1, u32* list2) {
|
||||
NCDErr err;
|
||||
u32 mask0 = 0;
|
||||
u32 mask1 = 0;
|
||||
u32 mask2 = 0;
|
||||
u8 flags;
|
||||
u32 i;
|
||||
|
||||
LockRight();
|
||||
err = ExecConfigCommand("NCDiGetEnabledConfigList", NULL, 3);
|
||||
if (err == 0) {
|
||||
for (i = 0; i < NCD_MAX_PROFILE; i++) {
|
||||
NCDProfile* profile = &ncdCommonBuffer->profiles[i];
|
||||
|
||||
flags = profile->flags;
|
||||
|
||||
if (flags & 0x80) {
|
||||
if (flags & 1) {
|
||||
mask0 |= 1 << i;
|
||||
} else {
|
||||
if (profile->netif.wireless.configMethod != 1) {
|
||||
mask1 |= 1 << i;
|
||||
}
|
||||
if (ncdCommonBuffer->profiles[i].netif.wireless.configMethod == 1) {
|
||||
mask2 |= 1 << i;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
|
||||
if (list0 != NULL) {
|
||||
*list0 = mask0;
|
||||
}
|
||||
if (list1 != NULL) {
|
||||
*list1 = mask1;
|
||||
}
|
||||
if (list2 != NULL) {
|
||||
*list2 = mask2;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static NCDErr ExecConfigCommand(const char* name, NCDConfig* config, u32 command) {
|
||||
NCDErr err = 0;
|
||||
s32 fd;
|
||||
|
||||
if (!OSGetCurrentThread()) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
LockRight();
|
||||
fd = IOS_Open("/dev/net/ncd/manage", 0);
|
||||
if (fd < 0) {
|
||||
if (fd == -6) {
|
||||
err = -8;
|
||||
} else {
|
||||
err = -2;
|
||||
}
|
||||
} else {
|
||||
ncdCommonVector[0].base = (u8*)ncdCommonBuffer;
|
||||
ncdCommonVector[0].length = sizeof(NCDConfig);
|
||||
ncdCommonVector[1].base = (u8*)ncdCommonResult;
|
||||
ncdCommonVector[1].length = sizeof(ncdCommonResult);
|
||||
|
||||
switch (command) {
|
||||
case 3:
|
||||
case 5:
|
||||
if (IOS_Ioctlv(fd, command, 0, 2, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
if (err == 0 && config != NULL) {
|
||||
memcpy(config, ncdCommonBuffer, sizeof(NCDConfig));
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
case 6:
|
||||
if (config != NULL) {
|
||||
memcpy(ncdCommonBuffer, config, sizeof(NCDConfig));
|
||||
}
|
||||
if (IOS_Ioctlv(fd, command, 1, 1, ncdCommonVector) < 0) {
|
||||
err = -2;
|
||||
} else {
|
||||
err = ncdCommonResult[0];
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (IOS_Close(fd) < 0) {
|
||||
err = -1;
|
||||
}
|
||||
}
|
||||
OSUnlockMutex((OSMutex*)&ncdMutex);
|
||||
return err;
|
||||
}
|
||||
|
||||
static void LockRight(void) {
|
||||
BOOL enabled;
|
||||
void* lo;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
if (!(ncdInitialized & 1)) {
|
||||
OSRegisterVersion(__NCDVersion);
|
||||
OSInitMutex((OSMutex*)&ncdMutex);
|
||||
lo = (void*)OSRoundUp32B(IPCGetBufferLo());
|
||||
if ((u32)IPCGetBufferHi() - (u32)lo < NCD_IPC_HEAP_SIZE) {
|
||||
OSPanic("ncdsystem.c", 0x5B1, "Could not reserve heap for NCD library from IPC arena");
|
||||
}
|
||||
IPCSetBufferLo((u8*)lo + NCD_IPC_HEAP_SIZE);
|
||||
ncdCommonBuffer = (NCDConfig*)lo;
|
||||
memset(ncdCommonBuffer, 0, NCD_IPC_HEAP_SIZE);
|
||||
memset(ncdCommonResult, 0, sizeof(ncdCommonResult));
|
||||
memset(ncdCommonVector, 0, sizeof(ncdCommonVector));
|
||||
ncdInitialized |= 1;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
OSLockMutex((OSMutex*)&ncdMutex);
|
||||
}
|
||||
@@ -18,10 +18,16 @@ enum {
|
||||
#define FRIEND_LIST_MAGIC 'WcFl'
|
||||
#define FRIEND_LIST_VERSION 2
|
||||
|
||||
static const char* FLFilePath = "/shared2/wc24/nwc24fl.bin";
|
||||
const char lbl_8166E160[26] __attribute__((section(".data"), aligned(8))) = "/shared2/wc24/nwc24fl.bin";
|
||||
void* const lbl_8166E160_pad __attribute__((section(".data"))) = (void*)0;
|
||||
static const char* FLFilePath = lbl_8166E160;
|
||||
const u32 FLFilePath_pad __attribute__((section(".sdata"), aligned(1))) = 0;
|
||||
|
||||
const char g_SpecialsChars[16] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };
|
||||
|
||||
static NWC24Err GetCachedFLHeader(NWC24FLHeader** header);
|
||||
static ChkHostNameError CheckHostName(const char* hostName, u32 hostNameLength);
|
||||
static inline NWC24Err CheckFriendInfo(const NWC24FriendInfo* friendInfo);
|
||||
|
||||
static u32 GetUnkFlag(u32 index) {
|
||||
NWC24Err result;
|
||||
@@ -127,7 +133,7 @@ NWC24Err NWC24WriteFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
|
||||
return NWC24_ERR_ALIGNMENT;
|
||||
}
|
||||
|
||||
result = NWC24CheckFriendInfo(friendInfo);
|
||||
result = CheckFriendInfo(friendInfo);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
@@ -219,63 +225,6 @@ NWC24Err NWC24WriteFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24DeleteFriendInfo(u32 index) {
|
||||
NWC24Err result;
|
||||
NWC24Err resultWrite;
|
||||
|
||||
NWC24FLHeader* header;
|
||||
NWC24FriendInfo* tmpFriendInfo;
|
||||
|
||||
NWC24File file;
|
||||
u32 fileOffset;
|
||||
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool()) {
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
}
|
||||
|
||||
result = GetCachedFLHeader(&header);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
|
||||
if (index >= header->infoCount) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
|
||||
if (header->friendIds[index] == 0) {
|
||||
return NWC24_ERR_NULL;
|
||||
}
|
||||
|
||||
tmpFriendInfo = (NWC24FriendInfo*)nwc24Work->mainWork;
|
||||
Mail_memset(tmpFriendInfo, 0, sizeof(NWC24FriendInfo));
|
||||
|
||||
result = NWC24FOpen(&file, FLFilePath, NWC24_OPEN_RW);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
|
||||
fileOffset = (index * sizeof(NWC24FriendInfo)) + sizeof(NWC24FLHeader);
|
||||
NWC24FSeek(&file, fileOffset, NWC24_SEEK_BEG);
|
||||
|
||||
resultWrite = NWC24FWrite(tmpFriendInfo, sizeof(NWC24FriendInfo), &file);
|
||||
if (resultWrite == NWC24_OK) {
|
||||
header->friendIds[index] = 0;
|
||||
header->registeredCount--;
|
||||
result = SetUnkFlag(index, 0);
|
||||
if (result == NWC24_OK) {
|
||||
NWC24FSeek(&file, 0, NWC24_SEEK_BEG);
|
||||
resultWrite = NWC24FWrite(header, sizeof(NWC24FLHeader), &file);
|
||||
}
|
||||
}
|
||||
|
||||
result = NWC24FClose(&file);
|
||||
if (resultWrite != NWC24_OK) {
|
||||
result = resultWrite;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24UpdateFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
|
||||
NWC24Err result;
|
||||
NWC24Err resultFile;
|
||||
@@ -296,7 +245,7 @@ NWC24Err NWC24UpdateFriendInfo(const NWC24FriendInfo* friendInfo, u32 index) {
|
||||
return NWC24_ERR_ALIGNMENT;
|
||||
}
|
||||
|
||||
result = NWC24CheckFriendInfo(friendInfo);
|
||||
result = CheckFriendInfo(friendInfo);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
@@ -358,6 +307,63 @@ out:
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24DeleteFriendInfo(u32 index) {
|
||||
NWC24Err result;
|
||||
NWC24Err resultWrite;
|
||||
|
||||
NWC24FLHeader* header;
|
||||
NWC24FriendInfo* tmpFriendInfo;
|
||||
|
||||
NWC24File file;
|
||||
u32 fileOffset;
|
||||
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool()) {
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
}
|
||||
|
||||
result = GetCachedFLHeader(&header);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
|
||||
if (index >= header->infoCount) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
}
|
||||
|
||||
if (header->friendIds[index] == 0) {
|
||||
return NWC24_ERR_NULL;
|
||||
}
|
||||
|
||||
tmpFriendInfo = (NWC24FriendInfo*)nwc24Work->mainWork;
|
||||
Mail_memset(tmpFriendInfo, 0, sizeof(NWC24FriendInfo));
|
||||
|
||||
result = NWC24FOpen(&file, FLFilePath, NWC24_OPEN_RW);
|
||||
if (result != NWC24_OK) {
|
||||
return result;
|
||||
}
|
||||
|
||||
fileOffset = (index * sizeof(NWC24FriendInfo)) + sizeof(NWC24FLHeader);
|
||||
NWC24FSeek(&file, fileOffset, NWC24_SEEK_BEG);
|
||||
|
||||
resultWrite = NWC24FWrite(tmpFriendInfo, sizeof(NWC24FriendInfo), &file);
|
||||
if (resultWrite == NWC24_OK) {
|
||||
header->friendIds[index] = 0;
|
||||
header->registeredCount--;
|
||||
result = SetUnkFlag(index, 0);
|
||||
if (result == NWC24_OK) {
|
||||
NWC24FSeek(&file, 0, NWC24_SEEK_BEG);
|
||||
resultWrite = NWC24FWrite(header, sizeof(NWC24FLHeader), &file);
|
||||
}
|
||||
}
|
||||
|
||||
result = NWC24FClose(&file);
|
||||
if (resultWrite != NWC24_OK) {
|
||||
result = resultWrite;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24SwapFriendInfos(u32 index1, u32 index2) {
|
||||
NWC24Err result;
|
||||
NWC24Err resultFile;
|
||||
@@ -750,7 +756,7 @@ static NWC24Err GetCachedFLHeader(NWC24FLHeader** header) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24CheckFriendInfo(const NWC24FriendInfo* friendInfo) {
|
||||
static inline NWC24Err CheckFriendInfo(const NWC24FriendInfo* friendInfo) {
|
||||
NWC24Err result;
|
||||
|
||||
if (friendInfo == NULL) {
|
||||
@@ -775,8 +781,6 @@ NWC24Err NWC24CheckPublicMailAddr(const char* addr) {
|
||||
int len;
|
||||
BOOL readingDomain;
|
||||
|
||||
static const char specials[] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };
|
||||
|
||||
// Check parameters
|
||||
if (addr == NULL) {
|
||||
return NWC24_ERR_NULL;
|
||||
@@ -812,8 +816,8 @@ NWC24Err NWC24CheckPublicMailAddr(const char* addr) {
|
||||
}
|
||||
|
||||
// If the character is special, invalid!
|
||||
for (j = 0; j < sizeof(specials); j++) {
|
||||
if (ch == specials[j]) {
|
||||
for (j = 0; j < 11; j++) {
|
||||
if (ch == g_SpecialsChars[j]) {
|
||||
return NWC24_ERR_FORMAT;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -382,28 +382,6 @@ NWC24Err NWC24GetMsgType(const NWC24MsgObj* msg, NWC24MsgType* type) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgAppId(const NWC24MsgObj* msg, u32* appId) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
*appId = msgObj->appId;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgGroupId(const NWC24MsgObj* msg, u16* groupId) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
*groupId = msgObj->groupId;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgNumAttached(const NWC24MsgObj* msg, u32* numAttach) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
u8 numAttached = msgObj->numAttached;
|
||||
*numAttach = numAttached;
|
||||
if (numAttached > NWC24_MSG_ATTACHMENT_MAX) {
|
||||
return NWC24_ERR_BROKEN;
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgSubjectSize(const NWC24MsgObj* msg, u32* subjectSize) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
u32 size = msgObj->subject.size;
|
||||
@@ -431,6 +409,16 @@ NWC24Err NWC24GetMsgTextSize(const NWC24MsgObj* msg, u32* textSize) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgNumAttached(const NWC24MsgObj* msg, u32* numAttach) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
u8 numAttached = msgObj->numAttached;
|
||||
*numAttach = numAttached;
|
||||
if (numAttached > NWC24_MSG_ATTACHMENT_MAX) {
|
||||
return NWC24_ERR_BROKEN;
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgAttachedSize(const NWC24MsgObj* msg, u32 attachIndex, u32* attachSize) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
|
||||
@@ -463,6 +451,18 @@ NWC24Err NWC24GetMsgAttachedType(const NWC24MsgObj* msg, u32 attachIndex, NWC24M
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgAppId(const NWC24MsgObj* msg, u32* appId) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
*appId = msgObj->appId;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgGroupId(const NWC24MsgObj* msg, u16* groupId) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
*groupId = msgObj->groupId;
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
NWC24Err NWC24GetMsgFromId(const NWC24MsgObj* msg, NWC24UserId* fromId) {
|
||||
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
|
||||
|
||||
|
||||
@@ -3,48 +3,91 @@
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
char* Mail_strcpy(char* dest, const char* src) {
|
||||
char* pDest;
|
||||
char cSrc;
|
||||
|
||||
for (pDest = dest; *src != 0; pDest++) {
|
||||
cSrc = *src++;
|
||||
*pDest = cSrc;
|
||||
char* Mail_strcpy(char* pDst, const char* pSrc) {
|
||||
char* pOrigin = pDst;
|
||||
|
||||
while (*pSrc != '\0') {
|
||||
*pDst++ = *pSrc++;
|
||||
}
|
||||
*pDest = 0;
|
||||
return dest;
|
||||
|
||||
*pDst = '\0';
|
||||
return pOrigin;
|
||||
}
|
||||
|
||||
int Mail_strlen(const char* str) {
|
||||
int i;
|
||||
for (i = 0; *str != 0; i++, str++) {
|
||||
int Mail_strlen(const char* pStr) {
|
||||
int len = 0;
|
||||
|
||||
while (pStr[len] != '\0') {
|
||||
len++;
|
||||
}
|
||||
return i;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
char* Mail_strcat(char* dest, const char* src) {
|
||||
int i;
|
||||
char* pDest;
|
||||
int STD_strnlen(const char* pStr, size_t maxlen) {
|
||||
size_t len = 0;
|
||||
|
||||
pDest = dest;
|
||||
for (i = 0; *pDest != 0; pDest++, i++) {
|
||||
}
|
||||
pDest = dest + i;
|
||||
while (*src != 0) {
|
||||
*pDest++ = *src++;
|
||||
}
|
||||
*pDest = 0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
int STD_strnlen(const char* str, u32 len) {
|
||||
int i;
|
||||
for (i = 0; i < len; i++, str++) {
|
||||
if (*str == 0) {
|
||||
for (; len < maxlen; len++) {
|
||||
if (pStr[len] == '\0') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return i;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
void* Mail_memcpy(void* pDst, const void* pSrc, u32 n) {
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
((u8*)pDst)[i] = ((u8*)pSrc)[i];
|
||||
}
|
||||
|
||||
return pDst;
|
||||
}
|
||||
|
||||
void* Mail_memset(void* pDst, int ch, u32 n) {
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
((u8*)pDst)[i] = ch;
|
||||
}
|
||||
|
||||
return pDst;
|
||||
}
|
||||
|
||||
char* Mail_strncpy(char* dest, const char* src, u32 len) {
|
||||
u32 i;
|
||||
|
||||
i = 0;
|
||||
for (; i < len; i++) {
|
||||
dest[i] = src[i];
|
||||
if (src[i] == 0) {
|
||||
while (++i < len) {
|
||||
dest[i] = 0;
|
||||
}
|
||||
return dest;
|
||||
}
|
||||
}
|
||||
return dest;
|
||||
}
|
||||
|
||||
char* Mail_strcat(char* pDst, const char* pSrc) {
|
||||
Mail_strcpy(pDst + Mail_strlen(pDst), pSrc);
|
||||
return pDst;
|
||||
}
|
||||
|
||||
char* Mail_strncat(char* pDst, const char* pSrc, u32 maxlen) {
|
||||
int len = Mail_strlen(pDst);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < maxlen && pSrc[i] != '\0'; i++) {
|
||||
pDst[len + i] = pSrc[i];
|
||||
}
|
||||
|
||||
pDst[len + i] = '\0';
|
||||
return pDst;
|
||||
}
|
||||
|
||||
int Mail_strncmp(const char* str1, const char* str2, u32 len) {
|
||||
@@ -98,3 +141,271 @@ int Mail_tolower(int ch) {
|
||||
}
|
||||
return ch;
|
||||
}
|
||||
|
||||
static void set_to_head(char* pStr, char ch) {
|
||||
int i;
|
||||
|
||||
for (i = Mail_strlen(pStr); i >= 0; i--) {
|
||||
pStr[i + 1] = pStr[i];
|
||||
}
|
||||
|
||||
*pStr = ch;
|
||||
}
|
||||
|
||||
static void set_to_tail(char* pStr, char ch) {
|
||||
int i = Mail_strlen(pStr);
|
||||
|
||||
pStr[i++] = ch;
|
||||
pStr[i] = '\0';
|
||||
}
|
||||
|
||||
static s32 convNum(char* pDst, u32 number, s32 numberBase, char charBase,
|
||||
BOOL isSigned, s32 width, char specifierChar,
|
||||
char justifyChar) {
|
||||
|
||||
s32 charsWritten;
|
||||
s32 digitsWritten;
|
||||
char remainder;
|
||||
|
||||
if (isSigned && (number & 0x80000000)) {
|
||||
isSigned = TRUE;
|
||||
number = -number;
|
||||
} else {
|
||||
isSigned = FALSE;
|
||||
number = number;
|
||||
}
|
||||
|
||||
charsWritten = digitsWritten = 0;
|
||||
|
||||
while (number != 0) {
|
||||
remainder = number % numberBase;
|
||||
number /= numberBase;
|
||||
|
||||
set_to_head(pDst, remainder + (char)(remainder > 9 ? charBase : '0'));
|
||||
digitsWritten++;
|
||||
charsWritten++;
|
||||
}
|
||||
|
||||
if (*pDst == '\0') {
|
||||
set_to_head(pDst, '0');
|
||||
digitsWritten++;
|
||||
charsWritten++;
|
||||
}
|
||||
|
||||
if (specifierChar != '0') {
|
||||
specifierChar = ' ';
|
||||
}
|
||||
|
||||
digitsWritten += isSigned;
|
||||
|
||||
while (digitsWritten < width) {
|
||||
if (justifyChar == 'L') {
|
||||
set_to_tail(pDst, ' ');
|
||||
charsWritten++;
|
||||
} else {
|
||||
set_to_head(pDst, specifierChar);
|
||||
charsWritten++;
|
||||
}
|
||||
|
||||
digitsWritten++;
|
||||
}
|
||||
|
||||
if (isSigned) {
|
||||
set_to_head(pDst, '-');
|
||||
}
|
||||
|
||||
return charsWritten;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int Mail_sprintf(char* pDst, char* pFmt, ...) {
|
||||
va_list argv;
|
||||
int ret;
|
||||
|
||||
va_start(argv, pFmt);
|
||||
ret = Mail_vsprintf(pDst, pFmt, &argv);
|
||||
va_end(argv);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int Mail_vsprintf(char* pDst, char* pFmt, va_list* argv) {
|
||||
int charsWritten;
|
||||
BOOL isNumberFormat;
|
||||
BOOL isSigned;
|
||||
s32 stringLength;
|
||||
s32 numberBase;
|
||||
s32 width;
|
||||
char formatChar;
|
||||
char justifyChar;
|
||||
char specifierChar;
|
||||
char charBase;
|
||||
char* pStrArg;
|
||||
char longFlag;
|
||||
u32 number;
|
||||
|
||||
*pDst = 0;
|
||||
charsWritten = 0;
|
||||
|
||||
while ((formatChar = *pFmt++) != '\0') {
|
||||
while (*pDst != '\0') {
|
||||
pDst++;
|
||||
}
|
||||
|
||||
if (formatChar == '%') {
|
||||
formatChar = *pFmt++;
|
||||
|
||||
if (formatChar == '%') {
|
||||
set_to_tail(pDst++, formatChar);
|
||||
charsWritten++;
|
||||
} else {
|
||||
justifyChar = formatChar;
|
||||
if (formatChar == '-') {
|
||||
formatChar = *pFmt++;
|
||||
}
|
||||
|
||||
specifierChar = formatChar;
|
||||
isSigned = FALSE;
|
||||
numberBase = 10;
|
||||
charBase = '0';
|
||||
isNumberFormat = FALSE;
|
||||
|
||||
if (formatChar == '*') {
|
||||
width = va_arg(*argv, s32);
|
||||
formatChar = *pFmt++;
|
||||
} else {
|
||||
width = 0;
|
||||
|
||||
while (formatChar >= '0' && formatChar <= '9') {
|
||||
width = width * 10 + formatChar - '0';
|
||||
formatChar = *pFmt++;
|
||||
}
|
||||
}
|
||||
|
||||
if ((longFlag = formatChar & (u8)~0x20) == 'L') {
|
||||
formatChar = *pFmt++;
|
||||
}
|
||||
|
||||
switch (formatChar) {
|
||||
case 'd': {
|
||||
isNumberFormat = TRUE;
|
||||
isSigned = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'o': {
|
||||
isNumberFormat = TRUE;
|
||||
numberBase = 8;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'u': {
|
||||
isNumberFormat = TRUE;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'x': {
|
||||
isNumberFormat = TRUE;
|
||||
numberBase = 16;
|
||||
charBase = 'a' - 10;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'X': {
|
||||
isNumberFormat = TRUE;
|
||||
numberBase = 16;
|
||||
charBase = 'A' - 10;
|
||||
break;
|
||||
}
|
||||
|
||||
case 'c': {
|
||||
formatChar = va_arg(*argv, s32);
|
||||
set_to_tail(pDst++, formatChar);
|
||||
charsWritten++;
|
||||
break;
|
||||
}
|
||||
|
||||
case 's': {
|
||||
pStrArg = va_arg(*argv, char*);
|
||||
|
||||
if (pStrArg) {
|
||||
stringLength = Mail_strlen(pStrArg);
|
||||
Mail_strcat(pDst, pStrArg);
|
||||
} else {
|
||||
stringLength = 0;
|
||||
}
|
||||
|
||||
charsWritten += stringLength;
|
||||
|
||||
while (stringLength < width) {
|
||||
charsWritten++;
|
||||
|
||||
if (justifyChar == '-') {
|
||||
set_to_tail(pDst, ' ');
|
||||
} else {
|
||||
set_to_head(pDst, ' ');
|
||||
}
|
||||
|
||||
stringLength++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (isNumberFormat) {
|
||||
if (longFlag == 'L') {
|
||||
number = va_arg(*argv, u32);
|
||||
} else if (isSigned) {
|
||||
number = va_arg(*argv, s32);
|
||||
} else {
|
||||
number = va_arg(*argv, u32);
|
||||
}
|
||||
|
||||
charsWritten +=
|
||||
convNum(pDst, number, numberBase, charBase, isSigned,
|
||||
width, specifierChar, justifyChar);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
set_to_tail(pDst++, formatChar);
|
||||
charsWritten++;
|
||||
}
|
||||
}
|
||||
|
||||
return charsWritten;
|
||||
}
|
||||
|
||||
int Mail_strnicmp(const char* str1, const char* str2, int len) {
|
||||
int i;
|
||||
int c2;
|
||||
int c1;
|
||||
int result;
|
||||
|
||||
result = 0;
|
||||
for (i = 0; i < len; i++) {
|
||||
c1 = *str1;
|
||||
c2 = *str2;
|
||||
if (c1 >= 'A') {
|
||||
if (c1 <= 'Z') {
|
||||
c1 += 0x20;
|
||||
}
|
||||
}
|
||||
if (c2 >= 'A') {
|
||||
if (c2 <= 'Z') {
|
||||
c2 += 0x20;
|
||||
}
|
||||
}
|
||||
result = c1 - c2;
|
||||
if (result != 0) {
|
||||
break;
|
||||
}
|
||||
if (c2 == 0) {
|
||||
break;
|
||||
}
|
||||
str2++;
|
||||
str1++;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1,21 +1,79 @@
|
||||
#include <private/nwc24.h>
|
||||
#include <revolution/nwc24.h>
|
||||
|
||||
const u8 TtableInv[] = {13, 5, 9, 7, 0, 15, 10, 2, 12, 3, 14, 1, 8, 6, 11, 4};
|
||||
const u8 ExcTable[] = {1, 5, 0, 4, 2, 3, 6, 7};
|
||||
static const u8 TtableInv[] = {13, 5, 9, 7, 0, 15, 10, 2, 12, 3, 14, 1, 8, 6, 11, 4};
|
||||
extern void _savegpr_27(void);
|
||||
extern void _restgpr_27(void);
|
||||
extern void __shr2u(void);
|
||||
extern void __shl2i(void);
|
||||
|
||||
static u8 getbyte(NWC24UserId value, u8 index);
|
||||
static NWC24UserId setbyte(NWC24UserId value, u8 index, u8 set);
|
||||
|
||||
NWC24UserId getUnScrambleId(NWC24UserId id);
|
||||
static int checkCRC(NWC24UserId id);
|
||||
|
||||
static u8 getbyte(NWC24UserId value, u8 index) {
|
||||
return (value >> (index * 8)) & 0xFF;
|
||||
}
|
||||
|
||||
static NWC24UserId setbyte(NWC24UserId value, u8 index, u8 set) {
|
||||
return (value & ~(((u64)0xFF << (index * 8)))) | (((u64)set << (index * 8)));
|
||||
static NWC24UserId getUnScrambleId(NWC24UserId id);
|
||||
asm NWC24Err NWC24CheckUserId(register NWC24UserId id) {
|
||||
stwu r1,-0x30(r1)
|
||||
mfspr r0,LR
|
||||
stw r0,0x34(r1)
|
||||
addi r11,r1,0x30
|
||||
bl _savegpr_27
|
||||
or r28,r3,r3
|
||||
or r27,r4,r4
|
||||
addi r3,r1,0x8
|
||||
bl NWC24GetMyUserId
|
||||
lwz r3,0x8(r1)
|
||||
lwz r4,0xc(r1)
|
||||
xor r0,r3,r28
|
||||
xor r5,r4,r27
|
||||
or. r0,r5,r0
|
||||
bne NWC24CheckUserId_not_same
|
||||
li r3,-0x23
|
||||
b NWC24CheckUserId_return
|
||||
NWC24CheckUserId_not_same:
|
||||
bl getUnScrambleId
|
||||
or r4,r27,r27
|
||||
rlwinm r27,r3,0x11,0x1d,0x1f
|
||||
or r3,r28,r28
|
||||
bl getUnScrambleId
|
||||
or r30,r4,r4
|
||||
or r31,r3,r3
|
||||
rlwinm r28,r3,0x11,0x1d,0x1f
|
||||
li r29,0
|
||||
NWC24CheckUserId_crc_loop:
|
||||
addi r0,r29,1
|
||||
or r3,r31,r31
|
||||
or r4,r30,r30
|
||||
subfic r5,r0,0x35
|
||||
bl __shr2u
|
||||
rlwinm. r0,r4,0,0x1f,0x1f
|
||||
beq NWC24CheckUserId_crc_next
|
||||
subfic r5,r29,0x2a
|
||||
li r4,0x635
|
||||
li r3,0
|
||||
bl __shl2i
|
||||
xor r30,r30,r4
|
||||
xor r31,r31,r3
|
||||
NWC24CheckUserId_crc_next:
|
||||
addi r29,r29,1
|
||||
cmpwi r29,0x2b
|
||||
blt NWC24CheckUserId_crc_loop
|
||||
or. r0,r30,r31
|
||||
beq NWC24CheckUserId_crc_ok
|
||||
li r3,-0x25
|
||||
b NWC24CheckUserId_return
|
||||
NWC24CheckUserId_crc_ok:
|
||||
cmpwi r27,0
|
||||
bne NWC24CheckUserId_return_ok
|
||||
cmpwi r28,0
|
||||
beq NWC24CheckUserId_return_ok
|
||||
li r3,-0x7
|
||||
b NWC24CheckUserId_return
|
||||
NWC24CheckUserId_return_ok:
|
||||
li r3,0
|
||||
NWC24CheckUserId_return:
|
||||
addi r11,r1,0x30
|
||||
bl _restgpr_27
|
||||
lwz r0,0x34(r1)
|
||||
mtspr LR,r0
|
||||
addi r1,r1,0x30
|
||||
blr
|
||||
}
|
||||
|
||||
NWC24Err NWC24iCheckUserIdCRC(NWC24UserId id) {
|
||||
@@ -33,3 +91,167 @@ NWC24Err NWC24iCheckUserIdCRC(NWC24UserId id) {
|
||||
}
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static asm NWC24UserId getUnScrambleId(register NWC24UserId id) {
|
||||
li r9,-1
|
||||
lis r7,0x20
|
||||
lis r6,0x5e5e
|
||||
stwu r1,-0x20(r1)
|
||||
subi r7,r7,1
|
||||
and r8,r4,r9
|
||||
addi r0,r6,0x5e5e
|
||||
stw r31,0x1c(r1)
|
||||
and r3,r3,r7
|
||||
lis r5,-1
|
||||
xor r8,r8,r0
|
||||
stw r30,0x18(r1)
|
||||
and r8,r8,r9
|
||||
xori r3,r3,0x5e5e
|
||||
rlwinm r0,r8,0x15,0xa,0xa
|
||||
li r6,-0x100
|
||||
and r3,r3,r7
|
||||
rlwinm r8,r8,0x1f,0,0x1f
|
||||
or r3,r3,r0
|
||||
stw r29,0x14(r1)
|
||||
rlwimi r8,r3,0x1f,0,0
|
||||
lis r4,-0xff
|
||||
rlwinm r7,r3,0x1f,1,0x1f
|
||||
addi r5,r5,0xff
|
||||
rlwinm r30,r8,0x18,0,0x1f
|
||||
rlwinm r29,r3,0x17,0x18,0x1f
|
||||
and r12,r7,r9
|
||||
li r0,0
|
||||
rlwimi r30,r3,0x17,0,7
|
||||
and r31,r8,r6
|
||||
rlwimi r31,r30,0,0x18,0x1f
|
||||
rlwinm r11,r3,0x1f,0x10,0x17
|
||||
and r30,r31,r5
|
||||
and r12,r12,r9
|
||||
rlwimi r0,r29,8,0x18,0x1f
|
||||
subi r4,r4,1
|
||||
or r12,r12,r0
|
||||
or r11,r30,r11
|
||||
and r30,r11,r4
|
||||
rlwinm r31,r8,0,0x18,0x1f
|
||||
li r0,0
|
||||
rlwinm r11,r8,0x10,8,0xf
|
||||
lis r10,0x100
|
||||
and r12,r12,r9
|
||||
rlwimi r0,r31,0x10,0x10,0x1f
|
||||
or r30,r30,r11
|
||||
or r29,r12,r0
|
||||
rlwinm r12,r3,0x1f,0x18,0x1f
|
||||
subi r0,r10,1
|
||||
li r10,0
|
||||
rlwimi r10,r12,0x18,8,0x1f
|
||||
and r11,r29,r9
|
||||
and r12,r30,r0
|
||||
rlwinm r3,r3,0x17,0,7
|
||||
or r3,r12,r3
|
||||
or r12,r11,r10
|
||||
and r10,r3,r9
|
||||
lis r3,TtableInv@ha
|
||||
and r31,r10,r9
|
||||
rlwinm r30,r8,0x10,0,0x1f
|
||||
rlwinm r11,r31,0x1c,0x1c,0x1f
|
||||
addi r3,r3,TtableInv@l
|
||||
rlwimi r30,r7,0x10,0,0xf
|
||||
rlwinm r10,r31,0,0x1c,0x1f
|
||||
and r29,r12,r6
|
||||
rlwinm r12,r8,8,0,0x1f
|
||||
lbzx r11,r3,r11
|
||||
rlwimi r12,r7,8,0,0x17
|
||||
lbzx r7,r3,r10
|
||||
rlwimi r29,r30,0,0x18,0x1f
|
||||
rlwinm r8,r11,4,0,0x1b
|
||||
rlwinm r10,r12,8,0x10,0x17
|
||||
and r11,r29,r5
|
||||
or r10,r11,r10
|
||||
or r7,r8,r7
|
||||
and r11,r31,r6
|
||||
li r8,0
|
||||
rlwimi r11,r7,0,0x18,0x1f
|
||||
and r12,r10,r9
|
||||
rlwinm r10,r11,0x18,0,0x1f
|
||||
li r7,0
|
||||
rlwimi r10,r12,0x18,0,7
|
||||
and r31,r11,r5
|
||||
rlwinm r11,r10,0x1c,0x1c,0x1f
|
||||
and r12,r12,r9
|
||||
rlwinm r10,r10,0,0x1c,0x1f
|
||||
lbzx r11,r3,r11
|
||||
lbzx r10,r3,r10
|
||||
rlwinm r11,r11,4,0,0x1b
|
||||
or r10,r11,r10
|
||||
rlwinm r11,r10,0,0x18,0x1f
|
||||
rlwinm r10,r10,8,0x10,0x17
|
||||
rlwimi r8,r11,8,0x18,0x1f
|
||||
or r10,r31,r10
|
||||
or r8,r12,r8
|
||||
rlwinm r12,r10,0x10,0,0x1f
|
||||
and r11,r10,r4
|
||||
rlwimi r12,r8,0x10,0,0xf
|
||||
and r10,r8,r9
|
||||
rlwinm r8,r12,0x1c,0x1c,0x1f
|
||||
rlwinm r4,r12,0,0x1c,0x1f
|
||||
lbzx r8,r3,r8
|
||||
lbzx r4,r3,r4
|
||||
rlwinm r8,r8,4,0,0x1b
|
||||
or r4,r8,r4
|
||||
rlwinm r8,r4,0,0x18,0x1f
|
||||
rlwinm r4,r4,0x10,8,0xf
|
||||
or r29,r11,r4
|
||||
rlwimi r7,r8,0x10,0x10,0x1f
|
||||
or r11,r10,r7
|
||||
lis r4,1
|
||||
rlwinm r8,r29,8,0,0x1f
|
||||
and r31,r29,r0
|
||||
rlwimi r8,r11,8,0,0x17
|
||||
and r12,r11,r9
|
||||
rlwinm r10,r8,0x1c,0x1c,0x1f
|
||||
subi r0,r4,0x4c4d
|
||||
lbzx r11,r3,r10
|
||||
rlwinm r8,r8,0,0x1c,0x1f
|
||||
lbzx r10,r3,r8
|
||||
li r8,0
|
||||
rlwinm r11,r11,4,0,0x1b
|
||||
lis r7,-0x4c4c
|
||||
or r11,r11,r10
|
||||
rlwinm r10,r11,0,0x18,0x1f
|
||||
subi r7,r7,0x4c4d
|
||||
rlwimi r8,r10,0x18,8,0x1f
|
||||
rlwinm r4,r11,0x18,0,7
|
||||
or r10,r12,r8
|
||||
rlwinm r8,r10,0x1c,0x1c,0x1f
|
||||
or r12,r31,r4
|
||||
rlwinm r4,r10,0,0x1c,0x1f
|
||||
lbzx r8,r3,r8
|
||||
and r11,r10,r6
|
||||
lbzx r4,r3,r4
|
||||
rlwinm r6,r8,4,0,0x1b
|
||||
and r8,r12,r9
|
||||
or r4,r6,r4
|
||||
rlwimi r11,r4,0,0x18,0x1f
|
||||
and r10,r8,r9
|
||||
rlwinm r6,r11,0x14,0x1c,0x1f
|
||||
rlwinm r4,r11,0x18,0x1c,0x1f
|
||||
lbzx r6,r3,r6
|
||||
lbzx r3,r3,r4
|
||||
and r8,r11,r5
|
||||
rlwinm r5,r6,4,0,0x1b
|
||||
and r4,r10,r9
|
||||
or r3,r5,r3
|
||||
rlwinm r3,r3,8,0x10,0x17
|
||||
or r3,r8,r3
|
||||
rlwinm r5,r3,0xa,0xb,0x15
|
||||
rlwinm r3,r3,0x15,0x16,0x1f
|
||||
rlwimi r5,r4,0xa,0x16,0x1f
|
||||
rlwimi r3,r4,0xa,0,0x15
|
||||
xor r4,r3,r7
|
||||
xor r3,r5,r0
|
||||
lwz r31,0x1c(r1)
|
||||
lwz r30,0x18(r1)
|
||||
lwz r29,0x14(r1)
|
||||
addi r1,r1,0x20
|
||||
blr
|
||||
}
|
||||
|
||||
713
libs/RevoEX/src/so/SOCommon.c
Normal file
713
libs/RevoEX/src/so/SOCommon.c
Normal file
@@ -0,0 +1,713 @@
|
||||
#include <revolution/ncd.h>
|
||||
#include <revolution/os.h>
|
||||
#include <revolution/soex.h>
|
||||
|
||||
#include <private/ios.h>
|
||||
#include <private/nwc24/NWC24Schedule.h>
|
||||
#include <private/os/OSTime.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
typedef struct SOSysWork {
|
||||
SOAlloc allocFunc;
|
||||
SOFree freeFunc;
|
||||
s32 rmState;
|
||||
s32 rmFd;
|
||||
u32 unk10;
|
||||
s32 allocCount;
|
||||
} SOSysWork;
|
||||
|
||||
enum {
|
||||
SO_INTERNAL_STATE_TERMINATED = 0,
|
||||
SO_INTERNAL_STATE_READY = 1,
|
||||
SO_INTERNAL_STATE_ACTIVE = 2,
|
||||
};
|
||||
|
||||
enum {
|
||||
SO_INTERNAL_RM_STATE_OPENED = 0,
|
||||
SO_INTERNAL_RM_STATE_WORKING = -1,
|
||||
SO_INTERNAL_RM_STATE_CLOSED = -2,
|
||||
};
|
||||
|
||||
enum {
|
||||
SO_SUCCESS = 0,
|
||||
SO_EFATAL = (s32)0x80000000,
|
||||
SO_EAGAIN = -6,
|
||||
SO_EALREADY = -7,
|
||||
SO_EBUSY = -10,
|
||||
SO_EINPROGRESS = -26,
|
||||
SO_EINVAL = -28,
|
||||
SO_ENETRESET = -39,
|
||||
SO_ENOENT = -45,
|
||||
SO_ENOLINK = -48,
|
||||
SO_ENOMEM = -49,
|
||||
SO_ETIMEDOUT = -76,
|
||||
};
|
||||
|
||||
enum {
|
||||
SO_ERR_LINK_UP_TIMEOUT = -121,
|
||||
};
|
||||
|
||||
enum {
|
||||
NCD_LINKSTATUS_WORKING = 1,
|
||||
NCD_LINKSTATUS_NONE = 2,
|
||||
};
|
||||
|
||||
enum {
|
||||
NET_SO_SOCKET = 0xF,
|
||||
};
|
||||
|
||||
typedef struct NETSoSocket {
|
||||
int af;
|
||||
int type;
|
||||
int protocol;
|
||||
} NETSoSocket;
|
||||
|
||||
static s32 soRegistered;
|
||||
static s32 soError;
|
||||
static u8 soState;
|
||||
static SOSysWork soWork;
|
||||
|
||||
const char* __SOVersion =
|
||||
"<< RVL_SDK - SO \trelease build: Dec 12 2008 03:06:16 (0x4199_60831) >>";
|
||||
static int soBufAddrCheck = 1;
|
||||
static char NET_RM_SOCK[] = "/dev/net/ip/top";
|
||||
|
||||
extern OSTime __OSGetSystemTime(void);
|
||||
|
||||
static int SOStartupErr(s32 errNwc24, s32 exErr);
|
||||
void* SOiAlloc(u32 name, s32 size);
|
||||
void SOiFree(u32 name, void* ptr, s32 size);
|
||||
int SOiPrepare(const char* funcName, s32* pRmId);
|
||||
int SOiConclude(const char* funcName, int result);
|
||||
int SOiWaitForDHCPEx(int timeout);
|
||||
int SOCleanup(void);
|
||||
int SOiConcludeTempRm(const char* funcName, int result, int isTempRm);
|
||||
|
||||
int SOInit(SOLibraryConfig* config) {
|
||||
int result = 0;
|
||||
int enabled;
|
||||
void* ptr;
|
||||
OSThread* cur;
|
||||
SOSysWork* work;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
if (!soRegistered) {
|
||||
OSRegisterVersion(__SOVersion);
|
||||
soRegistered = 1;
|
||||
}
|
||||
if (!((int)soState == 0 || (int)soState < 0 || (int)soState >= 3)) {
|
||||
result = -7;
|
||||
goto finish;
|
||||
}
|
||||
if (config == NULL || config->alloc == NULL || config->free == NULL) {
|
||||
result = -28;
|
||||
} else {
|
||||
memset(&soWork, 0, sizeof(soWork));
|
||||
soWork.allocFunc = config->alloc;
|
||||
work = &soWork;
|
||||
work->freeFunc = config->free;
|
||||
work->allocCount = 0;
|
||||
work->rmState = -2;
|
||||
work->rmFd = -1;
|
||||
ptr = SOiAlloc(0xB, 0x460);
|
||||
soWork.unk10 = (u32)ptr;
|
||||
if (ptr == NULL) {
|
||||
result = -49;
|
||||
} else {
|
||||
soState = 1;
|
||||
}
|
||||
}
|
||||
finish:
|
||||
cur = OSGetCurrentThread();
|
||||
if (cur != NULL)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOFinish(void) {
|
||||
int result = 0;
|
||||
int enabled = OSDisableInterrupts();
|
||||
OSThread* cur;
|
||||
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_TERMINATED:
|
||||
result = SO_EALREADY;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (soWork.allocCount > 1) {
|
||||
result = SO_EAGAIN;
|
||||
break;
|
||||
}
|
||||
soState = SO_INTERNAL_STATE_TERMINATED;
|
||||
if (soWork.unk10 != 0 && soWork.freeFunc) {
|
||||
soWork.allocCount--;
|
||||
soWork.freeFunc(0x0b, (void*)soWork.unk10, 0x460);
|
||||
}
|
||||
break;
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
result = SO_EINPROGRESS;
|
||||
break;
|
||||
}
|
||||
cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOStartup(void) { return SOStartupEx(0x927c0); }
|
||||
|
||||
static int SOStartupErr(s32 errNwc24, s32 exErr) {
|
||||
s32 result = -0x1c;
|
||||
switch (errNwc24) {
|
||||
case 0:
|
||||
result = 0;
|
||||
break;
|
||||
case -0x16:
|
||||
case -0xd:
|
||||
result = -0x30;
|
||||
break;
|
||||
case -0x21:
|
||||
case -2:
|
||||
result = exErr;
|
||||
break;
|
||||
case -1:
|
||||
result = -0x80000000;
|
||||
break;
|
||||
case -0x1d:
|
||||
result = -0x1a;
|
||||
break;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOStartupEx(int timeout) {
|
||||
int result;
|
||||
int enabled;
|
||||
s32 exErr;
|
||||
s64 limitTime;
|
||||
s32 linkupRetryCount;
|
||||
|
||||
limitTime = 0;
|
||||
if (timeout != 0)
|
||||
limitTime = __OSGetSystemTime() + ((timeout) * ((__OSBusClock / 4) / 1000));
|
||||
|
||||
linkupRetryCount = 4;
|
||||
|
||||
begin_startup:
|
||||
result = SO_SUCCESS;
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_TERMINATED:
|
||||
default:
|
||||
result = SO_ENETRESET;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
result = SO_EALREADY;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (!OSGetCurrentThread()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
} else {
|
||||
int resultNCD;
|
||||
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
|
||||
while (1) {
|
||||
resultNCD = NCDGetLinkStatus();
|
||||
if (resultNCD != NCD_RESULT_INPROGRESS &&
|
||||
resultNCD != NCD_LINKSTATUS_WORKING)
|
||||
break;
|
||||
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
|
||||
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
|
||||
if (resultNCD == NCD_LINKSTATUS_WORKING)
|
||||
result = SO_ERR_LINK_UP_TIMEOUT;
|
||||
else
|
||||
result = SO_EFATAL;
|
||||
goto change_state;
|
||||
}
|
||||
}
|
||||
if (resultNCD < NCD_RESULT_SUCCESS) {
|
||||
result = SO_EFATAL;
|
||||
goto change_state;
|
||||
} else if (resultNCD == NCD_LINKSTATUS_NONE) {
|
||||
result = SO_ENOENT;
|
||||
goto change_state;
|
||||
}
|
||||
|
||||
while (1) {
|
||||
soWork.rmFd = IOS_Open(NET_RM_SOCK, 0);
|
||||
if (soWork.rmFd != -6)
|
||||
break;
|
||||
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
|
||||
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
|
||||
result = SO_EFATAL;
|
||||
goto change_state;
|
||||
}
|
||||
};
|
||||
|
||||
if (soWork.rmFd < 0) {
|
||||
result = SO_EFATAL;
|
||||
goto change_state;
|
||||
} else {
|
||||
s32 errNwc24;
|
||||
|
||||
result = SO_SUCCESS;
|
||||
exErr = SO_SUCCESS;
|
||||
|
||||
while (1) {
|
||||
errNwc24 = NWC24iStartupSocket(&exErr);
|
||||
if (errNwc24 != NWC24_ERR_INPROGRESS)
|
||||
break;
|
||||
OSSleepTicks((((s64)100) * ((__OSBusClock / 4) / 1000)));
|
||||
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (result == SO_SUCCESS)
|
||||
result = SOStartupErr(errNwc24, exErr);
|
||||
if (result != SO_SUCCESS) {
|
||||
if (IOS_Close(soWork.rmFd) < 0) {
|
||||
result = SO_EFATAL;
|
||||
goto change_state;
|
||||
} else {
|
||||
soWork.rmFd = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
change_state:
|
||||
enabled = OSDisableInterrupts();
|
||||
if (result == SO_SUCCESS) {
|
||||
soState = SO_INTERNAL_STATE_ACTIVE;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_OPENED;
|
||||
} else {
|
||||
soState = 1;
|
||||
if (result != SO_EFATAL)
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
{
|
||||
OSThread* cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
}
|
||||
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
|
||||
if (result == 0) {
|
||||
s64 dhcpTimeOutTicks;
|
||||
|
||||
if (limitTime != 0) {
|
||||
dhcpTimeOutTicks = limitTime - __OSGetSystemTime();
|
||||
} else {
|
||||
dhcpTimeOutTicks = 0;
|
||||
}
|
||||
if (limitTime != 0 && dhcpTimeOutTicks <= 0) {
|
||||
result = -76;
|
||||
} else {
|
||||
result = SOiWaitForDHCPEx(
|
||||
(int)((dhcpTimeOutTicks) / ((__OSBusClock / 4) / 1000)));
|
||||
}
|
||||
|
||||
if (result != 0) {
|
||||
(void)SOCleanup();
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
OSThread* cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
}
|
||||
|
||||
if (result == -112) {
|
||||
linkupRetryCount--;
|
||||
if (linkupRetryCount >= 0) {
|
||||
goto begin_startup;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOCleanup(void) {
|
||||
int result = SO_SUCCESS;
|
||||
int enabled = OSDisableInterrupts();
|
||||
s32 exErr = SO_SUCCESS;
|
||||
int errNwc24;
|
||||
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_TERMINATED:
|
||||
default:
|
||||
result = SO_ENETRESET;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
result = SO_EALREADY;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (!OSGetCurrentThread()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
} else {
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
|
||||
errNwc24 = NWC24iCleanupSocket(&exErr);
|
||||
result = SOStartupErr(errNwc24, exErr);
|
||||
if (result != SO_SUCCESS) {
|
||||
} else {
|
||||
if (IOS_Close(soWork.rmFd) < 0)
|
||||
result = SO_EFATAL;
|
||||
else
|
||||
soWork.rmFd = -1;
|
||||
}
|
||||
|
||||
enabled = OSDisableInterrupts();
|
||||
if (result == SO_SUCCESS) {
|
||||
soState = SO_INTERNAL_STATE_READY;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
|
||||
} else {
|
||||
if (result != SO_EFATAL) {
|
||||
soState = SO_INTERNAL_STATE_ACTIVE;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_OPENED;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
{
|
||||
OSThread* cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
}
|
||||
|
||||
OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
SOSysWork* SOiGetSysWork(void) { return &soWork; }
|
||||
|
||||
int SOiIsBufferAddrCheck(void) { return soBufAddrCheck; }
|
||||
|
||||
int SOiIsInitialized(void) {
|
||||
int result = 0;
|
||||
int enabled = OSDisableInterrupts();
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
void* SOiAlloc(u32 name, s32 size) {
|
||||
if (size > 0 && soWork.allocFunc) {
|
||||
void* ptr = soWork.allocFunc(name, size);
|
||||
if (ptr) {
|
||||
soWork.allocCount++;
|
||||
if (SOiIsBufferAddrCheck() && !(((u32)ptr & 0x1fffffff) >= 0x10000000 &&
|
||||
((u32)ptr & 0x1fffffff) < 0x18000000)) {
|
||||
if (ptr != NULL && soWork.freeFunc != NULL) {
|
||||
soWork.allocCount--;
|
||||
soWork.freeFunc(name, ptr, size);
|
||||
}
|
||||
ptr = NULL;
|
||||
}
|
||||
}
|
||||
return ptr;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void SOiFree(u32 name, void* ptr, s32 size) {
|
||||
if ((ptr != NULL) && (soWork.freeFunc != NULL)) {
|
||||
soWork.allocCount--;
|
||||
soWork.freeFunc(name, ptr, size);
|
||||
}
|
||||
}
|
||||
|
||||
int SOiPrepare(const char*, s32* pRmId) {
|
||||
int result = SO_SUCCESS;
|
||||
int enabled = OSDisableInterrupts();
|
||||
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_TERMINATED:
|
||||
result = SO_ENETRESET;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
default:
|
||||
result = SO_EINVAL;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (!OSGetCurrentThread()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
}
|
||||
*pRmId = soWork.rmFd;
|
||||
break;
|
||||
}
|
||||
|
||||
if (result != SO_SUCCESS) {
|
||||
OSThread* cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
}
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOiConclude(const char*, int result) {
|
||||
int enabled = OSDisableInterrupts();
|
||||
OSThread* cur;
|
||||
|
||||
cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOiPrepareTempRm(const char* funcName, s32* pRmId, int* pIsTempRm) {
|
||||
int result = SO_SUCCESS;
|
||||
int enabled = OSDisableInterrupts();
|
||||
int errNwc24;
|
||||
|
||||
switch (soState) {
|
||||
case SO_INTERNAL_STATE_TERMINATED:
|
||||
result = SO_ENETRESET;
|
||||
break;
|
||||
case SO_INTERNAL_STATE_READY:
|
||||
default:
|
||||
if (soWork.rmState > SO_INTERNAL_RM_STATE_CLOSED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (!OSGetCurrentThread()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
}
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_WORKING;
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
soWork.rmFd = IOS_Open(NET_RM_SOCK, 0);
|
||||
if (soWork.rmFd < 0) {
|
||||
enabled = OSDisableInterrupts();
|
||||
if (soWork.rmFd == -6) {
|
||||
result = SO_EINPROGRESS;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
|
||||
} else {
|
||||
result = SO_EFATAL;
|
||||
}
|
||||
} else {
|
||||
*pRmId = soWork.rmFd;
|
||||
if ((errNwc24 = NWC24iLockSocket()) == NWC24_OK) {
|
||||
s32 errNcd = NCDGetLinkStatus();
|
||||
switch (errNcd) {
|
||||
case 3:
|
||||
case 4:
|
||||
case 5:
|
||||
result = (int)IOS_Ioctl(soWork.rmFd, 0x1f, NULL, 0, NULL, 0);
|
||||
if (result == SO_SUCCESS) {
|
||||
*pIsTempRm = 1;
|
||||
} else {
|
||||
result = SOiConcludeTempRm(funcName, result, 1);
|
||||
}
|
||||
break;
|
||||
case -8:
|
||||
result = SOiConcludeTempRm(funcName, SO_EINPROGRESS, 1);
|
||||
break;
|
||||
case -1:
|
||||
case -2:
|
||||
result = SOiConcludeTempRm(funcName, SO_EFATAL, 1);
|
||||
break;
|
||||
default:
|
||||
result = SOiConcludeTempRm(funcName, SO_ENOLINK, 1);
|
||||
}
|
||||
enabled = OSDisableInterrupts();
|
||||
} else {
|
||||
switch (errNwc24) {
|
||||
case NWC24_ERR_INPROGRESS:
|
||||
result = SO_EINPROGRESS;
|
||||
break;
|
||||
case NWC24_ERR_FAILED:
|
||||
result = SO_ENETRESET;
|
||||
break;
|
||||
case NWC24_ERR_DONE:
|
||||
result = SO_ENOLINK;
|
||||
break;
|
||||
case NWC24_ERR_MUTEX:
|
||||
case NWC24_ERR_FATAL:
|
||||
default:
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
}
|
||||
if (IOS_Close(soWork.rmFd) < 0) {
|
||||
result = SO_EFATAL;
|
||||
}
|
||||
enabled = OSDisableInterrupts();
|
||||
if (result != SO_EFATAL) {
|
||||
soWork.rmFd = -1;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case SO_INTERNAL_STATE_ACTIVE:
|
||||
if (soWork.rmState < SO_INTERNAL_RM_STATE_OPENED) {
|
||||
result = SO_EBUSY;
|
||||
break;
|
||||
} else if (!OSGetCurrentThread()) {
|
||||
result = SO_EFATAL;
|
||||
break;
|
||||
}
|
||||
*pIsTempRm = 0;
|
||||
*pRmId = soWork.rmFd;
|
||||
break;
|
||||
}
|
||||
|
||||
if (result != SO_SUCCESS) {
|
||||
OSThread* cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
}
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOiConcludeTempRm(const char*, int result, int isTempRm) {
|
||||
int enabled;
|
||||
OSThread* cur;
|
||||
|
||||
if (isTempRm == 1) {
|
||||
switch (NWC24iUnlockSocket()) {
|
||||
case NWC24_OK:
|
||||
break;
|
||||
case NWC24_ERR_INPROGRESS:
|
||||
result = SO_EINPROGRESS;
|
||||
break;
|
||||
case NWC24_ERR_FATAL:
|
||||
default:
|
||||
result = SO_EFATAL;
|
||||
}
|
||||
if (IOS_Close(soWork.rmFd) < 0) {
|
||||
result = SO_EFATAL;
|
||||
}
|
||||
enabled = OSDisableInterrupts();
|
||||
if (result != SO_EFATAL) {
|
||||
soWork.rmFd = -1;
|
||||
soWork.rmState = SO_INTERNAL_RM_STATE_CLOSED;
|
||||
}
|
||||
} else {
|
||||
enabled = OSDisableInterrupts();
|
||||
}
|
||||
cur = OSGetCurrentThread();
|
||||
if (cur)
|
||||
cur->error = result;
|
||||
else
|
||||
soError = result;
|
||||
(void)OSRestoreInterrupts(enabled);
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOiWaitForDHCPEx(int timeout) {
|
||||
int result = SO_SUCCESS;
|
||||
int gioResult;
|
||||
int ifError;
|
||||
int ifErrorSize;
|
||||
s64 limitTime;
|
||||
|
||||
limitTime = 0;
|
||||
if (timeout != 0)
|
||||
limitTime = __OSGetSystemTime() + ((timeout) * ((__OSBusClock / 4) / 1000));
|
||||
|
||||
while (1) {
|
||||
OSSleepTicks((((s64)10) * ((__OSBusClock / 4) / 1000)));
|
||||
|
||||
ifErrorSize = sizeof(ifError);
|
||||
gioResult = SOGetInterfaceOpt(NULL, 0xfffe, 0x1003, &ifError, &ifErrorSize);
|
||||
if (gioResult != SO_SUCCESS) {
|
||||
result = gioResult;
|
||||
break;
|
||||
}
|
||||
if (gioResult == SO_SUCCESS && ifError != SO_SUCCESS) {
|
||||
result = ifError;
|
||||
break;
|
||||
}
|
||||
if (SOGetHostID() != 0)
|
||||
break;
|
||||
if (limitTime != 0 && limitTime < __OSGetSystemTime()) {
|
||||
result = SO_ETIMEDOUT;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma dont_inline on
|
||||
int __SOCreateSocket(int pf, int type, int protocol) {
|
||||
int result;
|
||||
s32 rmId;
|
||||
NETSoSocket* soc;
|
||||
|
||||
if ((result = SOiPrepare(0, &rmId)) == SO_SUCCESS) {
|
||||
if (pf == 0x17) {
|
||||
result = -5;
|
||||
} else {
|
||||
soc = (NETSoSocket*)SOiAlloc(0xC, 0x20);
|
||||
if (soc == NULL) {
|
||||
result = SO_ENOMEM;
|
||||
} else {
|
||||
soc->af = pf;
|
||||
soc->type = type;
|
||||
soc->protocol = protocol;
|
||||
result = IOS_Ioctl(rmId, NET_SO_SOCKET, soc, 0xC, NULL, 0);
|
||||
SOiFree(0xC, soc, 0x20);
|
||||
}
|
||||
}
|
||||
result = SOiConclude(0, result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma dont_inline reset
|
||||
@@ -25,7 +25,7 @@ enum {
|
||||
|
||||
#define MAX_IOS_VECS 4
|
||||
|
||||
SDKDefineVersionEx(SSL, "Jun 21 2007", "13:10:10", 60726);
|
||||
const char* __SSLVersion = "<< RVL_SDK - SSL \trelease build: Jun 21 2007 13:10:10 (0x4199_60726) >>";
|
||||
|
||||
static BOOL sslRegistered = FALSE;
|
||||
static s32 l_initialized = 0;
|
||||
@@ -547,3 +547,10 @@ static u32 SSL_strnlen(const char* s, u32 n) {
|
||||
}
|
||||
return t - s;
|
||||
}
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".data"
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
#pragma pop
|
||||
|
||||
@@ -385,7 +385,7 @@ VFErr VFSysSetSyncMode(s32 i_handle_idx, u32 i_mode) {
|
||||
return VF_ERR_SYSTEM;
|
||||
}
|
||||
|
||||
u32 VFSysGetSyncMode(s32 i_handle_idx) {
|
||||
static u32 VFSysGetSyncMode(s32 i_handle_idx) {
|
||||
VFSys_handle* handle_p = VFSysGetHandleP(i_handle_idx);
|
||||
|
||||
if (handle_p == NULL || handle_p->drive.pf_disk_p == NULL || handle_p->device_p == NULL) {
|
||||
@@ -541,7 +541,7 @@ s32 VFSysHandleP2Idx(VFSys_handle* i_handle_p) {
|
||||
return VF_ERR_SYSTEM;
|
||||
}
|
||||
|
||||
VFSys_handle* VFSysVol2HandleP(PF_VOLUME* i_vol_p) {
|
||||
static VFSys_handle* VFSysVol2HandleP(PF_VOLUME* i_vol_p) {
|
||||
if (i_vol_p != NULL) {
|
||||
VFSys_handle* handle_p = VFSysGetHandleP(0);
|
||||
VFSys_handle* handle_end_p = &handle_p[l_vfsys_vol_max];
|
||||
@@ -728,7 +728,7 @@ static void VFiSysClearDeviceSDDirect(VFSys_deviceSD* o_sd_p) {
|
||||
o_sd_p->slotNo = -1;
|
||||
}
|
||||
|
||||
VFSys_device* VFSysGetDeviceP(s32 i_idx) {
|
||||
static VFSys_device* VFSysGetDeviceP(s32 i_idx) {
|
||||
VFSys_handle* handle_p = VFSysGetHandleP(i_idx);
|
||||
if (handle_p != NULL) {
|
||||
return handle_p->device_p;
|
||||
@@ -1170,7 +1170,7 @@ static VFErr VFiSysGetLastDeviceError_common(VFSys_handle* i_handle_p) {
|
||||
return VF_ERR_SYSTEM;
|
||||
}
|
||||
|
||||
void VFSysSetDevErrInfo(s32 i_handle_idx, VFErr i_err) {
|
||||
static void VFSysSetDevErrInfo(s32 i_handle_idx, VFErr i_err) {
|
||||
VFSys_handle* handle_p = VFSysGetHandleP(i_handle_idx);
|
||||
if (handle_p != NULL) {
|
||||
VFiSysSetDeviceErrInfo(handle_p, i_err);
|
||||
|
||||
@@ -53,8 +53,8 @@ static struct {
|
||||
VFi_NANDDelete delete; // 0x0C
|
||||
} l_nandFunc[PF_DRIVE_COUNT];
|
||||
|
||||
int VF_nand_retry_max;
|
||||
int VF_nand_sleep_msec;
|
||||
int VF_nand_retry_max;
|
||||
|
||||
#ifdef DEBUG
|
||||
#define VFi_NANDPrint(...) printf(__VA_ARGS__)
|
||||
@@ -130,7 +130,7 @@ s32 VFi_NandPrivateOpen(const char* path, NANDFileInfo* info, u8 accType) {
|
||||
VFi_NANDFunction(NANDPrivateOpen(path, info, accType));
|
||||
}
|
||||
|
||||
s32 VFi_NandWrite(NANDFileInfo* info, void* buf, u32 length) {
|
||||
inline s32 VFi_NandWrite(NANDFileInfo* info, void* buf, u32 length) {
|
||||
VFi_NANDFunction(NANDWrite(info, buf, length));
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ s32 VFi_NandPrivateCreateDir(const char* path, u8 perm, u8 attr) {
|
||||
VFi_NANDFunction(NANDPrivateCreateDir(path, perm, attr));
|
||||
}
|
||||
|
||||
s32 VFi_NandSeek(NANDFileInfo* info, s32 offset, s32 whence) {
|
||||
inline s32 VFi_NandSeek(NANDFileInfo* info, s32 offset, s32 whence) {
|
||||
VFi_NANDFunction(NANDSeek(info, offset, whence));
|
||||
}
|
||||
|
||||
@@ -177,12 +177,12 @@ static u8 _MakePermitForRVL(u8 i_perm) {
|
||||
return perm;
|
||||
}
|
||||
|
||||
s32 VFi_NandCreateSp(const char* path, u8 i_perm, u8 attr, u32 i_handleIdx) {
|
||||
inline s32 VFi_NandCreateSp(const char* path, u8 i_perm, u8 attr, u32 i_handleIdx) {
|
||||
u8 perm = _MakePermitForRVL(i_perm);
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDCreate tmpCreate;
|
||||
tmpCreate = l_nandFunc[i_handleIdx].create;
|
||||
if (tmpCreate != NULL) {
|
||||
if (tmpCreate) {
|
||||
return tmpCreate(path, perm, attr);
|
||||
}
|
||||
return VFi_NandCreate(path, perm, attr);
|
||||
@@ -197,7 +197,7 @@ s32 VFi_NandOpenSp(const char* path, void* info, u8 accType, u32 i_handleIdx) {
|
||||
NANDFileInfo* info_p = info;
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDOpen tmpOpen = l_nandFunc[i_handleIdx].open;
|
||||
if (tmpOpen != NULL) {
|
||||
if (tmpOpen) {
|
||||
return tmpOpen(path, info_p, accType);
|
||||
}
|
||||
return VFi_NandOpen(path, info_p, accType);
|
||||
@@ -208,10 +208,10 @@ s32 VFi_NandOpenSp(const char* path, void* info, u8 accType, u32 i_handleIdx) {
|
||||
return VFi_NandPrivateOpen(path, info_p, accType);
|
||||
}
|
||||
|
||||
s32 VFi_NandDeleteSp(const char* path, u32 i_handleIdx) {
|
||||
inline s32 VFi_NandDeleteSp(const char* path, u32 i_handleIdx) {
|
||||
if (i_handleIdx < PF_DRIVE_COUNT) {
|
||||
VFi_NANDDelete tmpDelete = l_nandFunc[i_handleIdx].delete;
|
||||
if (tmpDelete != NULL) {
|
||||
if (tmpDelete) {
|
||||
return tmpDelete(path);
|
||||
}
|
||||
return VFi_NandDelete(path);
|
||||
|
||||
@@ -134,7 +134,7 @@ static u32 _EventFlagAddressToHandleIdx(u32* event /* r3 */) {
|
||||
int i; // r31
|
||||
|
||||
for (i = 0; i < 0x1A; i++) {
|
||||
if ((u32*)((u8*)l_event + (i << 5)) == event) {
|
||||
if (&l_event[i].flag == event) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
@@ -157,12 +157,12 @@ SDDevIntrCallback _EventCallBack(u32 status /* r25 */, u32* data /* r27 */) {
|
||||
handle_p = VFSysGetHandleP(handleIdx);
|
||||
if ((u32)(status & 2) == 2) {
|
||||
*data = 1;
|
||||
if (handle_p != NULL) {
|
||||
if ((u32)handle_p != 0) {
|
||||
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r26
|
||||
if (pf_disk_p != NULL) {
|
||||
if ((u32)pf_disk_p != 0) {
|
||||
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r29
|
||||
VFipdm_disk_notify_media_eject(pf_disk_p);
|
||||
if ((device_p != NULL) && ((device_p->eventCallback) != NULL)) {
|
||||
if (((u32)device_p != 0) && ((u32)device_p->eventCallback != 0)) {
|
||||
device_p->eventCallback(2);
|
||||
}
|
||||
}
|
||||
@@ -170,23 +170,23 @@ SDDevIntrCallback _EventCallBack(u32 status /* r25 */, u32* data /* r27 */) {
|
||||
}
|
||||
if ((u32)(status & 1) == 1) {
|
||||
*data = 2;
|
||||
if (handle_p != NULL) {
|
||||
if ((u32)handle_p != 0) {
|
||||
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r31+0x14
|
||||
if (pf_disk_p != NULL) {
|
||||
if ((u32)pf_disk_p != 0) {
|
||||
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r28
|
||||
if ((device_p != NULL) && ((device_p->eventCallback) != NULL)) {
|
||||
if (((u32)device_p != 0) && ((u32)device_p->eventCallback != 0)) {
|
||||
device_p->eventCallback(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (handle_p != NULL) {
|
||||
if ((u32)handle_p != 0) {
|
||||
PDM_DISK* pf_disk_p = handle_p->drive.pf_disk_p; // r31+0x10
|
||||
if (pf_disk_p != NULL) {
|
||||
if ((u32)pf_disk_p != 0) {
|
||||
VFSys_deviceSD* device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(pf_disk_p); // r31+0xC
|
||||
if (device_p != NULL) {
|
||||
if ((u32)device_p != 0) {
|
||||
SDDev* dev_handle_p = (&device_p->drive); // r31+0x8
|
||||
if (dev_handle_p != NULL) {
|
||||
if ((u32)dev_handle_p != 0) {
|
||||
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, data);
|
||||
if (IOSErr != 0) {
|
||||
u32 stub = 0;
|
||||
@@ -273,12 +273,12 @@ static s32 sddrv_init(PDM_DISK* p_disk /* r28 */) {
|
||||
drive_p = NULL;
|
||||
device_p = NULL;
|
||||
dev_handle_p = NULL;
|
||||
if (p_disk == NULL) {
|
||||
if ((u32)p_disk == 0) {
|
||||
return -0x14;
|
||||
}
|
||||
drive_p = VFSysPDMDisk2DriveP(p_disk);
|
||||
device_p = (VFSys_deviceSD*)VFSysPDMDisk2DeviceP(p_disk);
|
||||
if ((drive_p == NULL) || (device_p == NULL)) {
|
||||
if (((u32)drive_p == 0) || ((u32)device_p == 0)) {
|
||||
return -0x14;
|
||||
}
|
||||
dev_handle_p = &device_p->drive;
|
||||
@@ -316,8 +316,8 @@ static s32 sddrv_init(PDM_DISK* p_disk /* r28 */) {
|
||||
ISD_UnmountCard(dev_handle_p);
|
||||
return IOSErr;
|
||||
}
|
||||
*(u32*)((u8*)l_event + (handleIdx << 5)) = 2;
|
||||
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, (u32*)((u8*)l_event + (handleIdx << 5)));
|
||||
l_event[handleIdx].flag = 2;
|
||||
IOSErr = ISD_RegisterDeviceIntrHandler(dev_handle_p, (SDDevIntrCallback)_EventCallBack, &l_event[handleIdx].flag);
|
||||
if (IOSErr != 0) {
|
||||
VFi_PrintInternalError(IOSErr, 0x1ED);
|
||||
dCommon_setLastDeviceErrorToDisk(p_disk, IOSErr);
|
||||
|
||||
@@ -8,6 +8,41 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
const u8 lbl_81695060 = 0;
|
||||
const u8 lbl_81695061 = 0x0F;
|
||||
const u8 lbl_81695062 = 0xAC;
|
||||
const u8 lbl_81695063 = 0;
|
||||
const u8 lbl_81695064 = 0;
|
||||
const u8 lbl_81695065 = 0x50;
|
||||
const u8 lbl_81695066 = 0xF2;
|
||||
const u8 lbl_81695067 = 0;
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
const u8 lbl_81697D70 = 0;
|
||||
const u8 lbl_81697D71 = 0x50;
|
||||
const u8 lbl_81697D72 = 0xF2;
|
||||
const u8 lbl_81697D73 = 0;
|
||||
const u8 lbl_81697D74 = 0;
|
||||
const u8 lbl_81697D75 = 0;
|
||||
const u8 lbl_81697D76 = 0;
|
||||
const u8 lbl_81697D77 = 0;
|
||||
#pragma pop
|
||||
|
||||
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
|
||||
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
|
||||
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
|
||||
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
|
||||
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
|
||||
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
|
||||
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
|
||||
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
|
||||
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
|
||||
extern void _savegpr_21();
|
||||
extern void _restgpr_21();
|
||||
|
||||
#define WAIT_FOR_OPERATION(...) \
|
||||
do { \
|
||||
while ((__VA_ARGS__)) { \
|
||||
@@ -134,56 +169,104 @@ s32 WDScanOnce(u8* scanBuffer, u32 scanBufferLen, WDScanParam* param) {
|
||||
s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
|
||||
WDVendorInfoElement* ieData;
|
||||
u32 ieLength = 0;
|
||||
WDVendorInfoElement readIE;
|
||||
u8 readIE[8];
|
||||
s32 result;
|
||||
|
||||
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
|
||||
u8 data[WD_VENDOR_LENGTH] = {0, 0x0F, 0xAC};
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
|
||||
memcpy(&readIE, ieData, sizeof(WDVendorInfoElement) + 2 /*?*/);
|
||||
if (memcmp(readIE.data, data, WD_VENDOR_LENGTH) == 0) {
|
||||
switch (readIE.mode) {
|
||||
case 1: {
|
||||
return WD_PRIVACY_MODE_DS_COMMUNICATION;
|
||||
}
|
||||
case 5: {
|
||||
return WD_PRIVACY_MODE_2;
|
||||
}
|
||||
case 2: {
|
||||
return WD_PRIVACY_MODE_7;
|
||||
}
|
||||
case 3:
|
||||
default: {
|
||||
return WD_PRIVACY_MODE_5;
|
||||
}
|
||||
data[0] = lbl_81695060;
|
||||
data[1] = lbl_81695061;
|
||||
data[2] = lbl_81695062;
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
|
||||
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
|
||||
if ((s32)readIE[5] == 3) {
|
||||
goto privacy_second;
|
||||
}
|
||||
if ((s32)readIE[5] >= 3) {
|
||||
goto privacy_rsn_high;
|
||||
}
|
||||
if ((s32)readIE[5] == 1) {
|
||||
goto privacy_rsn_mode1;
|
||||
}
|
||||
if ((s32)readIE[5] >= 1) {
|
||||
goto privacy_rsn_mode7;
|
||||
}
|
||||
goto privacy_second;
|
||||
privacy_rsn_high:
|
||||
if ((s32)readIE[5] == 5) {
|
||||
goto privacy_rsn_mode2;
|
||||
}
|
||||
if ((s32)readIE[5] >= 5) {
|
||||
goto privacy_second;
|
||||
}
|
||||
goto privacy_rsn_mode5;
|
||||
}
|
||||
} else {
|
||||
u8 findData[WD_VENDOR_LENGTH] = {0x00, 0x50, 0xF2};
|
||||
if (WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
|
||||
u8 data[WD_VENDOR_LENGTH] = {0x00, 0x50, 0xF2};
|
||||
}
|
||||
goto privacy_second;
|
||||
|
||||
memcpy(&readIE, ieData, sizeof(WDVendorInfoElement));
|
||||
if (memcmp(readIE.data, data, WD_VENDOR_LENGTH) == 0) {
|
||||
switch (readIE.mode) {
|
||||
case 1: {
|
||||
return WD_PRIVACY_MODE_DS_COMMUNICATION;
|
||||
}
|
||||
case 5: {
|
||||
return WD_PRIVACY_MODE_2;
|
||||
}
|
||||
case 2: {
|
||||
return WD_PRIVACY_MODE_4;
|
||||
}
|
||||
case 3:
|
||||
default: {
|
||||
return WD_PRIVACY_MODE_6;
|
||||
}
|
||||
}
|
||||
privacy_rsn_mode1:
|
||||
return WD_PRIVACY_MODE_DS_COMMUNICATION;
|
||||
privacy_rsn_mode7:
|
||||
return WD_PRIVACY_MODE_7;
|
||||
privacy_rsn_mode5:
|
||||
return WD_PRIVACY_MODE_5;
|
||||
privacy_rsn_mode2:
|
||||
return WD_PRIVACY_MODE_2;
|
||||
|
||||
privacy_second: {
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
u8 findData[WD_VENDOR_LENGTH];
|
||||
|
||||
findData[0] = lbl_81697D70;
|
||||
findData[1] = lbl_81697D71;
|
||||
findData[2] = lbl_81697D72;
|
||||
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
data[0] = lbl_81695064;
|
||||
data[1] = lbl_81695065;
|
||||
data[2] = lbl_81695066;
|
||||
|
||||
{
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));
|
||||
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) != 0) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
if ((s32)readIE[5] == 3) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
if ((s32)readIE[5] >= 3) {
|
||||
goto privacy_wpa_high;
|
||||
}
|
||||
if ((s32)readIE[5] == 1) {
|
||||
goto privacy_wpa_mode1;
|
||||
}
|
||||
if ((s32)readIE[5] >= 1) {
|
||||
goto privacy_wpa_mode4;
|
||||
}
|
||||
goto privacy_fallback;
|
||||
privacy_wpa_high:
|
||||
if ((s32)readIE[5] == 5) {
|
||||
goto privacy_wpa_mode2;
|
||||
}
|
||||
if ((s32)readIE[5] >= 5) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
goto privacy_wpa_mode6;
|
||||
}
|
||||
}
|
||||
|
||||
privacy_wpa_mode1:
|
||||
return WD_PRIVACY_MODE_DS_COMMUNICATION;
|
||||
privacy_wpa_mode4:
|
||||
return WD_PRIVACY_MODE_4;
|
||||
privacy_wpa_mode6:
|
||||
return WD_PRIVACY_MODE_6;
|
||||
privacy_wpa_mode2:
|
||||
return WD_PRIVACY_MODE_2;
|
||||
|
||||
privacy_fallback:
|
||||
if (bssDesc != NULL && (bssDesc->capabilities & 0x10) == 0x10) {
|
||||
result = WD_PRIVACY_MODE_8;
|
||||
} else {
|
||||
@@ -227,39 +310,80 @@ BOOL WDFindInformationElement(WDInfoElement** outIE, u32* outIELength, WDBssDesc
|
||||
return found;
|
||||
}
|
||||
|
||||
BOOL WDiFindVendorSpecificIE(WDVendorInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id, u8* data, u8 mode) {
|
||||
BOOL found = FALSE;
|
||||
|
||||
if (bssDesc != NULL) {
|
||||
u8* ptr = (u8*)(bssDesc + 1);
|
||||
WDVendorInfoElement* infoElement = (WDVendorInfoElement*)ptr;
|
||||
int offset;
|
||||
|
||||
for (offset = 0; offset < bssDesc->ieLength; offset = (infoElement->length + offset) + sizeof(WDInfoElement)) {
|
||||
u8 gotMode;
|
||||
infoElement = (WDVendorInfoElement*)((u8*)ptr + offset);
|
||||
if (infoElement->id != (u32)id || (gotMode = infoElement->mode, memcmp(infoElement->data, data, WD_VENDOR_LENGTH)) || gotMode != mode) {
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (offset < bssDesc->ieLength) {
|
||||
if (outIE != NULL) {
|
||||
*outIE = infoElement + 1;
|
||||
}
|
||||
if (outIELength != NULL) {
|
||||
*outIELength = infoElement->length - (sizeof(WDVendorInfoElement) - sizeof(WDInfoElement));
|
||||
}
|
||||
found = TRUE;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
if (outIE != NULL) {
|
||||
*outIE = NULL;
|
||||
}
|
||||
if (outIELength != NULL) {
|
||||
*outIELength = 0;
|
||||
}
|
||||
}
|
||||
return found;
|
||||
asm BOOL WDiFindVendorSpecificIE(WDVendorInfoElement** outIE, u32* outIELength, WDBssDesc* bssDesc, int id, u8* data, u8 mode) {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
addi r11, r1, 0x40
|
||||
bl _savegpr_21
|
||||
cmpwi r5, 0
|
||||
mr r30, r3
|
||||
mr r31, r4
|
||||
mr r21, r6
|
||||
mr r22, r7
|
||||
mr r23, r8
|
||||
li r28, 0
|
||||
beq WDiFindVendorSpecificIE_done
|
||||
addi r26, r5, 0x3e
|
||||
lhz r29, 0x3c(r5)
|
||||
mr r25, r26
|
||||
li r27, 0
|
||||
b WDiFindVendorSpecificIE_loop_check
|
||||
WDiFindVendorSpecificIE_loop:
|
||||
lbzx r0, r26, r27
|
||||
add r25, r26, r27
|
||||
cmplw r0, r21
|
||||
bne WDiFindVendorSpecificIE_next
|
||||
lbz r24, 5(r25)
|
||||
mr r4, r22
|
||||
addi r3, r25, 2
|
||||
li r5, 3
|
||||
bl memcmp
|
||||
cmpwi r3, 0
|
||||
bne WDiFindVendorSpecificIE_next
|
||||
cmplw r24, r23
|
||||
beq WDiFindVendorSpecificIE_found
|
||||
WDiFindVendorSpecificIE_next:
|
||||
lbz r0, 1(r25)
|
||||
add r3, r0, r27
|
||||
addi r27, r3, 2
|
||||
WDiFindVendorSpecificIE_loop_check:
|
||||
cmpw r27, r29
|
||||
blt WDiFindVendorSpecificIE_loop
|
||||
WDiFindVendorSpecificIE_found:
|
||||
cmpw r27, r29
|
||||
bge WDiFindVendorSpecificIE_done
|
||||
cmpwi r30, 0
|
||||
beq WDiFindVendorSpecificIE_no_out
|
||||
addi r0, r25, 6
|
||||
stw r0, 0(r30)
|
||||
WDiFindVendorSpecificIE_no_out:
|
||||
cmpwi r31, 0
|
||||
beq WDiFindVendorSpecificIE_set_found
|
||||
lbz r3, 1(r25)
|
||||
addi r0, r3, -4
|
||||
stw r0, 0(r31)
|
||||
WDiFindVendorSpecificIE_set_found:
|
||||
li r28, 1
|
||||
WDiFindVendorSpecificIE_done:
|
||||
cmpwi r28, 0
|
||||
bne WDiFindVendorSpecificIE_return
|
||||
cmpwi r30, 0
|
||||
beq WDiFindVendorSpecificIE_no_out_null
|
||||
li r0, 0
|
||||
stw r0, 0(r30)
|
||||
WDiFindVendorSpecificIE_no_out_null:
|
||||
cmpwi r31, 0
|
||||
beq WDiFindVendorSpecificIE_return
|
||||
li r0, 0
|
||||
stw r0, 0(r31)
|
||||
WDiFindVendorSpecificIE_return:
|
||||
addi r11, r1, 0x40
|
||||
mr r3, r28
|
||||
bl _restgpr_21
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user