Compare commits
230 Commits
agent/w092
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2aca3011ab | ||
|
|
efda1f0093 | ||
|
|
115bc95101 | ||
|
|
cbac1eda5a | ||
|
|
f0de86aa16 | ||
|
|
215f40f835 | ||
|
|
5b364355cd | ||
|
|
ea8e69528f | ||
|
|
2a5fbdb4b9 | ||
|
|
dd3cd80d9b | ||
|
|
3cbe527d23 | ||
|
|
3ab6d87c3d | ||
|
|
40653c3c02 | ||
|
|
f0829ff810 | ||
|
|
ffdd7b58e0 | ||
|
|
1a0f83a156 | ||
|
|
a3d088e4d3 | ||
|
|
3b90bd66c6 | ||
|
|
b395269be6 | ||
|
|
60bc67e097 | ||
|
|
4e8223f3d4 | ||
|
|
3f36d5f4cc | ||
|
|
1f0dc64062 | ||
|
|
5db0cd6086 | ||
|
|
54b44a3534 | ||
|
|
1493baaba0 | ||
|
|
22dd088277 | ||
|
|
1bbc40cb3b | ||
|
|
e6bf9cc669 | ||
|
|
ffd9cc4a69 | ||
|
|
eb8f78788d | ||
|
|
889823ed67 | ||
|
|
7dea4122fc | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f | ||
|
|
01a73b600f | ||
|
|
83b577cf62 | ||
|
|
f67990d237 | ||
|
|
ad85ad1537 | ||
|
|
f32665703f | ||
|
|
e062e1c669 | ||
|
|
76a60f8c1a | ||
|
|
63579601e2 | ||
|
|
e46bac9a1b | ||
|
|
1f224c53c1 | ||
|
|
30e2147479 | ||
|
|
6ffcbf8f46 | ||
|
|
47add32987 | ||
|
|
e0ea552982 | ||
|
|
c7949ac4f0 | ||
|
|
e697514b7b | ||
|
|
32c3f7f2cd | ||
|
|
1618565c1d | ||
|
|
6040414eec | ||
|
|
08acc800f1 | ||
|
|
0703b62968 | ||
|
|
86c3cacc2d | ||
|
|
f7e6fc5387 | ||
|
|
dfbb774ce4 | ||
|
|
9b69048f06 | ||
|
|
602b10ed43 | ||
|
|
f0a91338f4 | ||
|
|
ff568a273c | ||
|
|
9f6ef656fd | ||
|
|
9d2f607b3f | ||
|
|
c836ab8bae | ||
|
|
b889c52efc | ||
|
|
282c29b2c7 | ||
|
|
27e37fd7ee | ||
|
|
00051c32c6 | ||
|
|
80fecf3aa3 | ||
|
|
37724c57d6 | ||
|
|
1a32db7bdc | ||
|
|
2aab31c1f9 | ||
|
|
24c84f5bfc | ||
|
|
73de5786da | ||
|
|
3abcd34252 | ||
|
|
5c20a11fa8 | ||
|
|
f85a98a6e3 | ||
|
|
137ee3242a | ||
|
|
2368a9a774 | ||
|
|
90399bb6cf | ||
|
|
fc831357ea | ||
|
|
e2191ae933 | ||
|
|
7d77c095c0 | ||
|
|
db8ff7e141 | ||
|
|
2cb6c2dfae | ||
|
|
6f96235605 | ||
|
|
367b042e63 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb | ||
|
|
dca6cd9aef | ||
|
|
a0700bf908 | ||
|
|
de058b4298 | ||
|
|
c5468cbe50 | ||
|
|
62591733eb | ||
|
|
e2488b073a | ||
|
|
9a8de22195 | ||
|
|
a6bf0e5f4f | ||
|
|
d434f5b897 | ||
|
|
0adc759b42 | ||
|
|
9c55b47c1d | ||
|
|
081329daa8 | ||
|
|
a348c9777a | ||
|
|
d5204f5c62 | ||
|
|
cedc1f1390 | ||
|
|
ff0cce33f6 | ||
|
|
2beeb23a47 | ||
|
|
35d9ed53b1 | ||
|
|
015d50906c | ||
|
|
348da5bd89 | ||
|
|
cdceb82200 | ||
|
|
1b56ea5051 | ||
|
|
3946983f96 | ||
|
|
85d75cd0cf | ||
|
|
af39f2678f | ||
|
|
d613662c54 | ||
|
|
0e6e235004 | ||
|
|
020e1b6f0b | ||
|
|
3440aab039 | ||
|
|
dab806eaa2 | ||
|
|
f4fd16f88f | ||
|
|
3d8de1a356 | ||
|
|
8e43db0528 | ||
|
|
21c9b95b1b | ||
|
|
d4bdd3462c | ||
|
|
f7d81a0196 | ||
|
|
4f35874d02 | ||
|
|
0a5cbaf78e | ||
|
|
6e7c016ae3 | ||
|
|
e60306db62 | ||
|
|
5d0ced6a15 | ||
|
|
858a507ddf | ||
|
|
ce424f1a3e | ||
|
|
bcb37e07ef | ||
|
|
11094c638a | ||
|
|
cb49bde9c6 | ||
|
|
df9fd72e87 | ||
|
|
0c554a1602 | ||
|
|
f00336cc8b | ||
|
|
842bbc6942 | ||
|
|
ab01520044 | ||
|
|
5f948d3f3a | ||
|
|
699f844395 | ||
|
|
3afb9d8425 | ||
|
|
72c3f4ba2d | ||
|
|
905c45b998 | ||
|
|
5a849425b1 | ||
|
|
fd11ddb195 | ||
|
|
d9b51418b9 | ||
|
|
87e7ab6922 | ||
|
|
d186251506 | ||
|
|
cb58211725 | ||
|
|
2dbf80c418 | ||
|
|
faee1f779d | ||
|
|
a324e9a843 | ||
|
|
2bddfcde52 | ||
|
|
776b7981df | ||
|
|
539693c76a | ||
|
|
3134c4c05a | ||
|
|
d60d10868a | ||
|
|
735b0ab878 | ||
|
|
ea8d4d3b8a | ||
|
|
7329402a2c | ||
|
|
e46168062b | ||
|
|
b2074a70d7 | ||
|
|
98648d19bb | ||
|
|
d03219249b | ||
|
|
3c23585249 | ||
|
|
b4745ba2da | ||
|
|
fb3e7bd49a | ||
|
|
e34eac26ef | ||
|
|
565d039c01 | ||
|
|
46d7bc07cf | ||
|
|
6ec48a1b9a | ||
|
|
07b3a2b579 | ||
|
|
e1b46d09e8 | ||
|
|
a4d46cf340 | ||
|
|
46e8217f2f | ||
|
|
028e36cce2 | ||
|
|
6abc1f9bd8 | ||
|
|
b004e2be89 | ||
|
|
5c1794ef25 | ||
|
|
c393274640 | ||
|
|
3bfbb0c9c3 | ||
|
|
cdc22045a7 | ||
|
|
976fbeb804 | ||
|
|
725599dba0 | ||
|
|
4d0c9e70d6 | ||
|
|
131d8f743c | ||
|
|
23067a3477 | ||
|
|
c7958e9f67 | ||
|
|
d9ee532e07 | ||
|
|
1d5184b30e | ||
|
|
a27b6aa96e | ||
|
|
112149c8e5 | ||
|
|
45a6d499ec | ||
|
|
813110e681 | ||
|
|
f4a48bd996 | ||
|
|
f1590c832e | ||
|
|
d6cafeab4d | ||
|
|
c047b544c1 | ||
|
|
82dbaac35d | ||
|
|
e8d4107b11 | ||
|
|
1b96b3956b | ||
|
|
81c36c4db0 | ||
|
|
355564cd77 | ||
|
|
17b5d5946b | ||
|
|
ed5a62397d | ||
|
|
2a34d3703b | ||
|
|
3f5248be4c | ||
|
|
59e127f89a | ||
|
|
787aa9d334 | ||
|
|
30809a5b05 | ||
|
|
c21ae517d5 | ||
|
|
5c7d7ca74a | ||
|
|
7a94e90a6e | ||
|
|
cec99e3cf8 | ||
|
|
6172b57647 | ||
|
|
bed8e32e57 | ||
|
|
930e8f4ecf | ||
|
|
c835bedbc1 | ||
|
|
5981234728 | ||
|
|
3b2304bd75 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 98.06% | 84.71% | 58.20% | 90.34% |
|
||||
| 99.38% | 88.00% | 62.36% | 92.07% |
|
||||
|
||||
units 778/1027 complete, functions 12070/12563 matched.
|
||||
units 920/1027 complete, functions 12225/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
||||
.data start:0x8165F818 end:0x8165F8F0
|
||||
.sdata2 start:0x81694E10 end:0x81694E28
|
||||
|
||||
src/keyboard/tiManager.cpp:
|
||||
src/keyboard/tiKeyboard.cpp:
|
||||
.text start:0x81437558 end:0x81439608
|
||||
.ctors start:0x8160D208 end:0x8160D20C
|
||||
.data start:0x8165F8F0 end:0x81660378
|
||||
@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
|
||||
|
||||
src/keyboard/MyTiLetterForm.cpp:
|
||||
.text start:0x81444730 end:0x814454D8
|
||||
.rodata start:0x816168B8 end:0x81616B88
|
||||
.rodata start:0x816168B8 end:0x81616BC8
|
||||
.data start:0x81668860 end:0x81668CD8
|
||||
.sdata2 start:0x81694EB0 end:0x81694ED0
|
||||
.sdata start:0x81697528 end:0x81697570
|
||||
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
|
||||
src/keyboard/tiHwKeyboard.cpp:
|
||||
.bss start:0x810C8940 end:0x810C8950
|
||||
.text start:0x81448AA4 end:0x81449C98
|
||||
.rodata start:0x81616B88 end:0x81616C78
|
||||
.rodata start:0x81616BC8 end:0x81616C78
|
||||
.data start:0x81668EF8 end:0x81669018
|
||||
.sdata2 start:0x81694EF8 end:0x81694F08
|
||||
.sdata start:0x81697570 end:0x81697578
|
||||
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
|
||||
extab start:0x81330748 end:0x81330760
|
||||
extabindex start:0x8133147C end:0x813314A0
|
||||
.text start:0x814813FC end:0x81482840
|
||||
.data start:0x8166B2B0 end:0x8166B3D0
|
||||
.data start:0x8166B2B0 end:0x8166B3A8
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
|
||||
extab start:0x81330760 end:0x81330770
|
||||
@@ -1417,6 +1417,7 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
|
||||
extab start:0x81330770 end:0x813307A8
|
||||
extabindex start:0x813314B8 end:0x8133150C
|
||||
.text start:0x8148302C end:0x8148447C
|
||||
.data start:0x8166B3A8 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
|
||||
.text start:0x8148447C end:0x81484484
|
||||
@@ -4192,11 +4193,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
|
||||
.sbss start:0x816996C0 end:0x816996E0
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv.c:
|
||||
.bss start:0x811AF460 end:0x811AF6C0
|
||||
.bss start:0x811AF460 end:0x811AF6C0 align:32
|
||||
.text start:0x815EA41C end:0x815ED20C
|
||||
.rodata start:0x816329E8 end:0x81632B58
|
||||
.data start:0x81690D18 end:0x81691728
|
||||
.sbss start:0x816996E0 end:0x81699708
|
||||
.sbss start:0x816996E0 end:0x81699708 align:32
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
|
||||
.text start:0x815ED20C end:0x815ED324
|
||||
|
||||
@@ -1385,19 +1385,19 @@ getDiskBannerData__Q33ipl7channel7ManagerFib = .text:0x81339FB0; // type:functio
|
||||
titleIDtoPageIndex__Q33ipl7channel7ManagerCFUxPiPi = .text:0x8133A2BC; // type:function size:0xA0
|
||||
getLockedMsgFromBuf__Q33ipl7channel7ManagerCFPCQ33ipl7channel22SChanMgrDiskInMessages = .text:0x8133A35C; // type:function size:0xA8
|
||||
nand_error_handling__Q33ipl7channel7ManagerFi = .text:0x8133A404; // type:function size:0xDC
|
||||
fn_8133A4E0__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
fn_8133A57C__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
fn_8133A5B8__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
fn_8133A5F0__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
fn_8133A634__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
fn_8133A678__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
fn_8133A6B8__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
fn_8133A73C__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
fn_8133A7A4__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
fn_8133A85C__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
fn_8133A924__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
fn_8133A9F0__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
fn_8133AA50__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
findEntryByTitleId__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
getBannerCSIdx__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
getSoundSize__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
needsNetSetting__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
usesAltSound__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
isMissingTicket__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
isNewsChannelV6Plus__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
isOperaChannel__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
readBannerMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
readSoundMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
readBannerCSAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
clearTmpChannel__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
unloadBanner__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
__ct__Q33ipl7channel20ChannelScriptManagerFv = .text:0x8133AA80; // type:function size:0x10
|
||||
create__Q33ipl7channel20ChannelScriptManagerFPQ23EGG7ExpHeap = .text:0x8133AA90; // type:function size:0x90
|
||||
init__Q33ipl7channel20ChannelScriptManagerFPQ33ipl4nand4FilePQ33ipl7channel9RsoThread = .text:0x8133AB20; // type:function size:0x3D4
|
||||
@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
|
||||
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
|
||||
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30
|
||||
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20
|
||||
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
|
||||
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
|
||||
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
|
||||
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
|
||||
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
|
||||
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8
|
||||
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
|
||||
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_check_sd_app_titles__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260
|
||||
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4
|
||||
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
|
||||
@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
|
||||
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
|
||||
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
|
||||
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
|
||||
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
|
||||
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
isTitleCached = .text:0x813597A0; // type:function size:0x40
|
||||
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
|
||||
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
|
||||
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70
|
||||
@@ -2095,7 +2095,7 @@ stt_wait_fns_msg__Q23ipl9CdbBackupFv = .text:0x8135B004; // type:function size:0
|
||||
stt_clean_up_back__Q23ipl9CdbBackupFv = .text:0x8135B030; // type:function size:0x60
|
||||
stt_wait_terminate__Q23ipl9CdbBackupFv = .text:0x8135B090; // type:function size:0x60
|
||||
error_handling__Q23ipl9CdbBackupFv = .text:0x8135B0F0; // type:function size:0xD0
|
||||
fn_8135B1C0__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
getProgressPercent__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
cdb_backup_delete_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B1E8; // type:function size:0x8C
|
||||
cdb_backup_delete_task___3iplFPv = .text:0x8135B274; // type:function size:0xDC
|
||||
cdb_backup_move_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B350; // type:function size:0xBC
|
||||
@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
|
||||
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
|
||||
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
|
||||
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
|
||||
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
|
||||
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
|
||||
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
|
||||
@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
|
||||
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
|
||||
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
|
||||
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
|
||||
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
|
||||
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
|
||||
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
|
||||
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
|
||||
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
|
||||
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
|
||||
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
|
||||
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
|
||||
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
|
||||
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
|
||||
@@ -5829,7 +5829,7 @@ doAfterDrawProcess__Q39textinput9inputform4BaseFPCwUlRCQ49textinput10textdrawer4
|
||||
finishDraw__Q39textinput9inputform4BaseFUl = .text:0x81427DC0; // type:function size:0x4
|
||||
addSender__Q29textinput15CommandReceiverFPQ29textinput13CommandSender = .text:0x81427DC4; // type:function size:0x8
|
||||
getDrawModifyStartLine__Q39textinput10textdrawer4BaseCFv = .text:0x81427DCC; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
getStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DDC; // type:function size:0x8
|
||||
setVIWidth__Q39textinput10textdrawer4BaseFf = .text:0x81427DE4; // type:function size:0x8
|
||||
setCandidateBox__Q39textinput12candidatebox18CandidateBoxCallerFPQ39textinput12candidatebox4Base = .text:0x81427DEC; // type:function size:0x8
|
||||
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
|
||||
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
|
||||
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
|
||||
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
|
||||
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
|
||||
pfstub_attach = .text:0x815E7404; // type:function size:0x50
|
||||
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
|
||||
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
|
||||
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
|
||||
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
|
||||
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
|
||||
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
|
||||
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
|
||||
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
|
||||
@@ -13986,17 +13986,17 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
|
||||
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
|
||||
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
|
||||
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
|
||||
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
|
||||
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
|
||||
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
|
||||
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
|
||||
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
|
||||
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
|
||||
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
|
||||
lbl_81616C98 = .rodata:0x81616C98; // type:object size:0x10
|
||||
lbl_81616CA8 = .rodata:0x81616CA8; // type:object size:0x10
|
||||
lbl_81616CB8 = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
|
||||
CHANSVmConstStringObjectNaN = .rodata:0x81616C88; // type:object size:0x10
|
||||
CHANSVmConstStringObjectInfinity = .rodata:0x81616C98; // type:object size:0x10
|
||||
CHANSVmConstStringObjectMinusInfinity = .rodata:0x81616CA8; // type:object size:0x10
|
||||
CHANSVmConstStringObjectComma = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
|
||||
CHANSVmConstStringDataEmpty = .rodata:0x81616CC8; // type:object size:0x10
|
||||
CHANSVmConstStringObjectUndefined_ = .rodata:0x81616CD8; // type:object size:0x50
|
||||
lbl_81616D28 = .rodata:0x81616D28; // type:object size:0x20
|
||||
scFloatConstantList = .rodata:0x81616D28; // type:object size:0x20
|
||||
VmTypeConvertFuncTbl = .rodata:0x81616D48; // type:object size:0x90
|
||||
VmResultTypeTbl = .rodata:0x81616DD8; // type:object size:0xB4
|
||||
VmArrayPropertyTbl = .rodata:0x81616E8C; // type:object size:0xC data:4byte
|
||||
@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
|
||||
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
|
||||
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
|
||||
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
|
||||
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
|
||||
@@ -14736,7 +14736,7 @@ lbl_81639189 = .data:0x81639189; // type:object size:0x39 data:string
|
||||
jumptable_816391C4 = .data:0x816391C4; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl8savedata7Manager = .data:0x816391F4; // type:object size:0xC
|
||||
__vt__Q33ipl7channel9RsoThread = .data:0x81639200; // type:object size:0x2C
|
||||
lbl_81639230 = .data:0x81639230; // type:object size:0x41 data:string
|
||||
scRsoFatalMsg = .data:0x81639230; // type:object size:0x41 data:string
|
||||
jumptable_81639278 = .data:0x81639278; // type:object size:0x44 scope:local
|
||||
lbl_816392BC = .data:0x816392BC; // type:object size:0xB data:string
|
||||
lbl_816392C7 = .data:0x816392C7; // type:object size:0x11 data:string
|
||||
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
|
||||
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
|
||||
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
|
||||
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
|
||||
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
|
||||
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
|
||||
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
|
||||
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
|
||||
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
|
||||
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
|
||||
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
|
||||
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
|
||||
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
|
||||
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
|
||||
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
|
||||
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
|
||||
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
|
||||
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
|
||||
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
|
||||
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
|
||||
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
|
||||
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
|
||||
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
|
||||
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
|
||||
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
|
||||
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
|
||||
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
|
||||
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
|
||||
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
|
||||
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
|
||||
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
|
||||
...data.0 = .data:0x8164C688; // type:label scope:local
|
||||
@@ -15796,20 +15796,20 @@ __vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
|
||||
@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
|
||||
lbl_8164D12D = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
lbl_8164D153 = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
lbl_8164D17E = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
lbl_8164D1AA = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
lbl_8164D1B5 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
lbl_8164D1BF = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
lbl_8164D1C9 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
lbl_8164D1D3 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
lbl_8164D1DF = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
lbl_8164D1E9 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
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
|
||||
scBrlan_SaveDataIn = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
scBrlan_SaveDataOut = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
scBrlan_SaveDataFocusIn = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
scBrlan_SaveDataFocusOut = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
scPaneName_N_Data16x9 = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
scPaneName_N_Data4x3 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_01 = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_00 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari16x9 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
scPaneName_N_Data_01 = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari4x3 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
scPaneName_N_Data_00 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
scPaneName_DataBaseCover_00 = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
scPaneName_DataBaseCover_01 = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
|
||||
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
|
||||
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
|
||||
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
|
||||
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
|
||||
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
|
||||
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
|
||||
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
|
||||
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
|
||||
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
|
||||
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
|
||||
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
|
||||
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
|
||||
@@ -15968,61 +15968,61 @@ s_time_num__Q23ipl5scene = .data:0x8164E1D8; // type:object size:0x28 scope:loca
|
||||
@10797 = .data:0x8164E251; // type:object size:0x1A scope:local data:string
|
||||
@10804 = .data:0x8164E26B; // type:object size:0x19 scope:local data:string
|
||||
@10848 = .data:0x8164E284; // type:object size:0xA scope:local data:string
|
||||
lbl_8164E290 = .data:0x8164E290; // type:object size:0x9 data:string
|
||||
scCursur_a = .data:0x8164E290; // type:object size:0x9 data:string
|
||||
lbl_8164E299 = .data:0x8164E299; // type:object size:0x1B data:string
|
||||
lbl_8164E2B4 = .data:0x8164E2B4; // type:object size:0x1A data:string
|
||||
lbl_8164E2CE = .data:0x8164E2CE; // type:object size:0x19 data:string
|
||||
lbl_8164E2E8 = .data:0x8164E2E8; // type:object size:0xC
|
||||
lbl_8164E2F4 = .data:0x8164E2F4; // type:object size:0xA data:string
|
||||
lbl_8164E300 = .data:0x8164E300; // type:object size:0x28
|
||||
lbl_8164E328 = .data:0x8164E328; // type:object size:0x387
|
||||
lbl_8164E6AF = .data:0x8164E6AF; // type:object size:0x20
|
||||
lbl_8164E6CF = .data:0x8164E6CF; // type:object size:0x12 data:string
|
||||
lbl_8164E6E1 = .data:0x8164E6E1; // type:object size:0x12 data:string
|
||||
lbl_8164E6F3 = .data:0x8164E6F3; // type:object size:0x12 data:string
|
||||
lbl_8164E705 = .data:0x8164E705; // type:object size:0x19 data:string
|
||||
lbl_8164E71E = .data:0x8164E71E; // type:object size:0x26 data:string
|
||||
lbl_8164E744 = .data:0x8164E744; // type:object size:0x1F data:string
|
||||
lbl_8164E768 = .data:0x8164E768; // type:object size:0xC data:string
|
||||
lbl_8164E774 = .data:0x8164E774; // type:object size:0xC data:string
|
||||
lbl_8164E780 = .data:0x8164E780; // type:object size:0xD data:string
|
||||
lbl_8164E78D = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
lbl_8164E79A = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
lbl_8164E7A6 = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
lbl_8164E7B2 = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
lbl_8164E7C0 = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
scModuleData = .data:0x8164E328; // type:object size:0x387
|
||||
scBrlan_RsoFmt = .data:0x8164E6AF; // type:object size:0x20
|
||||
scBrlyt_my_IplTop_b = .data:0x8164E6CF; // type:object size:0x12 data:string
|
||||
scBrlan_my_IplTop_b = .data:0x8164E6E1; // type:object size:0x12 data:string
|
||||
scBrlyt_my_IplTop_d = .data:0x8164E6F3; // type:object size:0x12 data:string
|
||||
scBrlyt_my_IplTopBalloon_a = .data:0x8164E705; // type:object size:0x19 data:string
|
||||
scBrlan_BalloonInOut = .data:0x8164E71E; // type:object size:0x26 data:string
|
||||
scSE_BALLOON = .data:0x8164E744; // type:object size:0x1F data:string
|
||||
scGroup_G_FocusBtnA = .data:0x8164E768; // type:object size:0xC data:string
|
||||
scGroup_G_FocusBtnB = .data:0x8164E774; // type:object size:0xC data:string
|
||||
scGroup_G_SelectBtnA = .data:0x8164E780; // type:object size:0xD data:string
|
||||
scGroup_G_SelectBtnB = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
scGroup_G_OnOffBtnA = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
scGroup_G_OnOffBtnB = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
scGroup_G_ChangeTextA = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
scGroup_G_ChangeTextB = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
scAnimGroups__Q23ipl5scene = .data:0x8164E7D0; // type:object size:0x24
|
||||
lbl_8164E7F4 = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
lbl_8164E813 = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
lbl_8164E830 = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
lbl_8164E84E = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
lbl_8164E866 = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
lbl_8164E87D = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
lbl_8164E89C = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
lbl_8164E8BA = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
lbl_8164E8D4 = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
lbl_8164E8F0 = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
scBrlan_my_ChTop_a_FocusBtnA_off = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_FocusBtn_on = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
scBrlan_my_ChTop_a_SelectBtn_Ac = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_OffBtn = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
scBrlan_my_ChTop_a_OnBtn = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextOut = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextIn = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_ChangeIn = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
scBrlan_my_ChTop_a_ChangeRoop = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
scBrlan_my_ChTop_a_ChangeOut = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
scAnimNames__Q23ipl5scene = .data:0x8164E90C; // type:object size:0x28
|
||||
lbl_8164E934 = .data:0x8164E934; // type:object size:0xD data:string
|
||||
lbl_8164E941 = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
lbl_8164E954 = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
scBrlan_banner = .data:0x8164E934; // type:object size:0xD data:string
|
||||
scBrlan_banner_Start = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
scBrlan_banner_Loop = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
scBannerAnims__Q23ipl5scene = .data:0x8164E968; // type:object size:0xC
|
||||
lbl_8164E974 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
lbl_8164E97F = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
scGroup_G_Comment0 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
scGroup_G_DiskIn = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
scDiskGroups__Q23ipl5scene = .data:0x8164E988; // type:object size:0x14 data:4byte
|
||||
lbl_8164E99C = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
lbl_8164E9B4 = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
lbl_8164E9D0 = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
lbl_8164E9EB = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
lbl_8164EA05 = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
lbl_8164EA20 = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
lbl_8164EA39 = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
lbl_8164EA55 = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
lbl_8164EA6F = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
lbl_8164EA8D = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
scBrlan_my_DiskCh_a_Start = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
scBrlan_my_DiskCh_a_DiskStart = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_DiskLoop = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskEnd = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_DiskLost = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskIn = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
scBrlan_my_DiskCh_a_DiskEject = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_Unknown = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_UnknownLoop = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
scBrlan_my_DiskCh_a_UnknwnEject = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
scDiskAnimNames__Q23ipl5scene = .data:0x8164EAAC; // type:object size:0x28 data:4byte
|
||||
lbl_8164EAD4 = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
lbl_8164EAE6 = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
scBrlyt_my_DiskCh_a = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
scBrlan_my_GCTop_a_BackLoop = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
scWidePanes__Q23ipl5scene = .data:0x8164EB00; // type:object size:0x30
|
||||
lbl_8164EB30 = .data:0x8164EB30; // type:object size:0xC data:string
|
||||
lbl_8164EB3C = .data:0x8164EB3C; // type:object size:0xCC
|
||||
@@ -17456,19 +17456,19 @@ __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane = .data:0x81
|
||||
__vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane = .data:0x8165C730; // type:object size:0x28
|
||||
__vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; // type:object size:0x20
|
||||
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
|
||||
lbl_8165C820 = .data:0x8165C820; // type:object size:0xE data:string
|
||||
lbl_8165C830 = .data:0x8165C830; // type:object size:0x10 data:string
|
||||
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
|
||||
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
|
||||
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
|
||||
lbl_8165C8C0 = .data:0x8165C8C0; // type:object size:0xC data:string
|
||||
lbl_8165C8CC = .data:0x8165C8CC; // type:object size:0x11 data:string
|
||||
lbl_8165C8E0 = .data:0x8165C8E0; // type:object size:0xD data:string
|
||||
lbl_8165C8F0 = .data:0x8165C8F0; // type:object size:0x10 data:string
|
||||
lbl_8165C900 = .data:0x8165C900; // type:object size:0x11 data:string
|
||||
lbl_8165C918 = .data:0x8165C918; // type:object size:0x10 data:string
|
||||
lbl_8165C928 = .data:0x8165C928; // type:object size:0x10 data:string
|
||||
lbl_8165C938 = .data:0x8165C938; // type:object size:0x11 data:string
|
||||
lbl_8165C950 = .data:0x8165C950; // type:object size:0x10 data:string
|
||||
lbl_8165C960 = .data:0x8165C960; // type:object size:0x10 data:string
|
||||
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
|
||||
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
|
||||
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
|
||||
scT_title_textJPN = .data:0x8165C8F0; // type:object size:0x10 data:string
|
||||
scN_separateBarKOR = .data:0x8165C900; // type:object size:0x11 data:string
|
||||
scT_2l_TextBoxKOR = .data:0x8165C918; // type:object size:0x10 data:string
|
||||
scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
|
||||
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
|
||||
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
|
||||
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
|
||||
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
|
||||
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
|
||||
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
|
||||
@@ -17491,14 +17491,14 @@ __vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
|
||||
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
|
||||
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
|
||||
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
|
||||
lbl_8165D2D0 = .data:0x8165D2D0; // type:object size:0xF data:string
|
||||
lbl_8165D2E0 = .data:0x8165D2E0; // type:object size:0x11 data:string
|
||||
lbl_8165D2F8 = .data:0x8165D2F8; // type:object size:0x68C
|
||||
lbl_8165D984 = .data:0x8165D984; // type:object size:0x84
|
||||
lbl_8165DA08 = .data:0x8165DA08; // type:object size:0x10 data:string
|
||||
lbl_8165DA18 = .data:0x8165DA18; // type:object size:0xF data:string
|
||||
lbl_8165DA28 = .data:0x8165DA28; // type:object size:0xD data:string
|
||||
lbl_8165DA38 = .data:0x8165DA38; // type:object size:0xD data:string
|
||||
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
|
||||
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
|
||||
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
|
||||
scPaneNameTable = .data:0x8165D984; // type:object size:0x84
|
||||
scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
|
||||
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
|
||||
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
|
||||
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
|
||||
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
|
||||
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
|
||||
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
|
||||
@@ -17942,16 +17942,16 @@ jumptable_81668EF8 = .data:0x81668EF8; // type:object size:0xFC scope:local
|
||||
__vt__Q49textinput8keyboard5hwkey10HWKeyboard = .data:0x81668FF4; // type:object size:0x24
|
||||
__vt__Q29textinput8TiLayout = .data:0x81669018; // type:object size:0x34
|
||||
__vt__Q29textinput17AnimTransformPane = .data:0x81669050; // type:object size:0x20
|
||||
lbl_81669070 = .data:0x81669070; // type:object size:0x13
|
||||
lbl_81669083 = .data:0x81669083; // type:object size:0x11
|
||||
lbl_81669094 = .data:0x81669094; // type:object size:0x13
|
||||
scUndefinedUtf16 = .data:0x81669070; // type:object size:0x13
|
||||
scInfinityUtf16 = .data:0x81669083; // type:object size:0x11
|
||||
scMinusInfinityUtf16 = .data:0x81669094; // type:object size:0x13
|
||||
lbl_816690A7 = .data:0x816690A7; // type:object size:0x9 data:string
|
||||
lbl_816690B0 = .data:0x816690B0; // type:object size:0xA data:string
|
||||
lbl_816690BA = .data:0x816690BA; // type:object size:0xA data:string
|
||||
lbl_816690C4 = .data:0x816690C4; // type:object size:0x1E data:string
|
||||
lbl_816690E2 = .data:0x816690E2; // type:object size:0x1B data:string
|
||||
jumptable_81669100 = .data:0x81669100; // type:object size:0x28 scope:local
|
||||
lbl_81669128 = .data:0x81669128; // type:object size:0x10 data:string
|
||||
scVmGetResultType = .data:0x81669128; // type:object size:0x10 data:string
|
||||
jumptable_81669138 = .data:0x81669138; // type:object size:0x24 scope:local
|
||||
jumptable_8166915C = .data:0x8166915C; // type:object size:0x24 scope:local
|
||||
jumptable_81669180 = .data:0x81669180; // type:object size:0x28 scope:local
|
||||
@@ -18055,7 +18055,7 @@ lbl_81669DC3 = .data:0x81669DC3; // type:object size:0xE data:string
|
||||
lbl_81669DD1 = .data:0x81669DD1; // type:object size:0xC data:string
|
||||
lbl_81669DDD = .data:0x81669DDD; // type:object size:0xC data:string
|
||||
lbl_81669DE9 = .data:0x81669DE9; // type:object size:0xC data:string
|
||||
lbl_81669DF5 = .data:0x81669DF5; // type:object size:0x11 data:string
|
||||
scHexDigits = .data:0x81669DF5; // type:object size:0x11 data:string
|
||||
vmBlobPackFormatList = .data:0x81669E08; // type:object size:0x190 scope:local data:4byte
|
||||
lbl_81669F98 = .data:0x81669F98; // type:object size:0xA data:string
|
||||
lbl_81669FA2 = .data:0x81669FA2; // type:object size:0xA data:string
|
||||
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
|
||||
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
|
||||
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
|
||||
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
|
||||
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
|
||||
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
|
||||
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
|
||||
@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
|
||||
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
|
||||
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
|
||||
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
|
||||
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
|
||||
...data.0 = .data:0x8166B660; // type:label scope:local
|
||||
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string
|
||||
@@ -18453,7 +18453,7 @@ __FUNCTION__$1195 = .data:0x8166E0FC; // type:object size:0x1C scope:local data:
|
||||
__FUNCTION__$1217 = .data:0x8166E118; // type:object size:0x1C scope:local data:string
|
||||
__FUNCTION__$1255 = .data:0x8166E134; // type:object size:0x14 scope:local data:string
|
||||
__FUNCTION__$1287 = .data:0x8166E148; // type:object size:0x18 scope:local data:string
|
||||
lbl_8166E160 = .data:0x8166E160; // type:object size:0x1A data:string
|
||||
scNwc24FlPath = .data:0x8166E160; // type:object size:0x1A data:string
|
||||
@583 = .data:0x8166E180; // type:object size:0x1B scope:local data:string
|
||||
__FUNCTION__$1123 = .data:0x8166E1A0; // type:object size:0x18 scope:local data:string
|
||||
@1300 = .data:0x8166E1B8; // type:object size:0x11 scope:local data:string
|
||||
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
|
||||
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
|
||||
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
|
||||
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
|
||||
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
|
||||
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
|
||||
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
|
||||
@@ -19181,13 +19181,13 @@ base64_array = .data:0x816874A0; // type:object size:0x80 scope:local
|
||||
@2185 = .data:0x816876A0; // type:object size:0x21 scope:local data:string
|
||||
@654 = .data:0x816876C8; // type:object size:0x48 scope:local data:string
|
||||
ShutdownFunctionInfo = .data:0x81687710; // type:object size:0x10 scope:local
|
||||
lbl_81687720 = .data:0x81687720; // type:object size:0x49 data:string
|
||||
scWpadVersionStr = .data:0x81687720; // type:object size:0x49 data:string
|
||||
lbl_8168776C = .data:0x8168776C; // type:object size:0x1C data:string
|
||||
lbl_81687788 = .data:0x81687788; // type:object size:0x1B data:string
|
||||
lbl_816877A4 = .data:0x816877A4; // type:object size:0x2F data:string
|
||||
lbl_816877D4 = .data:0x816877D4; // type:object size:0x27 data:string
|
||||
ShutdownFunctionInfo = .data:0x81687800; // type:object size:0x10 scope:local
|
||||
lbl_81687810 = .data:0x81687810; // type:object size:0x58
|
||||
scWpadManageStrs = .data:0x81687810; // type:object size:0x58
|
||||
lbl_81687868 = .data:0x81687868; // type:object size:0xC data:string
|
||||
lbl_81687874 = .data:0x81687874; // type:object size:0x37 data:string
|
||||
lbl_816878AC = .data:0x816878AC; // type:object size:0xB4
|
||||
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
|
||||
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
|
||||
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
|
||||
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
|
||||
lbl_81691748 = .data:0x81691748; // type:object size:0x50
|
||||
__sdPathData = .data:0x81691748; // type:object size:0x50
|
||||
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
|
||||
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
|
||||
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
|
||||
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
|
||||
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
|
||||
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
|
||||
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
|
||||
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
|
||||
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
|
||||
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
|
||||
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
|
||||
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
|
||||
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
|
||||
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
|
||||
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
|
||||
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
|
||||
@@ -20192,7 +20192,7 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
|
||||
@23221 = .sdata2:0x81694588; // type:object size:0x8 scope:local align:8 data:double
|
||||
lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694598 = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
|
||||
scRsoZeroF = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A0 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A4 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A8 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
|
||||
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
|
||||
@@ -20243,7 +20243,7 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
|
||||
@10043 = .sdata2:0x81694698; // type:object size:0x4 scope:local align:4 data:float
|
||||
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A4 = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
@@ -20370,9 +20370,9 @@ lbl_816948E8 = .sdata2:0x816948E8; // type:object size:0x8 align:4 data:float
|
||||
@16092 = .sdata2:0x816948F4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16094 = .sdata2:0x816948F8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16095 = .sdata2:0x816948FC; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_81694900 = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694904 = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694908 = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
scHalfF = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
scTwoF = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
scF2IBias = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694910 = .sdata2:0x81694910; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694914 = .sdata2:0x81694914; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694918 = .sdata2:0x81694918; // type:object size:0x4 align:4 data:float
|
||||
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
|
||||
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
|
||||
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
|
||||
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
|
||||
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
|
||||
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
|
||||
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
|
||||
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
|
||||
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
|
||||
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
|
||||
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
|
||||
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
|
||||
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
|
||||
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
|
||||
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
|
||||
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
|
||||
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
|
||||
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21548,10 +21548,10 @@ lbl_81696220 = .sdata:0x81696220; // type:object size:0x2 data:string
|
||||
lbl_81696222 = .sdata:0x81696222; // type:object size:0x2
|
||||
lbl_81696224 = .sdata:0x81696224; // type:object size:0x6 data:wstring
|
||||
lbl_8169622A = .sdata:0x8169622A; // type:object size:0x2
|
||||
lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorR = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorG = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorB = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorA = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
|
||||
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
|
||||
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
|
||||
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
|
||||
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
|
||||
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
|
||||
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
|
||||
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
|
||||
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
|
||||
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
|
||||
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
|
||||
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
|
||||
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
|
||||
@@ -21781,15 +21781,15 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
|
||||
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
|
||||
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
|
||||
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
|
||||
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
|
||||
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
|
||||
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
|
||||
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
|
||||
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
|
||||
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
|
||||
@@ -21802,8 +21802,8 @@ lbl_8169682A = .sdata:0x8169682A; // type:object size:0x7 data:string
|
||||
lbl_81696831 = .sdata:0x81696831; // type:object size:0x7 data:string
|
||||
lbl_81696838 = .sdata:0x81696838; // type:object size:0x7 data:string
|
||||
lbl_8169683F = .sdata:0x8169683F; // type:object size:0x7 data:string
|
||||
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
scUnknownWstr = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
s_all_pane_name__Q33ipl5scene10ChanAppBox = .sdata:0x81696858; // type:object size:0x6 data:string
|
||||
lbl_81696860 = .sdata:0x81696860; // type:object size:0x7 data:string
|
||||
lbl_81696867 = .sdata:0x81696867; // type:object size:0x7 data:string
|
||||
@@ -21858,11 +21858,11 @@ lbl_816968F5 = .sdata:0x816968F5; // type:object size:0x4 data:string
|
||||
@10922 = .sdata:0x81696992; // type:object size:0x3 scope:local data:string
|
||||
@10923 = .sdata:0x81696995; // type:object size:0x3 scope:local data:string
|
||||
lbl_81696998 = .sdata:0x81696998; // type:object size:0x4 data:4byte
|
||||
lbl_8169699C = .sdata:0x8169699C; // type:object size:0x4 data:4byte
|
||||
scPaneName_T_Balloon = .sdata:0x8169699C; // type:object size:0x4 data:4byte
|
||||
lbl_816969A0 = .sdata:0x816969A0; // type:object size:0x7 data:string
|
||||
lbl_816969A8 = .sdata:0x816969A8; // type:object size:0x4 data:4byte
|
||||
scPaneName_W_Base = .sdata:0x816969A8; // type:object size:0x4 data:4byte
|
||||
lbl_816969AC = .sdata:0x816969AC; // type:object size:0x8 data:string
|
||||
lbl_816969B4 = .sdata:0x816969B4; // type:object size:0x4 data:4byte
|
||||
scPaneName_W_Shade = .sdata:0x816969B4; // type:object size:0x4 data:4byte
|
||||
lbl_816969B8 = .sdata:0x816969B8; // type:object size:0x4 data:string
|
||||
lbl_816969BC = .sdata:0x816969BC; // type:object size:0x4 data:string
|
||||
lbl_816969C0 = .sdata:0x816969C0; // type:object size:0x4 data:string
|
||||
@@ -21872,41 +21872,41 @@ lbl_816969CC = .sdata:0x816969CC; // type:object size:0x4 data:string
|
||||
lbl_816969D0 = .sdata:0x816969D0; // type:object size:0x4 data:string
|
||||
lbl_816969D4 = .sdata:0x816969D4; // type:object size:0x4 data:string
|
||||
lbl_816969D8 = .sdata:0x816969D8; // type:object size:0x4 data:string
|
||||
lbl_816969DC = .sdata:0x816969DC; // type:object size:0x5 data:string
|
||||
lbl_816969E1 = .sdata:0x816969E1; // type:object size:0x7 data:string
|
||||
lbl_816969E8 = .sdata:0x816969E8; // type:object size:0x4 data:string
|
||||
scExport_Calc = .sdata:0x816969DC; // type:object size:0x5 data:string
|
||||
scExport_Create = .sdata:0x816969E1; // type:object size:0x7 data:string
|
||||
scArc = .sdata:0x816969E8; // type:object size:0x4 data:string
|
||||
lbl_816969EC = .sdata:0x816969EC; // type:object size:0x6 data:string
|
||||
lbl_816969F2 = .sdata:0x816969F2; // type:object size:0x5 data:string
|
||||
lbl_816969F7 = .sdata:0x816969F7; // type:object size:0x4 data:string
|
||||
lbl_816969FB = .sdata:0x816969FB; // type:object size:0x4 data:string
|
||||
lbl_816969FF = .sdata:0x816969FF; // type:object size:0x4 data:string
|
||||
lbl_81696A03 = .sdata:0x81696A03; // type:object size:0x7 data:string
|
||||
lbl_81696A10 = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
lbl_81696A17 = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
lbl_81696A20 = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
lbl_81696A28 = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
lbl_81696A30 = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
lbl_81696A34 = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
lbl_81696A3A = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
scPaneName_B_BtnA = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
scPaneName_B_BtnB = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
scPaneNames_B_Btn = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
scGroup_Change = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
scGroupNames_Change = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
scGroup_G_Wii = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
scGroup_G_GC = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
scLayoutNames__Q23ipl5scene = .sdata:0x81696A40; // type:object size:0x4 data:4byte
|
||||
lbl_81696A44 = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
scGroup_G_Back = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
scGCAnimGroups__Q23ipl5scene = .sdata:0x81696A4C; // type:object size:0x4 data:4byte
|
||||
scGCAnimNames__Q23ipl5scene = .sdata:0x81696A50; // type:object size:0x4 data:4byte
|
||||
lbl_81696A54 = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
lbl_81696A5A = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
lbl_81696A60 = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
lbl_81696A66 = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
lbl_81696A6C = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
lbl_81696A72 = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
lbl_81696A78 = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
lbl_81696A7E = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
lbl_81696A84 = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
lbl_81696A8A = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
lbl_81696A90 = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
lbl_81696A96 = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
lbl_81696A9C = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
lbl_81696AA3 = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
lbl_81696AAC__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
scPaneName_Fre_a = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_d = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_i = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_l = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_e = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_f = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_g = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_h = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_b = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_c = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_j = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_k = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
scPaneName_T_BtnA = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
scPaneName_T_BtnB = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
scPaneNames_T_Btn__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
lbl_81696AB4 = .sdata:0x81696AB4; // type:object size:0x4
|
||||
lbl_81696AB8 = .sdata:0x81696AB8; // type:object size:0x4
|
||||
lbl_81696ABC = .sdata:0x81696ABC; // type:object size:0x4 data:string
|
||||
@@ -22281,11 +22281,11 @@ sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x8169
|
||||
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
|
||||
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
|
||||
lbl_816973B8 = .sdata:0x816973B8; // type:object size:0x8 data:string
|
||||
lbl_816973C0 = .sdata:0x816973C0; // type:object size:0x4 data:4byte
|
||||
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
|
||||
scCommonTextAnimName = .sdata:0x816973C0; // type:object size:0x4 data:4byte
|
||||
scCommonScrollAnimName = .sdata:0x816973C4; // type:object size:0x4 data:4byte
|
||||
scEmptyWChars = .sdata:0x816973C8; // type:object size:0x8
|
||||
scP_OnBtn = .sdata:0x816973D0; // type:object size:0x8 data:string
|
||||
scB_OnBtn = .sdata:0x816973D8; // type:object size:0x8 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
|
||||
@@ -22347,7 +22347,7 @@ lbl_8169757F = .sdata:0x8169757F; // type:object size:0x3
|
||||
lbl_81697582 = .sdata:0x81697582; // type:object size:0x1
|
||||
lbl_81697583 = .sdata:0x81697583; // type:object size:0x3 data:string
|
||||
lbl_81697586 = .sdata:0x81697586; // type:object size:0x4 data:string
|
||||
lbl_8169758A = .sdata:0x8169758A; // type:object size:0x7 data:string
|
||||
scFloatPrintfFmt = .sdata:0x8169758A; // type:object size:0x7 data:string
|
||||
lbl_81697591 = .sdata:0x81697591; // type:object size:0x5 data:string
|
||||
lbl_81697596 = .sdata:0x81697596; // type:object size:0x7 data:string
|
||||
lbl_8169759D = .sdata:0x8169759D; // type:object size:0x5 data:string
|
||||
@@ -22413,8 +22413,8 @@ lbl_816976C4 = .sdata:0x816976C4; // type:object size:0x8 data:string
|
||||
lbl_816976CC = .sdata:0x816976CC; // type:object size:0x8 data:string
|
||||
lbl_816976D4 = .sdata:0x816976D4; // type:object size:0x7 data:string
|
||||
lbl_816976DB = .sdata:0x816976DB; // type:object size:0x6 data:string
|
||||
lbl_816976E4 = .sdata:0x816976E4; // type:object size:0x4 data:4byte
|
||||
lbl_816976E8 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
|
||||
scHexDigitsPtr = .sdata:0x816976E4; // type:object size:0x4 data:4byte
|
||||
scHexDigitsPtr2 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
|
||||
lbl_816976EC = .sdata:0x816976EC; // type:object size:0x7 data:string
|
||||
lbl_816976F3 = .sdata:0x816976F3; // type:object size:0x8 data:string
|
||||
lbl_816976FB = .sdata:0x816976FB; // type:object size:0x5 data:string
|
||||
@@ -22439,15 +22439,15 @@ lbl_81697770 = .sdata:0x81697770; // type:object size:0x8 data:string
|
||||
lbl_81697778 = .sdata:0x81697778; // type:object size:0x8 data:string
|
||||
lbl_81697780 = .sdata:0x81697780; // type:object size:0x5 data:string
|
||||
lbl_81697785 = .sdata:0x81697785; // type:object size:0x7 data:string
|
||||
lbl_8169778C = .sdata:0x8169778C; // type:object size:0x6 data:string
|
||||
scImageClassName = .sdata:0x8169778C; // type:object size:0x6 data:string
|
||||
lbl_81697792 = .sdata:0x81697792; // type:object size:0x6 data:string
|
||||
lbl_81697798 = .sdata:0x81697798; // type:object size:0x7 data:string
|
||||
lbl_8169779F = .sdata:0x8169779F; // type:object size:0x7 data:string
|
||||
lbl_816977A6 = .sdata:0x816977A6; // type:object size:0x6 data:string
|
||||
lbl_816977AC = .sdata:0x816977AC; // type:object size:0x5 data:string
|
||||
lbl_816977B1 = .sdata:0x816977B1; // type:object size:0x6 data:string
|
||||
lbl_816977B7 = .sdata:0x816977B7; // type:object size:0x5 data:string
|
||||
lbl_816977BC = .sdata:0x816977BC; // type:object size:0x8 data:string
|
||||
scDateClassName = .sdata:0x816977AC; // type:object size:0x5 data:string
|
||||
scMathInternalName = .sdata:0x816977B1; // type:object size:0x6 data:string
|
||||
scMathClassName = .sdata:0x816977B7; // type:object size:0x5 data:string
|
||||
scWinEmuInternalName = .sdata:0x816977BC; // type:object size:0x8 data:string
|
||||
lbl_816977C4 = .sdata:0x816977C4; // type:object size:0x5 data:string
|
||||
lbl_816977D0 = .sdata:0x816977D0; // type:object size:0x5 data:string
|
||||
lbl_816977D5 = .sdata:0x816977D5; // type:object size:0x8 data:string
|
||||
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
|
||||
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
|
||||
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
|
||||
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
|
||||
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
|
||||
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
|
||||
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
|
||||
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
|
||||
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
|
||||
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
|
||||
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
|
||||
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
|
||||
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
|
||||
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
|
||||
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
|
||||
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
|
||||
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
|
||||
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
|
||||
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
|
||||
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
|
||||
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte
|
||||
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
|
||||
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
|
||||
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
|
||||
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
|
||||
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
|
||||
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
|
||||
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string
|
||||
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
|
||||
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
|
||||
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
|
||||
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
|
||||
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
|
||||
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
|
||||
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
|
||||
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
|
||||
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
|
||||
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
|
||||
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
|
||||
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
|
||||
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte
|
||||
|
||||
272
configure.py
272
configure.py
@@ -247,7 +247,7 @@ config.asflags = [
|
||||
"-I include",
|
||||
f"-I build/{config.version}/include",
|
||||
f"--defsym BUILD_VERSION={version_num}",
|
||||
f"--defsym VERSION_{config.version}",
|
||||
f"--defsym VERSION_{config.version}=1",
|
||||
]
|
||||
config.ldflags = [
|
||||
"-fp hardware",
|
||||
@@ -812,8 +812,8 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("memoryCard", [
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
@@ -918,9 +918,9 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
@@ -929,7 +929,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "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(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -987,7 +987,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(NonMatching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
@@ -1004,7 +1004,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
@@ -1025,7 +1025,7 @@ config.libs = [
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
@@ -1044,9 +1044,9 @@ config.libs = [
|
||||
Object(Matching, "net/nettime.c"),
|
||||
Object(Matching, "net/crc.c"),
|
||||
Object(NonMatching, "net/md5.c"),
|
||||
Object(NonMatching, "net/sha1.c"),
|
||||
Object(Matching, "net/sha1.c"),
|
||||
Object(NonMatching, "net/hmac.c"),
|
||||
Object(NonMatching, "net/neterrorcode.c"),
|
||||
Object(Matching, "net/neterrorcode.c"),
|
||||
Object(Matching, "net/NETVersion.c"),
|
||||
Object(NonMatching, "net/aes.c"),
|
||||
Object(Matching, "net/wireless_macaddr.c"),
|
||||
@@ -1218,7 +1218,7 @@ config.libs = [
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
|
||||
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
|
||||
|
||||
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
|
||||
Object(Matching, "b65/iqdec_b65_frv32.c", source="b65/iqdec_b65_frv32.s"),
|
||||
]
|
||||
),
|
||||
# NW4R
|
||||
@@ -1389,8 +1389,8 @@ config.libs = [
|
||||
),
|
||||
RVLSDKLib("vi", [
|
||||
Object(NonMatching, "vi/vi.c"),
|
||||
Object(NonMatching, "vi/i2c.c"),
|
||||
Object(NonMatching, "vi/vi3in1.c"),
|
||||
Object(Matching, "vi/i2c.c"),
|
||||
Object(Matching, "vi/vi3in1.c"),
|
||||
]
|
||||
),
|
||||
RVLSDKLib("mtx", [
|
||||
@@ -1687,9 +1687,9 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_service.c"),
|
||||
Object(Matching, "fa/pf_str.c"),
|
||||
Object(Matching, "fa/pf_driver.c"),
|
||||
Object(NonMatching, "fa/pdm_api.c"),
|
||||
Object(NonMatching, "fa/pdm_bpb.c"),
|
||||
Object(NonMatching, "fa/pdm_disk.c"),
|
||||
Object(Matching, "fa/pdm_api.c"),
|
||||
Object(Matching, "fa/pdm_bpb.c"),
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(NonMatching, "fa/pf_cluster.c"),
|
||||
@@ -1698,168 +1698,168 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(NonMatching, "fa/pf_fat16.c"),
|
||||
Object(NonMatching, "fa/pf_fat32.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.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"),
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "fa/pf_volume.c"),
|
||||
Object(NonMatching, "fa/pf_volume_apiadd.c"),
|
||||
Object(NonMatching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_volume_apiadd.c"),
|
||||
Object(Matching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
Object(Matching, "fa/pf_attach.c"),
|
||||
Object(NonMatching, "fa/pf_buffering.c"),
|
||||
Object(NonMatching, "fa/pf_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_cinsert.c"),
|
||||
Object(Matching, "fa/pf_buffering.c"),
|
||||
Object(Matching, "fa/pf_cdelete.c"),
|
||||
Object(Matching, "fa/pf_chdir.c"),
|
||||
Object(Matching, "fa/pf_chdmod.c"),
|
||||
Object(Matching, "fa/pf_chmod.c"),
|
||||
Object(Matching, "fa/pf_cinsert.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"),
|
||||
Object(NonMatching, "fa/pf_cut.c"),
|
||||
Object(NonMatching, "fa/pf_derrnum.c"),
|
||||
Object(Matching, "fa/pf_combine.c"),
|
||||
Object(Matching, "fa/pf_create.c"),
|
||||
Object(Matching, "fa/pf_createdir.c"),
|
||||
Object(Matching, "fa/pf_cut.c"),
|
||||
Object(Matching, "fa/pf_derrnum.c"),
|
||||
Object(Matching, "fa/pf_detach.c"),
|
||||
Object(NonMatching, "fa/pf_divide.c"),
|
||||
Object(Matching, "fa/pf_divide.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(Matching, "fa/pf_fadjust.c"),
|
||||
Object(Matching, "fa/pf_fappend.c"),
|
||||
Object(Matching, "fa/pf_fchdir.c"),
|
||||
Object(Matching, "fa/pf_fclose.c"),
|
||||
Object(NonMatching, "fa/pf_fconcat.c"),
|
||||
Object(Matching, "fa/pf_fconcat.c"),
|
||||
Object(Matching, "fa/pf_feof.c"),
|
||||
Object(Matching, "fa/pf_ferror.c"),
|
||||
Object(NonMatching, "fa/pf_finfo.c"),
|
||||
Object(Matching, "fa/pf_finfo.c"),
|
||||
Object(Matching, "fa/pf_flock.c"),
|
||||
Object(Matching, "fa/pf_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_fread.c"),
|
||||
Object(Matching, "fa/pf_fseek.c"),
|
||||
Object(NonMatching, "fa/pf_fsetclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_fsexec.c"),
|
||||
Object(Matching, "fa/pf_fsetclstlink.c"),
|
||||
Object(Matching, "fa/pf_fsexec.c"),
|
||||
Object(Matching, "fa/pf_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_fsnext.c"),
|
||||
Object(Matching, "fa/pf_fstat.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"),
|
||||
Object(NonMatching, "fa/pf_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pf_insert.c"),
|
||||
Object(NonMatching, "fa/pf_iswriteprotected.c"),
|
||||
Object(Matching, "fa/pf_getdev.c"),
|
||||
Object(Matching, "fa/pf_getvol.c"),
|
||||
Object(Matching, "fa/pf_getvolcfg.c"),
|
||||
Object(Matching, "fa/pf_init_prfile2.c"),
|
||||
Object(Matching, "fa/pf_insert.c"),
|
||||
Object(Matching, "fa/pf_iswriteprotected.c"),
|
||||
Object(Matching, "fa/pf_mkdir.c"),
|
||||
Object(Matching, "fa/pf_mount.c"),
|
||||
Object(NonMatching, "fa/pf_move.c"),
|
||||
Object(Matching, "fa/pf_move.c"),
|
||||
Object(Matching, "fa/pf_opendir.c"),
|
||||
Object(Matching, "fa/pf_readdir.c"),
|
||||
Object(NonMatching, "fa/pf_regctx.c"),
|
||||
Object(Matching, "fa/pf_regctx.c"),
|
||||
Object(Matching, "fa/pf_remove.c"),
|
||||
Object(Matching, "fa/pf_rename.c"),
|
||||
Object(Matching, "fa/pf_rewinddir.c"),
|
||||
Object(Matching, "fa/pf_rmdir.c"),
|
||||
Object(NonMatching, "fa/pf_rmvvol.c"),
|
||||
Object(Matching, "fa/pf_rmvvol.c"),
|
||||
Object(Matching, "fa/pf_seekdir.c"),
|
||||
Object(NonMatching, "fa/pf_setclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_setcode.c"),
|
||||
Object(NonMatching, "fa/pf_setencode.c"),
|
||||
Object(NonMatching, "fa/pf_settailbuf.c"),
|
||||
Object(NonMatching, "fa/pf_setupfsi.c"),
|
||||
Object(NonMatching, "fa/pf_setvol.c"),
|
||||
Object(NonMatching, "fa/pf_setvolcfg.c"),
|
||||
Object(NonMatching, "fa/pf_sync.c"),
|
||||
Object(Matching, "fa/pf_setclstlink.c"),
|
||||
Object(Matching, "fa/pf_setcode.c"),
|
||||
Object(Matching, "fa/pf_setencode.c"),
|
||||
Object(Matching, "fa/pf_settailbuf.c"),
|
||||
Object(Matching, "fa/pf_setupfsi.c"),
|
||||
Object(Matching, "fa/pf_setvol.c"),
|
||||
Object(Matching, "fa/pf_setvolcfg.c"),
|
||||
Object(Matching, "fa/pf_sync.c"),
|
||||
Object(Matching, "fa/pf_telldir.c"),
|
||||
Object(Matching, "fa/pf_unmount.c"),
|
||||
Object(NonMatching, "fa/pf_unregctx.c"),
|
||||
Object(NonMatching, "fa/pf_xdivide.c"),
|
||||
Object(Matching, "fa/pf_unregctx.c"),
|
||||
Object(Matching, "fa/pf_xdivide.c"),
|
||||
Object(Matching, "fa/pf_w_api_util.c"),
|
||||
Object(NonMatching, "fa/pf_w_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_w_combine.c"),
|
||||
Object(NonMatching, "fa/pf_w_create.c"),
|
||||
Object(NonMatching, "fa/pf_w_createdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_cut.c"),
|
||||
Object(NonMatching, "fa/pf_w_divide.c"),
|
||||
Object(NonMatching, "fa/pf_w_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_w_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsnext.c"),
|
||||
Object(NonMatching, "fa/pf_w_fstat.c"),
|
||||
Object(NonMatching, "fa/pf_w_insert.c"),
|
||||
Object(NonMatching, "fa/pf_w_mkdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_move.c"),
|
||||
Object(NonMatching, "fa/pf_w_opendir.c"),
|
||||
Object(NonMatching, "fa/pf_w_remove.c"),
|
||||
Object(NonMatching, "fa/pf_w_rename.c"),
|
||||
Object(NonMatching, "fa/pf_w_rmdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_xdivide.c"),
|
||||
Object(NonMatching, "fa/pf_filelock.c"),
|
||||
Object(NonMatching, "fa/pf_stub.c"),
|
||||
Object(NonMatching, "fa/pf_system.c"),
|
||||
Object(NonMatching, "fa/pf_stub_standard.c"),
|
||||
Object(NonMatching, "fa/pfs_attach.c"),
|
||||
Object(NonMatching, "fa/pfs_buffering.c"),
|
||||
Object(NonMatching, "fa/pfs_create.c"),
|
||||
Object(NonMatching, "fa/pfs_createdir.c"),
|
||||
Object(NonMatching, "fa/pfs_detach.c"),
|
||||
Object(NonMatching, "fa/pfs_errnum.c"),
|
||||
Object(NonMatching, "fa/pfs_fclose.c"),
|
||||
Object(NonMatching, "fa/pfs_finfot.c"),
|
||||
Object(NonMatching, "fa/pfs_fopen.c"),
|
||||
Object(NonMatching, "fa/pfs_format.c"),
|
||||
Object(NonMatching, "fa/pfs_fread.c"),
|
||||
Object(NonMatching, "fa/pfs_fseek.c"),
|
||||
Object(NonMatching, "fa/pfs_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pfs_fsnext.c"),
|
||||
Object(NonMatching, "fa/pfs_fstat.c"),
|
||||
Object(NonMatching, "fa/pfs_fwrite.c"),
|
||||
Object(NonMatching, "fa/pfs_getdev.c"),
|
||||
Object(NonMatching, "fa/pfs_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pfs_mount.c"),
|
||||
Object(NonMatching, "fa/pfs_remove.c"),
|
||||
Object(NonMatching, "fa/pfs_unmount.c"),
|
||||
Object(NonMatching, "fa/pf_stub_unicode.c"),
|
||||
Object(Matching, "fa/pf_w_cdelete.c"),
|
||||
Object(Matching, "fa/pf_w_chdir.c"),
|
||||
Object(Matching, "fa/pf_w_chdmod.c"),
|
||||
Object(Matching, "fa/pf_w_chmod.c"),
|
||||
Object(Matching, "fa/pf_w_cinsert.c"),
|
||||
Object(Matching, "fa/pf_w_combine.c"),
|
||||
Object(Matching, "fa/pf_w_create.c"),
|
||||
Object(Matching, "fa/pf_w_createdir.c"),
|
||||
Object(Matching, "fa/pf_w_cut.c"),
|
||||
Object(Matching, "fa/pf_w_divide.c"),
|
||||
Object(Matching, "fa/pf_w_fconcat.c"),
|
||||
Object(Matching, "fa/pf_w_fopen.c"),
|
||||
Object(Matching, "fa/pf_w_fsexec.c"),
|
||||
Object(Matching, "fa/pf_w_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_w_fsnext.c"),
|
||||
Object(Matching, "fa/pf_w_fstat.c"),
|
||||
Object(Matching, "fa/pf_w_insert.c"),
|
||||
Object(Matching, "fa/pf_w_mkdir.c"),
|
||||
Object(Matching, "fa/pf_w_move.c"),
|
||||
Object(Matching, "fa/pf_w_opendir.c"),
|
||||
Object(Matching, "fa/pf_w_remove.c"),
|
||||
Object(Matching, "fa/pf_w_rename.c"),
|
||||
Object(Matching, "fa/pf_w_rmdir.c"),
|
||||
Object(Matching, "fa/pf_w_xdivide.c"),
|
||||
Object(Matching, "fa/pf_filelock.c"),
|
||||
Object(Matching, "fa/pf_stub.c"),
|
||||
Object(Matching, "fa/pf_system.c"),
|
||||
Object(Matching, "fa/pf_stub_standard.c"),
|
||||
Object(Matching, "fa/pfs_attach.c"),
|
||||
Object(Matching, "fa/pfs_buffering.c"),
|
||||
Object(Matching, "fa/pfs_create.c"),
|
||||
Object(Matching, "fa/pfs_createdir.c"),
|
||||
Object(Matching, "fa/pfs_detach.c"),
|
||||
Object(Matching, "fa/pfs_errnum.c"),
|
||||
Object(Matching, "fa/pfs_fclose.c"),
|
||||
Object(Matching, "fa/pfs_finfot.c"),
|
||||
Object(Matching, "fa/pfs_fopen.c"),
|
||||
Object(Matching, "fa/pfs_format.c"),
|
||||
Object(Matching, "fa/pfs_fread.c"),
|
||||
Object(Matching, "fa/pfs_fseek.c"),
|
||||
Object(Matching, "fa/pfs_fsfirst.c"),
|
||||
Object(Matching, "fa/pfs_fsnext.c"),
|
||||
Object(Matching, "fa/pfs_fstat.c"),
|
||||
Object(Matching, "fa/pfs_fwrite.c"),
|
||||
Object(Matching, "fa/pfs_getdev.c"),
|
||||
Object(Matching, "fa/pfs_init_prfile2.c"),
|
||||
Object(Matching, "fa/pfs_mount.c"),
|
||||
Object(Matching, "fa/pfs_remove.c"),
|
||||
Object(Matching, "fa/pfs_unmount.c"),
|
||||
Object(Matching, "fa/pf_stub_unicode.c"),
|
||||
|
||||
Object(NonMatching, "fa/api/FAAttach.c"),
|
||||
Object(NonMatching, "fa/api/FABuffering.c"),
|
||||
Object(NonMatching, "fa/api/FACreate.c"),
|
||||
Object(NonMatching, "fa/api/FACreatedir.c"),
|
||||
Object(NonMatching, "fa/api/FADetach.c"),
|
||||
Object(NonMatching, "fa/api/FAErrnum.c"),
|
||||
Object(Matching, "fa/api/FABuffering.c"),
|
||||
Object(Matching, "fa/api/FACreate.c"),
|
||||
Object(Matching, "fa/api/FACreatedir.c"),
|
||||
Object(Matching, "fa/api/FADetach.c"),
|
||||
Object(Matching, "fa/api/FAErrnum.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(Matching, "fa/api/FAFopen.c"),
|
||||
Object(Matching, "fa/api/FAFormat.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(Matching, "fa/api/FAFseek.c"),
|
||||
Object(Matching, "fa/api/FAFsfirst.c"),
|
||||
Object(Matching, "fa/api/FAFsnext.c"),
|
||||
Object(Matching, "fa/api/FAFstat.c"),
|
||||
Object(Matching, "fa/api/FAFwrite.c"),
|
||||
Object(NonMatching, "fa/api/FAGetdev.c"),
|
||||
Object(NonMatching, "fa/api/FAInit.c"),
|
||||
Object(Matching, "fa/api/FAGetdev.c"),
|
||||
Object(Matching, "fa/api/FAInit.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"),
|
||||
Object(NonMatching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(NonMatching, "fa/api/FAUnmount.c"),
|
||||
Object(Matching, "fa/api/FAMount.c"),
|
||||
Object(Matching, "fa/api/FARegistCB.c"),
|
||||
Object(Matching, "fa/api/FARemove.c"),
|
||||
Object(Matching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(Matching, "fa/api/FAUnmount.c"),
|
||||
|
||||
Object(NonMatching, "fa/kernel/pfk_api.c"),
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(NonMatching, "fa/driver/nand_drv.c"),
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(NonMatching, "fa/driver/pfd_cmn.c"),
|
||||
Object(NonMatching, "fa/driver/msc_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
|
||||
Object(NonMatching, "fa/msc/puh_msc.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(Matching, "fa/msc/puh_msc.c"),
|
||||
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
|
||||
]
|
||||
),
|
||||
@@ -1887,7 +1887,7 @@ config.libs = [
|
||||
RVLSDKLib("kbd", [
|
||||
Object(NonMatching, "kbd/kbd_lib.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_jp.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(Matching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_eu.c"),
|
||||
]
|
||||
),
|
||||
|
||||
@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
|
||||
/*** CHANS Image ***/
|
||||
/************************/
|
||||
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
|
||||
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
|
||||
|
||||
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -187,7 +187,19 @@ namespace textinput {
|
||||
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
|
||||
s32 GetFocusedText() { return mnFocusedIdx; }
|
||||
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
f32 GetMargin_() const {
|
||||
f32 margin;
|
||||
if (mfScreenWidth > 700.0f) {
|
||||
margin = 10.0f;
|
||||
} else {
|
||||
margin = 20.0f;
|
||||
}
|
||||
return margin;
|
||||
}
|
||||
#else
|
||||
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
|
||||
#endif
|
||||
s32 GetNextPageIdx_(s32 page) const;
|
||||
s32 GetPrevPageIdx_(s32 page) const;
|
||||
s32 GetDispNum() const;
|
||||
|
||||
@@ -133,7 +133,11 @@ namespace textinput {
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
@@ -145,7 +149,7 @@ namespace textinput {
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
@@ -384,7 +388,7 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -135,8 +135,13 @@ namespace textinput {
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getSignKeyboard();
|
||||
virtual const void* getSignKeyboard() const;
|
||||
#else
|
||||
virtual void* getSignKeyboard() { return mpSignWindow; }
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
@@ -144,8 +149,13 @@ namespace textinput {
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
virtual const void* getPredictLanguageSelectDialog() const;
|
||||
#else
|
||||
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
#endif
|
||||
|
||||
virtual inputform::EditBuffer* createEditBuffer();
|
||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
@@ -94,7 +94,7 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
@@ -103,12 +103,12 @@ namespace textinput {
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
|
||||
@@ -20,7 +20,11 @@ namespace gui {
|
||||
class Manager;
|
||||
class EventHandler;
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) Interface {
|
||||
#else
|
||||
class Interface {
|
||||
#endif
|
||||
public:
|
||||
virtual void create() {} // 0x08 (0x02)
|
||||
|
||||
@@ -30,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
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);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -81,11 +81,11 @@ namespace ipl {
|
||||
(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 *
|
||||
(mStartTangent *
|
||||
(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)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -101,7 +101,7 @@ namespace ipl {
|
||||
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)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -109,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -119,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -132,10 +132,10 @@ namespace ipl {
|
||||
(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 *
|
||||
(mStartTangent *
|
||||
(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)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -144,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -155,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
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) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -176,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -196,7 +196,7 @@ namespace ipl {
|
||||
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)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -213,15 +213,55 @@ namespace ipl {
|
||||
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)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventHandler {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
@@ -48,6 +48,25 @@ private:
|
||||
void set_texture(const char*, const GXTexObj&);
|
||||
public:
|
||||
virtual void onMemEvent(long, u8);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
virtual void on_wait_anim() = 0;
|
||||
virtual void on_exit() = 0;
|
||||
virtual void on_error() = 0;
|
||||
virtual void on_format() = 0;
|
||||
virtual void on_dialog_result() = 0;
|
||||
virtual void on_select_in() = 0;
|
||||
virtual void on_message_done() = 0;
|
||||
virtual void on_button_trig() = 0;
|
||||
#else
|
||||
virtual void on_wait_anim();
|
||||
virtual void on_exit();
|
||||
virtual void on_error();
|
||||
virtual void on_format();
|
||||
virtual void on_dialog_result();
|
||||
virtual void on_select_in();
|
||||
virtual void on_message_done();
|
||||
virtual void on_button_trig();
|
||||
#endif
|
||||
bool isProcess();
|
||||
void stop_wait_anim();
|
||||
|
||||
|
||||
@@ -35,7 +35,11 @@ namespace ipl {
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
|
||||
@@ -12,13 +12,61 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class MemCardEventHandler {
|
||||
class __declspec(novtable) MemCardEventListener {
|
||||
public:
|
||||
MemCardEventListener() {}
|
||||
|
||||
virtual ~MemCardEventListener() {}
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
};
|
||||
|
||||
class MemCardEventHandler : public MemCardEventListener {
|
||||
public:
|
||||
MemCardEventHandler() {}
|
||||
|
||||
virtual ~MemCardEventHandler();
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
virtual void onSlotStatus(u8 slot) = 0;
|
||||
};
|
||||
|
||||
typedef struct MCFile {
|
||||
@@ -56,6 +104,44 @@ namespace ipl {
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
|
||||
void calc();
|
||||
|
||||
bool isSlotReady(u8 slot);
|
||||
@@ -96,7 +182,7 @@ namespace ipl {
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventHandler* eventHandler) {
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
@@ -107,7 +193,7 @@ namespace ipl {
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventHandler* mpEventHandler; // 0x1693C
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -395,9 +395,9 @@ namespace ipl {
|
||||
NandSDWorker* mpSDWorker;
|
||||
ESTitleId32* mpSDTitleIds;
|
||||
SDChannelSelectTitleInfo* mpSDTitleInfo;
|
||||
NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
s32 mFirstTitleCount;
|
||||
s32 mSecondTitleCount;
|
||||
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
mutable s32 mFirstTitleCount;
|
||||
mutable s32 mSecondTitleCount;
|
||||
SDChannelObj* mpCurrentLoadedChannel;
|
||||
u32 mSDTitleCount;
|
||||
u32 mNandTitleCount;
|
||||
|
||||
@@ -167,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void fn_81409864();
|
||||
void calc_exit_sequence();
|
||||
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -38,21 +38,49 @@ namespace ipl {
|
||||
int holdSE(const char* sndName);
|
||||
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void stopBGM(int unk = 0);
|
||||
#else
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOffBGM(int);
|
||||
#else
|
||||
int muteOffBGM(int);
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOnBGM(int);
|
||||
#else
|
||||
int muteOnBGM(int);
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnBGM();
|
||||
#else
|
||||
int pauseOnBGM();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffBGM();
|
||||
#else
|
||||
int pauseOffBGM();
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnSE();
|
||||
#else
|
||||
int pauseOnSE();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffSE();
|
||||
#else
|
||||
int pauseOffSE();
|
||||
#endif
|
||||
|
||||
void setOutputMode(EAudioOutputMode mode);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int fn_8135B1C0();
|
||||
int getProgressPercent();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -336,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_unk_8134C838();
|
||||
void do_check_sd_app_titles();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
@@ -67,6 +67,7 @@ namespace ipl {
|
||||
|
||||
#ifdef IPL_SDMEMORY_TITLE_CACHE_ACCESS
|
||||
const ESTitleId* getTitleCache() const { return &mData.titleCache[0][0]; }
|
||||
ESTitleId getTitleCacheEntry(int index) const { return (&mData.titleCache[0][0])[index]; }
|
||||
#endif
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
ESTitleId getCachedTitle(int index) const {
|
||||
@@ -86,7 +87,7 @@ namespace ipl {
|
||||
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
|
||||
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
|
||||
|
||||
void iplSavedata_813596B8(ESTitleId titleId);
|
||||
void pushTitleCache(ESTitleId titleId);
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
@@ -183,7 +184,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -48,10 +48,14 @@ namespace EGG {
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
u32 id = changeNameToId(pName);
|
||||
#else
|
||||
u32 id = nw4r::snd::SoundArchive::INVALID_ID;
|
||||
if (mpArchive != NULL) {
|
||||
id = changeNameToId(pName);
|
||||
}
|
||||
#endif
|
||||
|
||||
return mSoundArchivePlayer.PrepareSound(pHandle, id);
|
||||
} // 0x48
|
||||
|
||||
@@ -20,9 +20,13 @@ namespace EGG {
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
virtual bool loadState(s32 id) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
||||
#else
|
||||
s32 level = mHeap.GetCurrentLevel();
|
||||
|
||||
if (id > 0 && level >= id) {
|
||||
#endif
|
||||
mHeap.LoadState(id);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,11 @@ namespace nw4r {
|
||||
namespace snd {
|
||||
class SoundHandle : private ut::NonCopyable {
|
||||
public:
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
SoundHandle() NO_INLINE;
|
||||
#else
|
||||
SoundHandle() NO_INLINE : mSound(NULL) {}
|
||||
#endif
|
||||
~SoundHandle() { DetachSound(); }
|
||||
|
||||
void detail_AttachSound(detail::BasicSound* sound);
|
||||
|
||||
@@ -31,7 +31,14 @@ namespace nw4r {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
return mFrameHeap.SaveState();
|
||||
}
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void LoadState(int id) {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
mFrameHeap.LoadState(id);
|
||||
}
|
||||
#else
|
||||
void LoadState(int id);
|
||||
#endif
|
||||
|
||||
bool IsValid() { return mFrameHeap.IsValid(); }
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// Matching build uses iqdec_b65_frv32.s (retail extract); keep C for reference.
|
||||
#include <string.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
@@ -17,7 +18,96 @@ static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
return limit;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
const TMCHuffmanEntry* entry;
|
||||
|
||||
if (bitCount <= 17) {
|
||||
s32 result = TMCJPEGDEC_load_buff(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
bitData = work->bitBuf;
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
length = 9;
|
||||
entry = table + 9;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
length++;
|
||||
entry++;
|
||||
if (length > 16) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
code <<= 1;
|
||||
bitData = work->bitBuf;
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
|
||||
if (bitCount <= 17) {
|
||||
s32 result = TMCJPEGDEC_load_buff(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
bitData = work->bitBuf;
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
length = 9;
|
||||
entry += 9;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
length++;
|
||||
entry++;
|
||||
if (length > 16) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
code <<= 1;
|
||||
bitData = work->bitBuf;
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry acEntry;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
u8* huff_sym;
|
||||
u32* huff_tbl;
|
||||
@@ -49,7 +139,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
tmp = bit_pos - 8;
|
||||
tmp = ((bit_data >> tmp) & 0xFF) << 2;
|
||||
{
|
||||
TMCHuffmanEntry dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
r = dcEntry.bitLength;
|
||||
extra = dcEntry.symbol;
|
||||
}
|
||||
@@ -59,68 +149,11 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = extra;
|
||||
} else {
|
||||
s32 dcResult;
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
const TMCHuffmanEntry* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
|
||||
if (bit_pos <= 17) {
|
||||
dcResult = TMCJPEGDEC_load_buff(work);
|
||||
if (dcResult < 0) {
|
||||
goto dc_end;
|
||||
}
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos -= 9;
|
||||
code = (bit_data >> bit_pos) & 0x1FF;
|
||||
work->bitCount = bit_pos;
|
||||
|
||||
i = 9;
|
||||
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
|
||||
|
||||
goto dc_entry;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry++;
|
||||
if (i > 16) {
|
||||
dcResult = TMCC_ERROR_OVERFLOW;
|
||||
goto dc_end;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
code <<= 1;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos--;
|
||||
work->bitCount = bit_pos;
|
||||
code |= (bit_data >> bit_pos) & 1;
|
||||
|
||||
dc_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
thresh = decoded.bitLength;
|
||||
offs = entry->symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
dcResult = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
dc_end:
|
||||
r = dcResult;
|
||||
if (dcResult < 0) {
|
||||
return dcResult;
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,8 +165,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
if (load_ret < 0) {
|
||||
return load_ret;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
tmp = 1 << r;
|
||||
extra = tmp - 1;
|
||||
@@ -149,7 +182,6 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
*block = dc_predict_row_ptr[0] * blk0;
|
||||
|
||||
{
|
||||
TMCHuffmanEntry acEntry;
|
||||
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
@@ -170,7 +202,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
t = bit_pos - 8;
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
while (idx < 64) {
|
||||
do {
|
||||
s32 ac_thresh = acEntry.bitLength;
|
||||
if (ac_thresh != 0) {
|
||||
bit_pos = work->bitCount;
|
||||
@@ -178,62 +210,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
const TMCHuffmanEntry* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
if (bit_pos <= 17) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos -= 9;
|
||||
code = (bit_data >> bit_pos) & 0x1FF;
|
||||
work->bitCount = bit_pos;
|
||||
|
||||
i = 9;
|
||||
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
|
||||
|
||||
goto ac_entry_huff;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry++;
|
||||
if (i > 16) {
|
||||
r = TMCC_ERROR_OVERFLOW;
|
||||
goto ac_end;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
code <<= 1;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos--;
|
||||
work->bitCount = bit_pos;
|
||||
code |= (bit_data >> bit_pos) & 1;
|
||||
|
||||
ac_entry_huff:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
thresh = decoded.bitLength;
|
||||
offs = entry->symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
ac_end:
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -256,8 +234,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
@@ -265,14 +243,14 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
t = bit_pos - 8;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
q = ((s32*)conv_row_ptr)[(u8)zz];
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
if (((s32)tmp >> 1) > extra) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
|
||||
q = ((s32*)conv_row_ptr)[zz];
|
||||
block[zz] = extra * q;
|
||||
block[(u8)zz] = extra * q;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
@@ -294,7 +272,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
|
||||
idx += 16;
|
||||
}
|
||||
}
|
||||
} while (idx < 64);
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
|
||||
315
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32.s
Normal file
315
libs/RVLMiddleware/TMC_JPEG/src/b65/iqdec_b65_frv32.s
Normal file
@@ -0,0 +1,315 @@
|
||||
.include "macros.inc"
|
||||
.file "iqdec_b65_frv32.c"
|
||||
|
||||
# 0x814F6BD4..0x814F7024 | size: 0x450
|
||||
.text
|
||||
.balign 4
|
||||
|
||||
# .text:0x0 | 0x814F6BD4 | size: 0x450
|
||||
.fn TMCJPEGDEC_decode_iquant, global
|
||||
/* 814F6BD4 001C70F4 94 21 FF B0 */ stwu r1, -0x50(r1)
|
||||
/* 814F6BD8 001C70F8 7C 08 02 A6 */ mflr r0
|
||||
/* 814F6BDC 001C70FC 90 01 00 54 */ stw r0, 0x54(r1)
|
||||
/* 814F6BE0 001C7100 BE A1 00 24 */ stmw r21, 0x24(r1)
|
||||
/* 814F6BE4 001C7104 7C 75 1B 78 */ mr r21, r3
|
||||
/* 814F6BE8 001C7108 7C 96 23 78 */ mr r22, r4
|
||||
/* 814F6BEC 001C710C 7C B8 2B 78 */ mr r24, r5
|
||||
/* 814F6BF0 001C7110 7C D7 33 78 */ mr r23, r6
|
||||
/* 814F6BF4 001C7114 80 06 00 04 */ lwz r0, 0x4(r6)
|
||||
/* 814F6BF8 001C7118 83 26 04 98 */ lwz r25, 0x498(r6)
|
||||
/* 814F6BFC 001C711C 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6C00 001C7120 41 81 00 18 */ bgt .L_814F6C18
|
||||
/* 814F6C04 001C7124 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6C08 001C7128 4B FF 42 05 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6C0C 001C712C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6C10 001C7130 40 80 00 08 */ bge .L_814F6C18
|
||||
/* 814F6C14 001C7134 48 00 03 FC */ b .L_814F7010
|
||||
.L_814F6C18:
|
||||
/* 814F6C18 001C7138 80 97 00 04 */ lwz r4, 0x4(r23)
|
||||
/* 814F6C1C 001C713C 80 77 00 00 */ lwz r3, 0x0(r23)
|
||||
/* 814F6C20 001C7140 38 04 FF F8 */ subi r0, r4, 0x8
|
||||
/* 814F6C24 001C7144 7C 60 04 30 */ srw r0, r3, r0
|
||||
/* 814F6C28 001C7148 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6C2C 001C714C 7C 79 02 14 */ add r3, r25, r0
|
||||
/* 814F6C30 001C7150 7C 19 02 2E */ lhzx r0, r25, r0
|
||||
/* 814F6C34 001C7154 A3 23 00 02 */ lhz r25, 0x2(r3)
|
||||
/* 814F6C38 001C7158 2C 00 00 00 */ cmpwi r0, 0x0
|
||||
/* 814F6C3C 001C715C B0 01 00 1C */ sth r0, 0x1c(r1)
|
||||
/* 814F6C40 001C7160 B3 21 00 1E */ sth r25, 0x1e(r1)
|
||||
/* 814F6C44 001C7164 41 82 00 10 */ beq .L_814F6C54
|
||||
/* 814F6C48 001C7168 7C 00 20 50 */ subf r0, r0, r4
|
||||
/* 814F6C4C 001C716C 90 17 00 04 */ stw r0, 0x4(r23)
|
||||
/* 814F6C50 001C7170 48 00 00 C8 */ b .L_814F6D18
|
||||
.L_814F6C54:
|
||||
/* 814F6C54 001C7174 2C 04 00 11 */ cmpwi r4, 0x11
|
||||
/* 814F6C58 001C7178 83 B7 04 A0 */ lwz r29, 0x4a0(r23)
|
||||
/* 814F6C5C 001C717C 83 37 04 9C */ lwz r25, 0x49c(r23)
|
||||
/* 814F6C60 001C7180 41 81 00 18 */ bgt .L_814F6C78
|
||||
/* 814F6C64 001C7184 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6C68 001C7188 4B FF 41 A5 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6C6C 001C718C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6C70 001C7190 40 80 00 08 */ bge .L_814F6C78
|
||||
/* 814F6C74 001C7194 48 00 00 94 */ b .L_814F6D08
|
||||
.L_814F6C78:
|
||||
/* 814F6C78 001C7198 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6C7C 001C719C 38 F9 00 24 */ addi r7, r25, 0x24
|
||||
/* 814F6C80 001C71A0 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6C84 001C71A4 38 A0 00 09 */ li r5, 0x9
|
||||
/* 814F6C88 001C71A8 38 63 FF F7 */ subi r3, r3, 0x9
|
||||
/* 814F6C8C 001C71AC 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6C90 001C71B0 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6C94 001C71B4 54 06 05 FE */ clrlwi r6, r0, 23
|
||||
/* 814F6C98 001C71B8 48 00 00 3C */ b .L_814F6CD4
|
||||
.L_814F6C9C:
|
||||
/* 814F6C9C 001C71BC 38 A5 00 01 */ addi r5, r5, 0x1
|
||||
/* 814F6CA0 001C71C0 38 E7 00 04 */ addi r7, r7, 0x4
|
||||
/* 814F6CA4 001C71C4 28 05 00 10 */ cmplwi r5, 0x10
|
||||
/* 814F6CA8 001C71C8 40 81 00 0C */ ble .L_814F6CB4
|
||||
/* 814F6CAC 001C71CC 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6CB0 001C71D0 48 00 00 58 */ b .L_814F6D08
|
||||
.L_814F6CB4:
|
||||
/* 814F6CB4 001C71D4 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6CB8 001C71D8 54 C6 08 3C */ slwi r6, r6, 1
|
||||
/* 814F6CBC 001C71DC 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6CC0 001C71E0 38 63 FF FF */ subi r3, r3, 0x1
|
||||
/* 814F6CC4 001C71E4 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6CC8 001C71E8 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6CCC 001C71EC 54 00 07 FE */ clrlwi r0, r0, 31
|
||||
/* 814F6CD0 001C71F0 7C C6 03 78 */ or r6, r6, r0
|
||||
.L_814F6CD4:
|
||||
/* 814F6CD4 001C71F4 A0 87 00 00 */ lhz r4, 0x0(r7)
|
||||
/* 814F6CD8 001C71F8 A0 67 00 02 */ lhz r3, 0x2(r7)
|
||||
/* 814F6CDC 001C71FC B0 81 00 14 */ sth r4, 0x14(r1)
|
||||
/* 814F6CE0 001C7200 B0 61 00 16 */ sth r3, 0x16(r1)
|
||||
/* 814F6CE4 001C7204 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 814F6CE8 001C7208 90 01 00 18 */ stw r0, 0x18(r1)
|
||||
/* 814F6CEC 001C720C A0 01 00 18 */ lhz r0, 0x18(r1)
|
||||
/* 814F6CF0 001C7210 7C 06 00 40 */ cmplw r6, r0
|
||||
/* 814F6CF4 001C7214 41 81 FF A8 */ bgt .L_814F6C9C
|
||||
/* 814F6CF8 001C7218 7C 04 30 50 */ subf r0, r4, r6
|
||||
/* 814F6CFC 001C721C 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6D00 001C7220 54 00 06 3E */ clrlwi r0, r0, 24
|
||||
/* 814F6D04 001C7224 7C 7D 00 AE */ lbzx r3, r29, r0
|
||||
.L_814F6D08:
|
||||
/* 814F6D08 001C7228 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6D0C 001C722C 7C 79 1B 78 */ mr r25, r3
|
||||
/* 814F6D10 001C7230 40 80 00 08 */ bge .L_814F6D18
|
||||
/* 814F6D14 001C7234 48 00 02 FC */ b .L_814F7010
|
||||
.L_814F6D18:
|
||||
/* 814F6D18 001C7238 2C 19 00 00 */ cmpwi r25, 0x0
|
||||
/* 814F6D1C 001C723C 83 76 00 00 */ lwz r27, 0x0(r22)
|
||||
/* 814F6D20 001C7240 41 82 00 64 */ beq .L_814F6D84
|
||||
/* 814F6D24 001C7244 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6D28 001C7248 7C 00 C8 00 */ cmpw r0, r25
|
||||
/* 814F6D2C 001C724C 41 81 00 18 */ bgt .L_814F6D44
|
||||
/* 814F6D30 001C7250 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6D34 001C7254 4B FF 40 D9 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6D38 001C7258 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6D3C 001C725C 40 80 00 08 */ bge .L_814F6D44
|
||||
/* 814F6D40 001C7260 48 00 02 D0 */ b .L_814F7010
|
||||
.L_814F6D44:
|
||||
/* 814F6D44 001C7264 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6D48 001C7268 38 80 00 01 */ li r4, 0x1
|
||||
/* 814F6D4C 001C726C 80 77 00 00 */ lwz r3, 0x0(r23)
|
||||
/* 814F6D50 001C7270 7C 86 C8 30 */ slw r6, r4, r25
|
||||
/* 814F6D54 001C7274 7C 99 00 50 */ subf r4, r25, r0
|
||||
/* 814F6D58 001C7278 38 A6 FF FF */ subi r5, r6, 0x1
|
||||
/* 814F6D5C 001C727C 7C C0 0E 70 */ srawi r0, r6, 1
|
||||
/* 814F6D60 001C7280 7C 63 24 30 */ srw r3, r3, r4
|
||||
/* 814F6D64 001C7284 90 97 00 04 */ stw r4, 0x4(r23)
|
||||
/* 814F6D68 001C7288 7C A3 18 38 */ and r3, r5, r3
|
||||
/* 814F6D6C 001C728C 7C 00 18 00 */ cmpw r0, r3
|
||||
/* 814F6D70 001C7290 40 81 00 08 */ ble .L_814F6D78
|
||||
/* 814F6D74 001C7294 7C 65 18 50 */ subf r3, r5, r3
|
||||
.L_814F6D78:
|
||||
/* 814F6D78 001C7298 80 18 00 00 */ lwz r0, 0x0(r24)
|
||||
/* 814F6D7C 001C729C 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6D80 001C72A0 90 18 00 00 */ stw r0, 0x0(r24)
|
||||
.L_814F6D84:
|
||||
/* 814F6D84 001C72A4 80 18 00 00 */ lwz r0, 0x0(r24)
|
||||
/* 814F6D88 001C72A8 38 75 00 04 */ addi r3, r21, 0x4
|
||||
/* 814F6D8C 001C72AC 38 80 00 00 */ li r4, 0x0
|
||||
/* 814F6D90 001C72B0 38 A0 00 FC */ li r5, 0xfc
|
||||
/* 814F6D94 001C72B4 7C 00 D9 D6 */ mullw r0, r0, r27
|
||||
/* 814F6D98 001C72B8 90 15 00 00 */ stw r0, 0x0(r21)
|
||||
/* 814F6D9C 001C72BC 83 97 04 A8 */ lwz r28, 0x4a8(r23)
|
||||
/* 814F6DA0 001C72C0 83 37 04 AC */ lwz r25, 0x4ac(r23)
|
||||
/* 814F6DA4 001C72C4 83 17 04 B0 */ lwz r24, 0x4b0(r23)
|
||||
/* 814F6DA8 001C72C8 4B E3 95 8D */ bl memset
|
||||
/* 814F6DAC 001C72CC 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6DB0 001C72D0 3B 60 00 01 */ li r27, 0x1
|
||||
/* 814F6DB4 001C72D4 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6DB8 001C72D8 41 81 00 18 */ bgt .L_814F6DD0
|
||||
/* 814F6DBC 001C72DC 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6DC0 001C72E0 4B FF 40 4D */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6DC4 001C72E4 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6DC8 001C72E8 40 80 00 08 */ bge .L_814F6DD0
|
||||
/* 814F6DCC 001C72EC 48 00 02 44 */ b .L_814F7010
|
||||
.L_814F6DD0:
|
||||
/* 814F6DD0 001C72F0 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6DD4 001C72F4 3F A0 81 62 */ lis r29, TMCJPEGDEC_Zigzag_data@ha
|
||||
/* 814F6DD8 001C72F8 80 97 00 00 */ lwz r4, 0x0(r23)
|
||||
/* 814F6DDC 001C72FC 3B BD E1 B0 */ addi r29, r29, TMCJPEGDEC_Zigzag_data@l
|
||||
/* 814F6DE0 001C7300 38 03 FF F8 */ subi r0, r3, 0x8
|
||||
/* 814F6DE4 001C7304 3B E0 00 01 */ li r31, 0x1
|
||||
/* 814F6DE8 001C7308 7C 80 04 30 */ srw r0, r4, r0
|
||||
/* 814F6DEC 001C730C 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6DF0 001C7310 7C 9C 02 14 */ add r4, r28, r0
|
||||
/* 814F6DF4 001C7314 7C 7C 02 2E */ lhzx r3, r28, r0
|
||||
/* 814F6DF8 001C7318 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6DFC 001C731C B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6E00 001C7320 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
.L_814F6E04:
|
||||
/* 814F6E04 001C7324 A0 81 00 08 */ lhz r4, 0x8(r1)
|
||||
/* 814F6E08 001C7328 2C 04 00 00 */ cmpwi r4, 0x0
|
||||
/* 814F6E0C 001C732C 41 82 00 18 */ beq .L_814F6E24
|
||||
/* 814F6E10 001C7330 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6E14 001C7334 A0 61 00 0A */ lhz r3, 0xa(r1)
|
||||
/* 814F6E18 001C7338 7C 04 00 50 */ subf r0, r4, r0
|
||||
/* 814F6E1C 001C733C 90 17 00 04 */ stw r0, 0x4(r23)
|
||||
/* 814F6E20 001C7340 48 00 00 C0 */ b .L_814F6EE0
|
||||
.L_814F6E24:
|
||||
/* 814F6E24 001C7344 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6E28 001C7348 2C 00 00 11 */ cmpwi r0, 0x11
|
||||
/* 814F6E2C 001C734C 41 81 00 18 */ bgt .L_814F6E44
|
||||
/* 814F6E30 001C7350 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6E34 001C7354 4B FF 3F D9 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6E38 001C7358 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6E3C 001C735C 40 80 00 08 */ bge .L_814F6E44
|
||||
/* 814F6E40 001C7360 48 00 00 94 */ b .L_814F6ED4
|
||||
.L_814F6E44:
|
||||
/* 814F6E44 001C7364 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6E48 001C7368 38 F9 00 24 */ addi r7, r25, 0x24
|
||||
/* 814F6E4C 001C736C 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6E50 001C7370 38 A0 00 09 */ li r5, 0x9
|
||||
/* 814F6E54 001C7374 38 63 FF F7 */ subi r3, r3, 0x9
|
||||
/* 814F6E58 001C7378 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6E5C 001C737C 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6E60 001C7380 54 06 05 FE */ clrlwi r6, r0, 23
|
||||
/* 814F6E64 001C7384 48 00 00 3C */ b .L_814F6EA0
|
||||
.L_814F6E68:
|
||||
/* 814F6E68 001C7388 38 A5 00 01 */ addi r5, r5, 0x1
|
||||
/* 814F6E6C 001C738C 38 E7 00 04 */ addi r7, r7, 0x4
|
||||
/* 814F6E70 001C7390 28 05 00 10 */ cmplwi r5, 0x10
|
||||
/* 814F6E74 001C7394 40 81 00 0C */ ble .L_814F6E80
|
||||
/* 814F6E78 001C7398 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6E7C 001C739C 48 00 00 58 */ b .L_814F6ED4
|
||||
.L_814F6E80:
|
||||
/* 814F6E80 001C73A0 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6E84 001C73A4 54 C6 08 3C */ slwi r6, r6, 1
|
||||
/* 814F6E88 001C73A8 80 17 00 00 */ lwz r0, 0x0(r23)
|
||||
/* 814F6E8C 001C73AC 38 63 FF FF */ subi r3, r3, 0x1
|
||||
/* 814F6E90 001C73B0 7C 00 1C 30 */ srw r0, r0, r3
|
||||
/* 814F6E94 001C73B4 90 77 00 04 */ stw r3, 0x4(r23)
|
||||
/* 814F6E98 001C73B8 54 00 07 FE */ clrlwi r0, r0, 31
|
||||
/* 814F6E9C 001C73BC 7C C6 03 78 */ or r6, r6, r0
|
||||
.L_814F6EA0:
|
||||
/* 814F6EA0 001C73C0 A0 87 00 00 */ lhz r4, 0x0(r7)
|
||||
/* 814F6EA4 001C73C4 A0 67 00 02 */ lhz r3, 0x2(r7)
|
||||
/* 814F6EA8 001C73C8 B0 81 00 0C */ sth r4, 0xc(r1)
|
||||
/* 814F6EAC 001C73CC B0 61 00 0E */ sth r3, 0xe(r1)
|
||||
/* 814F6EB0 001C73D0 80 01 00 0C */ lwz r0, 0xc(r1)
|
||||
/* 814F6EB4 001C73D4 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 814F6EB8 001C73D8 A0 01 00 10 */ lhz r0, 0x10(r1)
|
||||
/* 814F6EBC 001C73DC 7C 06 00 40 */ cmplw r6, r0
|
||||
/* 814F6EC0 001C73E0 41 81 FF A8 */ bgt .L_814F6E68
|
||||
/* 814F6EC4 001C73E4 7C 04 30 50 */ subf r0, r4, r6
|
||||
/* 814F6EC8 001C73E8 7C 00 1A 14 */ add r0, r0, r3
|
||||
/* 814F6ECC 001C73EC 54 00 06 3E */ clrlwi r0, r0, 24
|
||||
/* 814F6ED0 001C73F0 7C 78 00 AE */ lbzx r3, r24, r0
|
||||
.L_814F6ED4:
|
||||
/* 814F6ED4 001C73F4 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6ED8 001C73F8 40 80 00 08 */ bge .L_814F6EE0
|
||||
/* 814F6EDC 001C73FC 48 00 01 34 */ b .L_814F7010
|
||||
.L_814F6EE0:
|
||||
/* 814F6EE0 001C7400 54 7A 07 3F */ clrlwi. r26, r3, 28
|
||||
/* 814F6EE4 001C7404 41 82 00 AC */ beq .L_814F6F90
|
||||
/* 814F6EE8 001C7408 7C 60 26 70 */ srawi r0, r3, 4
|
||||
/* 814F6EEC 001C740C 7F 7B 02 14 */ add r27, r27, r0
|
||||
/* 814F6EF0 001C7410 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6EF4 001C7414 41 80 00 0C */ blt .L_814F6F00
|
||||
/* 814F6EF8 001C7418 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6EFC 001C741C 48 00 01 14 */ b .L_814F7010
|
||||
.L_814F6F00:
|
||||
/* 814F6F00 001C7420 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6F04 001C7424 38 1A 00 08 */ addi r0, r26, 0x8
|
||||
/* 814F6F08 001C7428 7F DD D8 AE */ lbzx r30, r29, r27
|
||||
/* 814F6F0C 001C742C 7C 03 00 00 */ cmpw r3, r0
|
||||
/* 814F6F10 001C7430 41 81 00 18 */ bgt .L_814F6F28
|
||||
/* 814F6F14 001C7434 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6F18 001C7438 4B FF 3E F5 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6F1C 001C743C 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6F20 001C7440 40 80 00 08 */ bge .L_814F6F28
|
||||
/* 814F6F24 001C7444 48 00 00 EC */ b .L_814F7010
|
||||
.L_814F6F28:
|
||||
/* 814F6F28 001C7448 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6F2C 001C744C 7F E3 D0 30 */ slw r3, r31, r26
|
||||
/* 814F6F30 001C7450 80 B7 00 00 */ lwz r5, 0x0(r23)
|
||||
/* 814F6F34 001C7454 38 C3 FF FF */ subi r6, r3, 0x1
|
||||
/* 814F6F38 001C7458 7C 9A 00 50 */ subf r4, r26, r0
|
||||
/* 814F6F3C 001C745C 7C 60 0E 70 */ srawi r0, r3, 1
|
||||
/* 814F6F40 001C7460 38 64 FF F8 */ subi r3, r4, 0x8
|
||||
/* 814F6F44 001C7464 90 97 00 04 */ stw r4, 0x4(r23)
|
||||
/* 814F6F48 001C7468 7C A3 1C 30 */ srw r3, r5, r3
|
||||
/* 814F6F4C 001C746C 7C A5 24 30 */ srw r5, r5, r4
|
||||
/* 814F6F50 001C7470 54 63 15 BA */ clrlslwi r3, r3, 24, 2
|
||||
/* 814F6F54 001C7474 57 C7 15 BA */ clrlslwi r7, r30, 24, 2
|
||||
/* 814F6F58 001C7478 7C 9C 1A 14 */ add r4, r28, r3
|
||||
/* 814F6F5C 001C747C 7C C5 28 38 */ and r5, r6, r5
|
||||
/* 814F6F60 001C7480 7C 7C 1A 2E */ lhzx r3, r28, r3
|
||||
/* 814F6F64 001C7484 7C 00 28 00 */ cmpw r0, r5
|
||||
/* 814F6F68 001C7488 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6F6C 001C748C B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6F70 001C7490 7C 76 38 2E */ lwzx r3, r22, r7
|
||||
/* 814F6F74 001C7494 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
/* 814F6F78 001C7498 40 81 00 08 */ ble .L_814F6F80
|
||||
/* 814F6F7C 001C749C 7C A6 28 50 */ subf r5, r6, r5
|
||||
.L_814F6F80:
|
||||
/* 814F6F80 001C74A0 7C 05 19 D6 */ mullw r0, r5, r3
|
||||
/* 814F6F84 001C74A4 3B 7B 00 01 */ addi r27, r27, 0x1
|
||||
/* 814F6F88 001C74A8 7C 15 39 2E */ stwx r0, r21, r7
|
||||
/* 814F6F8C 001C74AC 48 00 00 58 */ b .L_814F6FE4
|
||||
.L_814F6F90:
|
||||
/* 814F6F90 001C74B0 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6F94 001C74B4 41 82 00 58 */ beq .L_814F6FEC
|
||||
/* 814F6F98 001C74B8 80 17 00 04 */ lwz r0, 0x4(r23)
|
||||
/* 814F6F9C 001C74BC 2C 00 00 08 */ cmpwi r0, 0x8
|
||||
/* 814F6FA0 001C74C0 41 81 00 18 */ bgt .L_814F6FB8
|
||||
/* 814F6FA4 001C74C4 7E E3 BB 78 */ mr r3, r23
|
||||
/* 814F6FA8 001C74C8 4B FF 3E 65 */ bl TMCJPEGDEC_load_buff
|
||||
/* 814F6FAC 001C74CC 2C 03 00 00 */ cmpwi r3, 0x0
|
||||
/* 814F6FB0 001C74D0 40 80 00 08 */ bge .L_814F6FB8
|
||||
/* 814F6FB4 001C74D4 48 00 00 5C */ b .L_814F7010
|
||||
.L_814F6FB8:
|
||||
/* 814F6FB8 001C74D8 80 77 00 04 */ lwz r3, 0x4(r23)
|
||||
/* 814F6FBC 001C74DC 3B 7B 00 10 */ addi r27, r27, 0x10
|
||||
/* 814F6FC0 001C74E0 80 97 00 00 */ lwz r4, 0x0(r23)
|
||||
/* 814F6FC4 001C74E4 38 03 FF F8 */ subi r0, r3, 0x8
|
||||
/* 814F6FC8 001C74E8 7C 80 04 30 */ srw r0, r4, r0
|
||||
/* 814F6FCC 001C74EC 54 00 15 BA */ clrlslwi r0, r0, 24, 2
|
||||
/* 814F6FD0 001C74F0 7C 9C 02 14 */ add r4, r28, r0
|
||||
/* 814F6FD4 001C74F4 7C 7C 02 2E */ lhzx r3, r28, r0
|
||||
/* 814F6FD8 001C74F8 A0 04 00 02 */ lhz r0, 0x2(r4)
|
||||
/* 814F6FDC 001C74FC B0 61 00 08 */ sth r3, 0x8(r1)
|
||||
/* 814F6FE0 001C7500 B0 01 00 0A */ sth r0, 0xa(r1)
|
||||
.L_814F6FE4:
|
||||
/* 814F6FE4 001C7504 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6FE8 001C7508 41 80 FE 1C */ blt .L_814F6E04
|
||||
.L_814F6FEC:
|
||||
/* 814F6FEC 001C750C 2C 1B 00 40 */ cmpwi r27, 0x40
|
||||
/* 814F6FF0 001C7510 40 81 00 0C */ ble .L_814F6FFC
|
||||
/* 814F6FF4 001C7514 38 60 FF 9C */ li r3, -0x64
|
||||
/* 814F6FF8 001C7518 48 00 00 18 */ b .L_814F7010
|
||||
.L_814F6FFC:
|
||||
/* 814F6FFC 001C751C 38 1B FF FF */ subi r0, r27, 0x1
|
||||
/* 814F7000 001C7520 3C 60 81 62 */ lis r3, TMCJPEGDEC_Zigzag_loop@ha
|
||||
/* 814F7004 001C7524 54 00 10 3A */ slwi r0, r0, 2
|
||||
/* 814F7008 001C7528 38 63 E1 F0 */ addi r3, r3, TMCJPEGDEC_Zigzag_loop@l
|
||||
/* 814F700C 001C752C 7C 63 00 2E */ lwzx r3, r3, r0
|
||||
.L_814F7010:
|
||||
/* 814F7010 001C7530 BA A1 00 24 */ lmw r21, 0x24(r1)
|
||||
/* 814F7014 001C7534 80 01 00 54 */ lwz r0, 0x54(r1)
|
||||
/* 814F7018 001C7538 7C 08 03 A6 */ mtlr r0
|
||||
/* 814F701C 001C753C 38 21 00 50 */ addi r1, r1, 0x50
|
||||
/* 814F7020 001C7540 4E 80 00 20 */ blr
|
||||
.endfn TMCJPEGDEC_decode_iquant
|
||||
@@ -1,30 +1,28 @@
|
||||
#include <string.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static u8 clampU8(s32 v) {
|
||||
static s32 clampU8(s32 v) {
|
||||
s32 ok;
|
||||
ok = 0;
|
||||
if (v < 256 && v > -1) {
|
||||
ok = 1;
|
||||
}
|
||||
return ok ? v : 255 & ~(v >> 31);
|
||||
return ok ? v : (v < 0 ? 0 : 255);
|
||||
}
|
||||
|
||||
static s8 clampS8(s32 v) {
|
||||
static s32 clampS8(s32 v) {
|
||||
s32 inRange = 0;
|
||||
if (v < 128 && v > -129) {
|
||||
inRange = 1;
|
||||
}
|
||||
return inRange ? (s8)v : (v > 0) ? 127 : -128;
|
||||
return inRange ? v : (v > 0) ? 127 : -128;
|
||||
}
|
||||
|
||||
static s32 scalingClampU8(s32 val) {
|
||||
s32 result;
|
||||
if (val >> 19 != 0)
|
||||
result = ~(val >> 31) & 0xFF;
|
||||
else
|
||||
result = (val >> 11);
|
||||
return result;
|
||||
static s32 scalingClampU8(s32 value) {
|
||||
if ((value >> 19) == 0) {
|
||||
return value >> 11;
|
||||
}
|
||||
return value < 0 ? 0 : 255;
|
||||
}
|
||||
|
||||
void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||
@@ -33,13 +31,35 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 i;
|
||||
s32 b1, b2, b3, b4, b5, b6, b7;
|
||||
s32 v, e, a, d, n, o, p, q, t, u, w, x, y;
|
||||
s32 x_factor, z_factor, m_part, p_part;
|
||||
s32 r, z, m;
|
||||
s32 e;
|
||||
s32 b2;
|
||||
s32 b3;
|
||||
s32 b4;
|
||||
s32 b5;
|
||||
s32 b6;
|
||||
s32 b7;
|
||||
s32 v;
|
||||
s32 m;
|
||||
s32 a;
|
||||
s32 d;
|
||||
s32 z;
|
||||
s32 o;
|
||||
s32 p;
|
||||
s32 p_part;
|
||||
s32 t;
|
||||
s32 u;
|
||||
s32 r;
|
||||
s32 n;
|
||||
s32 y;
|
||||
s32 x_factor;
|
||||
s32 z_factor;
|
||||
s32 m_part;
|
||||
s32 q;
|
||||
s32 w;
|
||||
s32 x;
|
||||
s32 b1;
|
||||
|
||||
r = (zigzag >> 4) * 8;
|
||||
iter = (u32)(r + 7) >> 3;
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
{
|
||||
@@ -71,28 +91,41 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
dst[1] = val;
|
||||
dst[0] = val;
|
||||
} else {
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = block[0] - b4;
|
||||
d = block[0] + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
m_part = (b1 - b7) * 0x14E >> 8;
|
||||
p_part = (b5 - b3) * 0x8B >> 8;
|
||||
s32 oddLowSum;
|
||||
s32 oddHighSum;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
b5 = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = block[0];
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - t;
|
||||
m = m_part - z;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
o = x + m;
|
||||
p = z + p_part;
|
||||
q = x + p;
|
||||
dst[0] = w + n;
|
||||
p_part = b5 * 0x8B;
|
||||
dst[7] = w - n;
|
||||
p_part >>= 8;
|
||||
dst[1] = v + o;
|
||||
p = z + p_part;
|
||||
q = p + x;
|
||||
dst[6] = v - o;
|
||||
dst[2] = e + q;
|
||||
dst[5] = e - q;
|
||||
@@ -145,25 +178,37 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
out[pitch] = val;
|
||||
out[0] = val;
|
||||
} else {
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = (*dst + 0x40000) - b4;
|
||||
d = (*dst + 0x40000) + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
s32 oddLowSum;
|
||||
s32 oddHighSum;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
b5 = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
b2 = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = *dst + 0x40000;
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = b2 + u;
|
||||
v = a + b2;
|
||||
z_factor = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
|
||||
z_factor = ((b5 - b3) + (b1 - b7)) * 0x62 >> 8;
|
||||
m_part = ((b1 - b7) * 0x14E >> 8) - z_factor;
|
||||
|
||||
n = (b1 + b7) + ((b5 + b3) + m_part);
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - b2;
|
||||
m_part = m_part - z_factor;
|
||||
oddLowSum += m_part;
|
||||
n = oddHighSum + oddLowSum;
|
||||
o = x + m_part;
|
||||
p = ((b5 - b3) * 0x8B >> 8) + z_factor;
|
||||
q = x + p;
|
||||
|
||||
p_part = b5 * 0x8B >> 8;
|
||||
p = z_factor + p_part;
|
||||
q = p + x;
|
||||
out[0] = scalingClampU8(w + n);
|
||||
out[r] = scalingClampU8(w - n);
|
||||
out[pitch] = scalingClampU8(v + o);
|
||||
@@ -182,11 +227,34 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
s32* dst;
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 i;
|
||||
s32 b1, b2, b3, b4, b5, b6, b7;
|
||||
s32 v, e, a, d, m, n, o, p, q, t, u, w, x, y, z;
|
||||
s32 x_factor, z_factor, m_part, p_part;
|
||||
s32 d;
|
||||
s32 b1;
|
||||
s32 b2;
|
||||
s32 b3;
|
||||
s32 b4;
|
||||
s32 b5;
|
||||
s32 b6;
|
||||
s32 b7;
|
||||
s32 v;
|
||||
s32 r;
|
||||
s32 a;
|
||||
s32 i;
|
||||
s32 m;
|
||||
s32 n;
|
||||
s32 o;
|
||||
s32 x;
|
||||
s32 q;
|
||||
s32 y;
|
||||
s32 u;
|
||||
s32 w;
|
||||
s32 p;
|
||||
s32 t;
|
||||
s32 z;
|
||||
s32 x_factor;
|
||||
s32 z_factor;
|
||||
s32 m_part;
|
||||
s32 p_part;
|
||||
s32 e;
|
||||
|
||||
if (zigzag == 0x11) {
|
||||
s32 val;
|
||||
@@ -200,90 +268,42 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
goto mode_gt_2;
|
||||
}
|
||||
|
||||
{
|
||||
s32 inner;
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
for (; done < r; done += 8) {
|
||||
s32 dcValue;
|
||||
s32 oddCoefficient;
|
||||
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
iter = (r + 7) >> 3;
|
||||
if (r > 0) {
|
||||
inner = (r + 7) >> 4;
|
||||
done = iter << 3;
|
||||
if (inner != 0) {
|
||||
for (; inner > 0; inner--) {
|
||||
t = block[1] * 0xB5 >> 8;
|
||||
v = block[1] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[1] * 0x14E >> 8) - v;
|
||||
m = block[1] + z;
|
||||
n = t + z;
|
||||
b1 = block[0] + m;
|
||||
dst[0] = b1;
|
||||
dst[7] = block[0] - m;
|
||||
dst[1] = block[0] + n;
|
||||
dst[6] = block[0] - n;
|
||||
dst[2] = block[0] + u;
|
||||
dst[5] = block[0] - u;
|
||||
dst[3] = block[0] + v;
|
||||
dst[4] = block[0] - v;
|
||||
|
||||
t = block[9] * 0xB5 >> 8;
|
||||
v = block[9] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[9] * 0x14E >> 8) - v;
|
||||
m = block[9] + z;
|
||||
n = t + z;
|
||||
b2 = block[8] + m;
|
||||
dst[8] = b2;
|
||||
dst[15] = block[8] - m;
|
||||
dst[9] = block[8] + n;
|
||||
dst[14] = block[8] - n;
|
||||
dst[10] = block[8] + u;
|
||||
dst[13] = block[8] - u;
|
||||
dst[11] = block[8] + v;
|
||||
dst[12] = block[8] - v;
|
||||
dst += 0x10;
|
||||
block += 0x10;
|
||||
}
|
||||
iter = iter & 1;
|
||||
if (iter == 0) {
|
||||
goto zero_fill;
|
||||
}
|
||||
}
|
||||
for (; iter > 0; iter--) {
|
||||
t = block[1] * 0xB5 >> 8;
|
||||
v = block[1] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[1] * 0x14E >> 8) - v;
|
||||
m = block[1] + z;
|
||||
n = t + z;
|
||||
b1 = block[0] + m;
|
||||
dst[0] = b1;
|
||||
dst[7] = block[0] - m;
|
||||
dst[1] = block[0] + n;
|
||||
dst[6] = block[0] - n;
|
||||
dst[2] = block[0] + u;
|
||||
dst[5] = block[0] - u;
|
||||
dst[3] = block[0] + v;
|
||||
dst[4] = block[0] - v;
|
||||
dst += 8;
|
||||
block += 8;
|
||||
}
|
||||
}
|
||||
zero_fill:
|
||||
dst = tmp + done;
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
oddCoefficient = block[1];
|
||||
dcValue = block[0];
|
||||
t = oddCoefficient * 0xB5 >> 8;
|
||||
v = oddCoefficient * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (oddCoefficient * 0x14E >> 8) - v;
|
||||
m = oddCoefficient + z;
|
||||
n = t + z;
|
||||
dst[0] = dcValue + m;
|
||||
dst[7] = dcValue - m;
|
||||
dst[1] = dcValue + n;
|
||||
dst[6] = dcValue - n;
|
||||
dst[2] = dcValue + u;
|
||||
dst[5] = dcValue - u;
|
||||
dst[3] = dcValue + v;
|
||||
dst[4] = dcValue - v;
|
||||
dst += 8;
|
||||
block += 8;
|
||||
}
|
||||
dst = tmp + done;
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
goto epilogue;
|
||||
|
||||
mode_gt_2:
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
if (r > 0) {
|
||||
for (iter = (r + 7) >> 3; iter > 0; iter--) {
|
||||
for (; done < r; done += 8) {
|
||||
u32 ac;
|
||||
b4 = block[4];
|
||||
b6 = block[6];
|
||||
@@ -312,28 +332,43 @@ mode_gt_2:
|
||||
dst[1] = val;
|
||||
dst[0] = val;
|
||||
} else {
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = block[0] - b4;
|
||||
d = block[0] + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
m_part = (b1 - b7) * 0x14E >> 8;
|
||||
p_part = (b5 - b3) * 0x8B >> 8;
|
||||
s32 oddLowSum;
|
||||
s32 oddLowDifference;
|
||||
s32 oddHighSum;
|
||||
s32 oddHighDifference;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
oddLowDifference = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
oddHighDifference = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = oddLowDifference + oddHighDifference;
|
||||
dcValue = block[0];
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = oddHighDifference * 0x14E >> 8;
|
||||
e = a - t;
|
||||
m = m_part - z;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
o = x + m;
|
||||
dst[0] = w + n;
|
||||
p_part = oddLowDifference * 0x8B;
|
||||
dst[7] = w - n;
|
||||
p_part >>= 8;
|
||||
dst[1] = v + o;
|
||||
p = z + p_part;
|
||||
q = p + x;
|
||||
dst[0] = w + n;
|
||||
dst[7] = w - n;
|
||||
dst[1] = v + o;
|
||||
dst[6] = v - o;
|
||||
dst[2] = e + q;
|
||||
dst[5] = e - q;
|
||||
@@ -342,8 +377,6 @@ mode_gt_2:
|
||||
}
|
||||
block += 8;
|
||||
dst += 8;
|
||||
done += 8;
|
||||
}
|
||||
}
|
||||
|
||||
dst = tmp + done;
|
||||
@@ -357,7 +390,9 @@ epilogue:
|
||||
dst = tmp + 7;
|
||||
for (iter = 8, i = 7; iter > 0; iter--, i--) {
|
||||
u32 ac;
|
||||
u8* output;
|
||||
b4 = dst[0x20];
|
||||
output = conv_row_ptr + i;
|
||||
b6 = dst[0x30];
|
||||
b2 = dst[0x10];
|
||||
b1 = dst[8];
|
||||
@@ -375,42 +410,56 @@ epilogue:
|
||||
if (ac == 0) {
|
||||
s32 val;
|
||||
val = clampS8(*dst >> 11);
|
||||
conv_row_ptr[i + 56] = (u8)val;
|
||||
conv_row_ptr[i + 48] = (u8)val;
|
||||
conv_row_ptr[i + 40] = (u8)val;
|
||||
conv_row_ptr[i + 32] = (u8)val;
|
||||
conv_row_ptr[i + 24] = (u8)val;
|
||||
conv_row_ptr[i + 16] = (u8)val;
|
||||
conv_row_ptr[i + 8] = (u8)val;
|
||||
conv_row_ptr[i] = (u8)val;
|
||||
output[56] = (u8)val;
|
||||
output[48] = (u8)val;
|
||||
output[40] = (u8)val;
|
||||
output[32] = (u8)val;
|
||||
output[24] = (u8)val;
|
||||
output[16] = (u8)val;
|
||||
output[8] = (u8)val;
|
||||
output[0] = (u8)val;
|
||||
} else {
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = *dst - b4;
|
||||
d = *dst + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
s32 oddLowSum;
|
||||
s32 oddLowDifference;
|
||||
s32 oddHighSum;
|
||||
s32 oddHighDifference;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
oddLowDifference = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
oddHighDifference = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = oddLowDifference + oddHighDifference;
|
||||
dcValue = *dst;
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
m = ((b1 - b7) * 0x14E >> 8) - z;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = oddHighDifference * 0x14E >> 8;
|
||||
e = a - t;
|
||||
m = m_part - z;
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
o = x + m;
|
||||
|
||||
p = z + ((b5 - b3) * 0x8B >> 8);
|
||||
p_part = oddLowDifference * 0x8B >> 8;
|
||||
p = z + p_part;
|
||||
q = p + x;
|
||||
|
||||
conv_row_ptr[i] = (u8)clampS8((w + n) >> 11);
|
||||
conv_row_ptr[i + 56] = (u8)clampS8((w - n) >> 11);
|
||||
conv_row_ptr[i + 8] = (u8)clampS8((v + o) >> 11);
|
||||
conv_row_ptr[i + 48] = (u8)clampS8((v - o) >> 11);
|
||||
conv_row_ptr[i + 16] = (u8)clampS8((e + q) >> 11);
|
||||
conv_row_ptr[i + 40] = (u8)clampS8((e - q) >> 11);
|
||||
conv_row_ptr[i + 24] = (u8)clampS8((y + p) >> 11);
|
||||
conv_row_ptr[i + 32] = (u8)clampS8((y - p) >> 11);
|
||||
output[0] = (u8)clampS8((w + n) >> 11);
|
||||
output[56] = (u8)clampS8((w - n) >> 11);
|
||||
output[8] = (u8)clampS8((v + o) >> 11);
|
||||
output[48] = (u8)clampS8((v - o) >> 11);
|
||||
output[16] = (u8)clampS8((e + q) >> 11);
|
||||
output[40] = (u8)clampS8((e - q) >> 11);
|
||||
output[24] = (u8)clampS8((y + p) >> 11);
|
||||
output[32] = (u8)clampS8((y - p) >> 11);
|
||||
}
|
||||
dst--;
|
||||
}
|
||||
|
||||
@@ -244,6 +244,11 @@ _error:
|
||||
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo) {
|
||||
u16 byteOrder;
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -262,11 +267,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -294,11 +296,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -319,11 +318,8 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -354,7 +350,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x0111:
|
||||
case 0x0201:
|
||||
case 0x0202: {
|
||||
return;
|
||||
break;
|
||||
}
|
||||
case 0x0112: {
|
||||
pInfo->orientation = readU16(entry + 8, byteOrder);
|
||||
@@ -474,21 +470,19 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
case 0xA002: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
if (type == 4) {
|
||||
pInfo->pixelXDim = offset;
|
||||
} else if (type == 3) {
|
||||
if (type == 3) {
|
||||
pInfo->pixelXDim = readU16(entry + 8, byteOrder);
|
||||
} else if (type == 4) {
|
||||
pInfo->pixelXDim = readU32(entry + 8, byteOrder);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
case 0xA003: {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
if (type == 4) {
|
||||
pInfo->pixelYDim = offset;
|
||||
} else if (type == 3) {
|
||||
if (type == 3) {
|
||||
pInfo->pixelYDim = readU16(entry + 8, byteOrder);
|
||||
} else if (type == 4) {
|
||||
pInfo->pixelYDim = readU32(entry + 8, byteOrder);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -508,7 +502,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x9000:
|
||||
case 0x9101:
|
||||
case 0xA003: {
|
||||
return;
|
||||
break;
|
||||
}
|
||||
case 0x011A: {
|
||||
u32 offset;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -1411,131 +1411,22 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x130(r1)
|
||||
mflr r0
|
||||
lis r4, lbl_8161E080@ha
|
||||
stw r0, 0x134(r1)
|
||||
addi r4, r4, lbl_8161E080@l
|
||||
li r0, 0x20
|
||||
addi r6, r1, 0xc
|
||||
stmw r24, 0x110(r1)
|
||||
mr r30, r3
|
||||
addi r5, r4, -4
|
||||
mtctr r0
|
||||
|
||||
_parse_dqt_copy:
|
||||
lwz r4, 4(r5)
|
||||
lwzu r0, 8(r5)
|
||||
stw r4, 4(r6)
|
||||
stwu r0, 8(r6)
|
||||
bdnz _parse_dqt_copy
|
||||
|
||||
addi r31, r3, 0x58
|
||||
mr r4, r30
|
||||
addi r3, r1, 0xa
|
||||
bl TMCJPEGDEC_get_wbyte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_length
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_length:
|
||||
lhz r3, 0xa(r1)
|
||||
addi r29, r1, 0x10
|
||||
li r27, 1
|
||||
lis r28, TMCJPEGDEC_Zigzag_data@ha
|
||||
addi r0, r3, -2
|
||||
sth r0, 0xa(r1)
|
||||
|
||||
_parse_dqt_table:
|
||||
lhz r5, 0xa(r1)
|
||||
mr r4, r30
|
||||
addi r3, r1, 9
|
||||
addi r0, r5, -0x41
|
||||
sth r0, 0xa(r1)
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_qt_info
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_qt_info:
|
||||
lbz r0, 9(r1)
|
||||
cmplwi r0, 4
|
||||
ble _parse_dqt_valid_qt_info
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_qt_info:
|
||||
add r3, r31, r0
|
||||
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
|
||||
stb r27, 0x1790(r3)
|
||||
li r25, 0
|
||||
|
||||
_parse_dqt_coeff:
|
||||
lbz r24, 0(r26)
|
||||
cmpwi r24, 0x3f
|
||||
ble _parse_dqt_valid_coeff
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_coeff:
|
||||
mr r4, r30
|
||||
addi r3, r1, 8
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_coeff
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_coeff:
|
||||
slwi r4, r24, 2
|
||||
lbz r3, 9(r1)
|
||||
add r0, r4, r31
|
||||
lbz r5, 8(r1)
|
||||
lwzx r4, r29, r4
|
||||
slwi r3, r3, 8
|
||||
mullw. r4, r5, r4
|
||||
stwx r4, r3, r0
|
||||
bne _parse_dqt_nonzero
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_nonzero:
|
||||
addi r25, r25, 1
|
||||
addi r26, r26, 1
|
||||
cmpwi r25, 0x40
|
||||
blt _parse_dqt_coeff
|
||||
lhz r0, 0xa(r1)
|
||||
cmpwi r0, 0
|
||||
bne _parse_dqt_table
|
||||
li r3, 0
|
||||
|
||||
_parse_dqt_return:
|
||||
lmw r24, 0x110(r1)
|
||||
lwz r0, 0x134(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x130
|
||||
blr
|
||||
}
|
||||
#else
|
||||
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
typedef struct {
|
||||
u32 data[64];
|
||||
} CopyBlock64;
|
||||
|
||||
u8* scaleInfo;
|
||||
u32 tblCopy[65];
|
||||
u32* tblPtr;
|
||||
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
|
||||
QuantizationTables* scaleInfo;
|
||||
u32 tblCopy[64];
|
||||
u32* d;
|
||||
u16 len;
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
||||
|
||||
scaleInfo = (u8*)work + 0x58;
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
|
||||
r = TMCJPEGDEC_get_wbyte(&len, work);
|
||||
if (r < 0) {
|
||||
@@ -1543,8 +1434,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
len -= 2;
|
||||
|
||||
tblPtr = &tblCopy[1];
|
||||
|
||||
do {
|
||||
u8 qtInfo;
|
||||
const u8* zigPtr;
|
||||
@@ -1563,11 +1452,10 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return -0x41;
|
||||
}
|
||||
|
||||
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
|
||||
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
|
||||
|
||||
zigPtr = TMCJPEGDEC_Zigzag_data;
|
||||
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
|
||||
u32 tmp;
|
||||
|
||||
zz = *zigPtr;
|
||||
if (zz > 0x3F) {
|
||||
@@ -1579,9 +1467,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return r;
|
||||
}
|
||||
|
||||
tmp = (zz << 2) + ((u32)qtInfo << 8);
|
||||
val = (u32)byte * tblPtr[zz];
|
||||
*(u32*)(tmp + scaleInfo) = val;
|
||||
val = (u32)byte * tblCopy[zz];
|
||||
scaleInfo->coefficients[qtInfo][zz] = val;
|
||||
if (val == 0) {
|
||||
return -0x41;
|
||||
}
|
||||
@@ -1592,7 +1479,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -142,6 +142,9 @@ typedef struct ziFuzzyZYPairs {
|
||||
int rANDn : 1;
|
||||
int bANDp : 1;
|
||||
int gANDk : 1;
|
||||
int dANDt : 1;
|
||||
|
||||
int reserved : 20;
|
||||
} ziFuzzyZYPairs;
|
||||
|
||||
typedef struct _ziGetParam {
|
||||
@@ -357,8 +360,8 @@ typedef struct ziMatchParam {
|
||||
ziWChar first2; // 0x68
|
||||
ziWChar comp; // 0x6A
|
||||
ziU8 nSeg; // 0x6C
|
||||
ziU8 segs1[0xC0]; // 0x6D
|
||||
ziU8 segsD[0xC0]; // 0x12D
|
||||
ziU8 segs1[16][12]; // 0x6D
|
||||
ziU8 segsD[16][12]; // 0x12D
|
||||
ziU8 pad_0x1ED; // 0x1ED
|
||||
} ziMatchParam;
|
||||
|
||||
|
||||
@@ -67,12 +67,11 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return mapped[character - defaults->first];
|
||||
}
|
||||
ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 index, count, first, last, value;
|
||||
ziU16 index, count, value, first, last;
|
||||
ziU8* cursor;
|
||||
ziConversionTable* table;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -83,94 +82,109 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
for (index = 0; index < count; index++) {
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (first <= character && character <= last) {
|
||||
value = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first == last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
}
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return ((ziU8*)table->entries)[character + value - first];
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
}
|
||||
entry++;
|
||||
value = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
}
|
||||
entry = (ziConversionEntry*)((ziU8*)table + value + character - first + 8);
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return *(ziU8*)entry;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
} else {
|
||||
defaults = &Zi8CvrtTables.reverse;
|
||||
if (defaults == 0) {
|
||||
ranges = Zi8CvrtTables.reverse.entries;
|
||||
if (ranges == 0) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
count = Zi8CvrtTables.reverse.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (ranges[index].first == ranges[index].last) return ranges[index].result.character & 0xFF;
|
||||
return ((ziU8*)ranges[index].result.table)[character - ranges[index].first];
|
||||
if (ranges[index].first == ranges[index].last)
|
||||
return ranges[index].result.character & 0xFF;
|
||||
cursor = ranges[index].result.table;
|
||||
return cursor[character - ranges[index].first];
|
||||
}
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 count, index, first, last;
|
||||
ziU32 key = 0;
|
||||
ziU16 key = 0;
|
||||
ziU16 index, count, first, last;
|
||||
ziConversionTable* table;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziWChar* mapped;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (ZI_WORK->userKeys[language] != 0) return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (ZI_WORK->userKeys[language] != 0)
|
||||
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
|
||||
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
for (index = 0; index < count; index++) {
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (first <= character && character <= last) {
|
||||
key = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first != last) {
|
||||
cursor = (ziU8*)table->entries + key + (character - first) * 2;
|
||||
key = (ziU16)cursor[0] << 8 | cursor[1];
|
||||
}
|
||||
break;
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
}
|
||||
entry++;
|
||||
key = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) break;
|
||||
entry = (ziConversionEntry*)((ziU8*)table + key + (character - first) * 2);
|
||||
entry = (ziConversionEntry*)((ziU8*)entry + 8);
|
||||
key = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
defaults = &Zi8CvrtTables.keys;
|
||||
if (defaults == 0) {
|
||||
ranges = Zi8CvrtTables.keys.entries;
|
||||
if (ranges == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) key = ranges[index].result.character & 0xFF;
|
||||
else key = ((ziWChar*)ranges[index].result.table)[character - ranges[index].first];
|
||||
count = Zi8CvrtTables.keys.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) {
|
||||
key = (ziU8)ranges[index].result.character;
|
||||
break;
|
||||
}
|
||||
mapped = ranges[index].result.table;
|
||||
key = mapped[character - ranges[index].first];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (key == 0) {
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
key = 0xEFF1;
|
||||
} else Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
return 0xEFF1;
|
||||
} else {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
}
|
||||
}
|
||||
ziWChar Zi8ConvertWC2Key(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return Zi8ConvertUC2Key(Zi8ConvertWC2UC(character, language, __zi8_work_data), language, __zi8_work_data);
|
||||
|
||||
@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
|
||||
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
Zi8UInt length = 0;
|
||||
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
|
||||
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
|
||||
ziU16 tone = (ziU16)(key & 7);
|
||||
Zi8UInt length = 0;
|
||||
volatile ziU16 tone = (ziU16)(key & 7);
|
||||
|
||||
output[0] = zi8PYinitialSpelling[initialIndex][0];
|
||||
output[1] = zi8PYinitialSpelling[initialIndex][1];
|
||||
@@ -311,7 +311,7 @@ Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
return length;
|
||||
}
|
||||
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,Zi8UInt tone)
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
|
||||
{
|
||||
ziU16 spelling[16];
|
||||
Zi8UInt spellingLength;
|
||||
@@ -330,7 +330,7 @@ ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFul
|
||||
if ((requireFull != 0) && ((inputLength & 0xff) != (spellingLength & 0xff))) {
|
||||
return 0;
|
||||
}
|
||||
if (((tone & 0xff) == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
|
||||
if ((tone == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
|
||||
switch (input[(inputLength & 0xff) - 1]) {
|
||||
case 0xeff1:
|
||||
case 0xeff2:
|
||||
@@ -943,8 +943,7 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
*output |= 0xf300;
|
||||
output++;
|
||||
} else {
|
||||
*output = 0xf360;
|
||||
output++;
|
||||
*output++ = 0xf360;
|
||||
}
|
||||
}
|
||||
tableIndex++;
|
||||
|
||||
@@ -305,7 +305,7 @@ ziU8 Zi8LangSupported(ziU8 language, ziPtr work);
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchPUDdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziBool reservedMode, ziBool exactLength, ziPtr work);
|
||||
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU8 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
void Zi8Memset(ziPtr destination, ziU32 value, ziU32 count);
|
||||
ziU16 Zi8WCharCount(ziWChar* word, ziPtr work);
|
||||
ziBool Zi8ZHCheckSpelling(ziWChar* word, ziWChar* elements, ziU8 count, ziPtr work);
|
||||
@@ -414,7 +414,12 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
|
||||
phoneticInput = ZI8_TRUE;
|
||||
for (elementIndex = 0; elementIndex < elementCount; elementIndex++) {
|
||||
normalizedElements[elementIndex] = elements[elementIndex];
|
||||
if ((int)elements[elementIndex] < 0xf336 && (int)elements[elementIndex] >= 0xf331) {
|
||||
switch ((int)elements[elementIndex]) {
|
||||
case 0xf331:
|
||||
case 0xf332:
|
||||
case 0xf333:
|
||||
case 0xf334:
|
||||
case 0xf335:
|
||||
phoneticSeparator = ZI8_TRUE;
|
||||
phoneticInput = ZI8_FALSE;
|
||||
if ((language == 0x7d) || ((language == 0x79 || (language == 0x7a)))) {
|
||||
@@ -887,7 +892,7 @@ selectDictionary:
|
||||
if ((((matchMode == 0) && (currentVowelRestriction)) &&
|
||||
((2 < (int)elementCount &&
|
||||
((((ZiAlphaWork*)workData)->language == language &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
|
||||
(((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
|
||||
(elements[elementCount - 1] == 0xeff1)) {
|
||||
wordLength = 0;
|
||||
}
|
||||
@@ -942,15 +947,15 @@ selectDictionary:
|
||||
}
|
||||
if (wordLength != 0) goto filterVowelCandidate;
|
||||
dictionaryStatus[dictionaryKind] = 1;
|
||||
if (elements[apostropheIndex] < 0xEFF1) goto finishDictionaryPass;
|
||||
goto retryDictionary;
|
||||
if (elements[apostropheIndex] >= 0xEFF1) goto retryDictionary;
|
||||
goto finishDictionaryPass;
|
||||
}
|
||||
filterVowelCandidate:
|
||||
if ((wordLength != 0) && (prefixVowelRestriction)) {
|
||||
if ((*wordCursor >= 0x30) && (*wordCursor <= 0x39)) {
|
||||
wordLength = 0;
|
||||
} else {
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) && (0xeff0 < *wordCursor)) {
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) && (*wordCursor >= 0xeff1)) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
goto finishDictionaryPass;
|
||||
}
|
||||
@@ -1017,67 +1022,59 @@ filterVowelCandidate:
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
index = *punctuationCursor;
|
||||
*wordCursor = index;
|
||||
if (index == 0) {
|
||||
if ((*wordCursor = *punctuationCursor) != 0) {
|
||||
punctuationCursor++;
|
||||
wordLength = 1;
|
||||
} else {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
punctuationCursor = punctuationCursor + 1;
|
||||
wordLength = 1;
|
||||
break;
|
||||
case 11:
|
||||
if (prefixCount != 0) break;
|
||||
if (retryPunctuation) {
|
||||
for (index = 0; index < parameters->elementCount - 1; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if (index < parameters->elementCount - 1) {
|
||||
wordLength = 0;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for (index = 0; index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if (index < ((ZiAlphaWork*)workData)->rememberedCount) {
|
||||
wordLength = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ((wordCursor[index++] = *punctuationCursor) != 0) {
|
||||
punctuationCursor++;
|
||||
wordLength = index;
|
||||
} else {
|
||||
wordLength = 0;
|
||||
}
|
||||
break;
|
||||
case 0xb:
|
||||
if (prefixCount == 0) {
|
||||
if (retryPunctuation) {
|
||||
for (index = 0;
|
||||
index < parameters->elementCount - 1; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if (index < (int)(parameters->elementCount - 1)) {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
appendPunctuation:
|
||||
wordLength = index + 1;
|
||||
wordCursor[index] = *punctuationCursor;
|
||||
if (wordCursor[index] == 0) {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
punctuationCursor = punctuationCursor + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (index = 0;
|
||||
index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if ((int)(unsigned int)((ZiAlphaWork*)workData)->rememberedCount <= index) goto appendPunctuation;
|
||||
wordLength = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
dictionaryStatus[dictionaryKind] = 1;
|
||||
if (wordLength == 0) {
|
||||
dictionaryStatus[dictionaryKind] = 2;
|
||||
if ((((((((ZiAlphaWork*)workData)->prefixEnabled != '\0') && (!retryPunctuation)) && (parameters->elementCount != 0)) &&
|
||||
(((int)(parameters->elementCount - 1) <= (int)(unsigned int)((ZiAlphaWork*)workData)->requiredLength &&
|
||||
((((ZiAlphaWork*)workData)->requiredLength >= parameters->elementCount - 1 &&
|
||||
(parameters->elements[parameters->elementCount - 1] == 0xEFF1)))) &&
|
||||
(((((ZiAlphaWork*)workData)->prefixEnabled != '\x01' ||
|
||||
(((ZiAlphaWork*)workData)->requiredLength != parameters->elementCount)) &&
|
||||
(((((ZiAlphaWork*)workData)->prefixLength == '\0' ||
|
||||
((unsigned int)parameters->elementCount <= ((ZiAlphaWork*)workData)->prefixLength + 1)) && (dictionaryExact != 0)))
|
||||
(((ZiAlphaWork*)workData)->prefixLength + 1 >= parameters->elementCount)) && (dictionaryExact != 0)))
|
||||
))) && ((((completionAllowed && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
|
||||
((((int)dictionaryIndex < (int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount &&
|
||||
(((ZiAlphaOptions*)optionData)->lookupMode == '\0')) &&
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
|
||||
if (language != ((ZiAlphaWork*)workData)->language) break;
|
||||
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
|
||||
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
|
||||
if (index == 0xc || (index < 9 && index >= 5)) {
|
||||
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
|
||||
punctuationBuffer[0] = 0;
|
||||
}
|
||||
@@ -1089,10 +1086,10 @@ appendPunctuation:
|
||||
}
|
||||
if ((((((dictionaryExact == 0) || (!completionAllowed)) || (prefixCount != 0)) ||
|
||||
((dictionaryKind == 0xb ||
|
||||
((int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount <= (int)dictionaryIndex)))) ||
|
||||
(elements == (ziU16 *)0x0)) ||
|
||||
(dictionaryIndex >= ((ZiAlphaWork*)workData)->dictionaryCount)))) ||
|
||||
(elements == 0)) ||
|
||||
((((elementCount == 0 || (elements[elementCount - 1] != 0xeff1)) ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
|
||||
((((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
|
||||
(((((ZiAlphaWork*)workData)->rememberedWord[0] == 0 || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] != 0)))))) ||
|
||||
(languagePassCount == 2)))) break;
|
||||
@@ -1104,7 +1101,7 @@ appendPunctuation:
|
||||
punctuationCursor = &punctuationBuffer[0];
|
||||
dictionaryKind = 0xb;
|
||||
}
|
||||
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
|
||||
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
|
||||
if (prefixVowelRestriction) {
|
||||
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
|
||||
if (language == 0x2f) {
|
||||
@@ -1119,15 +1116,15 @@ appendPunctuation:
|
||||
{
|
||||
prepareCandidate:
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) &&
|
||||
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
|
||||
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
break;
|
||||
}
|
||||
wordCursor[wordLength] = 0;
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
|
||||
{
|
||||
wordLength = elementCount;
|
||||
wordCursor[elementCount] = 0;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
|
||||
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
|
||||
@@ -1139,35 +1136,39 @@ prepareCandidate:
|
||||
((Zi8ZHCheckSpelling(wordCursor,parameters->elements,parameters->elementCount,
|
||||
workData)) != '\0')) {
|
||||
if ((((ZiAlphaWork*)workData)->caseMode != '\0') && ((!phoneticInput && (!phoneticSeparator)))) {
|
||||
Zi8ChangeWordCase(wordCursor + -prefixCount,language,workData);
|
||||
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
|
||||
}
|
||||
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
|
||||
((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = (ziU8)((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
if (((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor + -prefixCount,wordLength + prefixCount & 0xff,
|
||||
if (((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor - prefixCount,wordLength + prefixCount & 0xff,
|
||||
workData)) != '\0')) {
|
||||
if ((prefixCount != 0) && ((ziU8)((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
if ((prefixCount != 0) && (((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
}
|
||||
else {
|
||||
|
||||
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
((int)(wordLength + prefixCount) < 2)) ||
|
||||
((int)(wordLength + prefixCount) <= 1)) ||
|
||||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
|
||||
if (dictionaryKind == 5) {
|
||||
switch (dictionaryKind) {
|
||||
case 5:
|
||||
case 1:
|
||||
case 9:
|
||||
checkKeyLayout:
|
||||
keyLayoutCursor = keyLayout;
|
||||
candidateCharacterCount = wordLength + prefixCount;
|
||||
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
if (candidateCharacterCount <= *keyLayoutCursor) {
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) {
|
||||
if (*keyLayoutCursor < candidateCharacterCount) {
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
} else {
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) {
|
||||
index = (unsigned int)keyLayoutCount;
|
||||
}
|
||||
break;
|
||||
}
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
}
|
||||
if ((int)index < (int)(unsigned int)keyLayoutCount) {
|
||||
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
|
||||
@@ -1175,32 +1176,31 @@ checkKeyLayout:
|
||||
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
|
||||
}
|
||||
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
for (elementIndex = 0;
|
||||
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
|
||||
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
|
||||
elementIndex = elementIndex + 1) {
|
||||
elementIndex = 0;
|
||||
while (elementIndex < candidateCharacterCount) {
|
||||
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
|
||||
elementIndex++;
|
||||
}
|
||||
if (elementIndex == candidateCharacterCount) {
|
||||
wordCursor[-prefixCount] = 0;
|
||||
goto retryDictionary;
|
||||
}
|
||||
keyLayoutCursor += candidateCharacterCount;
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) break;
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else if (dictionaryKind < 5) {
|
||||
if (dictionaryKind == 1) goto checkKeyLayout;
|
||||
}
|
||||
else if (dictionaryKind == 9) goto checkKeyLayout;
|
||||
emitCandidate:
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)(wordLength + prefixCount) < (int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->shortestWord) {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
|
||||
}
|
||||
if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
|
||||
}
|
||||
}
|
||||
@@ -1224,23 +1224,17 @@ emitCandidate:
|
||||
} else {
|
||||
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
|
||||
(candidateCount == 0)) {
|
||||
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
else {
|
||||
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
}
|
||||
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
|| ((parameters->maxCandidates != 1 &&
|
||||
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (dictionaryExact != 0 &&
|
||||
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
|
||||
(parameters->maxCandidates == 1 ||
|
||||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
|
||||
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index]
|
||||
= wordCursor[index - prefixCount];
|
||||
@@ -1251,6 +1245,13 @@ emitCandidate:
|
||||
}
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
|
||||
}
|
||||
else {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
|
||||
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
|
||||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
|
||||
@@ -1313,7 +1314,7 @@ emitCandidate:
|
||||
}
|
||||
else {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
wordCursor = wordCursor - prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
wordLength += prefixCount;
|
||||
for (index = 0; parameters->elementCount + index < wordLength; index++) {
|
||||
@@ -1435,7 +1436,7 @@ finishDictionaryPass:;
|
||||
if ((completionAllowed) &&
|
||||
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
|
||||
(elements[elementCount - 2] == 0xeff1)) &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
|
||||
((ZiAlphaWork*)workData)->suffixMode = 1;
|
||||
}
|
||||
@@ -1443,19 +1444,58 @@ finishDictionaryPass:;
|
||||
prefixPrepared = ZI8_TRUE;
|
||||
goto preparePrefix;
|
||||
}
|
||||
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
|
||||
(((elements[elementCount - 2] == 0xeff1 &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
|
||||
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
} else {
|
||||
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
|
||||
if ((!primaryMatched) && (!secondaryMatched)) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
|
||||
if (prefixCount != 0) {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1480,8 +1520,8 @@ checkPrefixPunctuation:
|
||||
((((Zi8GetTableCount(language,0x1f,workData)) & 8) == 0 &&
|
||||
(parameters->elements[parameters->elementCount - 1] != 0xEFF1)))))) {
|
||||
if (prefixPrepared) {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1489,7 +1529,7 @@ checkPrefixPunctuation:
|
||||
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
|
||||
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
|
||||
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
|
||||
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
|
||||
} else {
|
||||
@@ -1519,46 +1559,6 @@ checkPrefixPunctuation:
|
||||
goto preparePrefix;
|
||||
}
|
||||
}
|
||||
else {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
}
|
||||
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
|
||||
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
|
||||
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
|
||||
@@ -1618,7 +1618,7 @@ finishCandidates:
|
||||
} else {
|
||||
wordCursor = 0;
|
||||
}
|
||||
if (wordCursor != (ziU16 *)0x0) {
|
||||
if (wordCursor) {
|
||||
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
|
||||
}
|
||||
}
|
||||
@@ -1634,8 +1634,7 @@ finishCandidates:
|
||||
countIndex = ((ZiAlphaWork*)workData)->dictionaryCount - 1;
|
||||
}
|
||||
for (; countIndex >= 1; countIndex = countIndex - 1) {
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] =
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -=
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex - 1];
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
{
|
||||
int strokeIndex;
|
||||
int outputCount;
|
||||
int extraCount;
|
||||
volatile int extraCount;
|
||||
|
||||
outputCount = 0;
|
||||
Zi8LogError(100, work);
|
||||
@@ -660,8 +660,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
goto lowStroke;
|
||||
}
|
||||
badStroke:
|
||||
outputCount--;
|
||||
outputBuffer[(ziU8)outputCount] = 0;
|
||||
outputBuffer[(ziU8)--outputCount] = 0;
|
||||
return outputCount;
|
||||
lowStroke:
|
||||
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);
|
||||
|
||||
@@ -289,7 +289,7 @@ ziBool Zi8SecMatchComp(ziPtr nodeAddress, ziMatchParam* matchAddress, ziPtr dict
|
||||
extern ziU16 Zi8MatchAltSound(ziPtr soundTable, ziU16 soundCode, ziPtr pCodeTable, ziU16 index, ziU16 mask, ziU16 value, ziU8 flag ZI_NEED_WORK);
|
||||
ziU16 Zi8GetPCode(ziU8* table, ziU8* node);
|
||||
|
||||
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziPtr dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziS8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
|
||||
ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziU8* dictionary, ziPtr soundTable, ziU16 soundCode, ziU32 tableAddress, ziU8* node, ziU16* masks, ziU16* values, ziU16* count, ziU8** resultNode, ziU8** stringOffset, ziU8 partialMode, ziU8 strictMode, ziU8 numParts, ziU16 partMask, ziU16 partValue, ziU8 flag, ziU8 altMode, ziU16 initialCode, ziU16* resultCode, ziU8 lastMode ZI_NEED_WORK) {
|
||||
struct {
|
||||
ziBool hasString;
|
||||
ziU8 partIndex;
|
||||
@@ -302,6 +302,10 @@ ziBool Zi8MatchPhonetic(ziPtr pCodeTable, ziPtr dictionary, ziPtr soundTable, zi
|
||||
ziU16 code;
|
||||
} traversal;
|
||||
ziU8* sound;
|
||||
typedef struct {
|
||||
ziU8 header;
|
||||
ziU8 content[11];
|
||||
} DictionaryNode;
|
||||
|
||||
if (*stringOffset != 0) {
|
||||
traversal.hasString = 1;
|
||||
@@ -336,7 +340,12 @@ decode_node:
|
||||
match_code:
|
||||
if (partValue == (traversal.code & partMask)) goto next_node;
|
||||
traversal.matchedParts = 1;
|
||||
sound = (ziU8*)(((node[9] & 0xF) * 0x10000 + node[0xB]) + (tableAddress + node[0xA] * 0x100));
|
||||
if (*count != 0) {
|
||||
traversal.soundIndex = (initialCode - traversal.remaining) - 1;
|
||||
} else {
|
||||
traversal.soundIndex = initialCode;
|
||||
}
|
||||
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (sound[0] & 7) {
|
||||
case 2:
|
||||
@@ -365,7 +374,8 @@ match_code:
|
||||
*count = traversal.remaining;
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
next_group:
|
||||
{
|
||||
traversal.nextCode = *sound++;
|
||||
traversal.partCount = traversal.nextCode & 0xF;
|
||||
if ((traversal.nextCode & flag) == 0) {
|
||||
@@ -377,7 +387,7 @@ match_code:
|
||||
}
|
||||
for (; traversal.partCount != 0; traversal.partCount--) {
|
||||
traversal.partIndex = 1;
|
||||
if (traversal.hasString && (*stringOffset < sound)) {
|
||||
if (traversal.hasString && (sound > *stringOffset)) {
|
||||
traversal.hasString = 0;
|
||||
}
|
||||
if (!traversal.hasString) {
|
||||
@@ -389,17 +399,27 @@ match_code:
|
||||
if (traversal.hasString) {
|
||||
goto phonetic_skip;
|
||||
}
|
||||
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, (ziU8*)dictionary + (traversal.dictionaryIndex & 0x7FFF) * 0xC);
|
||||
if (((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) && (altMode == 0) && (((ziU8*)dictionary)[(traversal.dictionaryIndex & 0x7FFF) * 0xC] & 0x80) != 0) {
|
||||
traversal.code = Zi8GetPCode((ziU8*)pCodeTable, dictionary + (traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode));
|
||||
if (((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) && (altMode == 0) && (dictionary[(traversal.dictionaryIndex & 0x7FFF) * sizeof(DictionaryNode)] & 0x80) != 0) {
|
||||
traversal.code = Zi8MatchAltSound(soundTable, soundCode, pCodeTable, traversal.dictionaryIndex & 0x7FFF, masks[traversal.partIndex], values[traversal.partIndex], flag, ZI_WORK);
|
||||
}
|
||||
if ((traversal.code & masks[traversal.partIndex]) != values[traversal.partIndex]) {
|
||||
goto phonetic_skip;
|
||||
if ((traversal.code & masks[traversal.partIndex]) == values[traversal.partIndex]) {
|
||||
goto phonetic_matched;
|
||||
}
|
||||
traversal.partIndex++;
|
||||
if (traversal.partIndex == numParts) {
|
||||
if ((partialMode != 0) && ((strictMode == 0 && (traversal.dictionaryIndex & 0x8000) != 0) || (strictMode != 0 && (traversal.dictionaryIndex & 0x8000) == 0))) {
|
||||
goto phonetic_skip;
|
||||
phonetic_skip:
|
||||
if ((traversal.dictionaryIndex & 0x8000) == 0) {
|
||||
sound++;
|
||||
while ((*sound & 0x80) == 0) {
|
||||
sound += 2;
|
||||
}
|
||||
sound++;
|
||||
}
|
||||
break;
|
||||
phonetic_matched:
|
||||
if (++traversal.partIndex == numParts) {
|
||||
if (partialMode != 0) {
|
||||
if (strictMode == 0 && (traversal.dictionaryIndex & 0x8000) != 0) goto phonetic_skip;
|
||||
if (strictMode != 0 && (traversal.dictionaryIndex & 0x8000) == 0) goto phonetic_skip;
|
||||
}
|
||||
*resultNode = node;
|
||||
*resultCode = ((ziU16)node[6] << 8) + node[7];
|
||||
@@ -407,19 +427,10 @@ match_code:
|
||||
return 1;
|
||||
}
|
||||
} while ((traversal.dictionaryIndex & 0x8000) == 0);
|
||||
continue;
|
||||
phonetic_skip:
|
||||
if ((traversal.dictionaryIndex & 0x8000) == 0) {
|
||||
sound++;
|
||||
while ((*sound & 0x80) == 0) {
|
||||
sound += 2;
|
||||
}
|
||||
sound++;
|
||||
}
|
||||
}
|
||||
} while ((traversal.nextCode & 0x80) == 0);
|
||||
|
||||
goto next_node;
|
||||
}
|
||||
if ((traversal.nextCode & 0x80) != 0) goto next_node;
|
||||
goto next_group;
|
||||
check_code:
|
||||
if (*values == (traversal.code & *masks)) goto match_code;
|
||||
goto next_node;
|
||||
@@ -430,22 +441,22 @@ check_code:
|
||||
ziBool Zi8GetPyFinal(ziU8* pinyin, ziU8* initial, ziU8* final);
|
||||
|
||||
ziU8 Zi8GetPyPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, ziU8* resultCount, ziU16* bestInitial, ziU16* bestFinal ZI_NEED_WORK) {
|
||||
ziU8 firstInitial;
|
||||
ziU8 pyFinal;
|
||||
ziU8 pyInitial;
|
||||
ziU8 pyFinal;
|
||||
ziU8 convertedCount;
|
||||
ziBool partial;
|
||||
ziU8 result;
|
||||
ziBool partial;
|
||||
ziBool alternateInitial;
|
||||
ziU8 outputIndex;
|
||||
ziU16 value;
|
||||
ziU8 index;
|
||||
ziU16 value;
|
||||
ziWChar converted[256];
|
||||
ziWChar* current;
|
||||
ziU8 pinyin[12];
|
||||
ziWChar* current;
|
||||
|
||||
current = converted;
|
||||
alternateInitial = 0;
|
||||
result = 0;
|
||||
partial = 0;
|
||||
*resultCount = 0;
|
||||
if (count == 0) {
|
||||
Zi8LogError(0x135, ZI_WORK);
|
||||
@@ -456,21 +467,19 @@ ziU8 Zi8GetPyPhonetic(ziWChar* text, ziU8 count, ziU16* initial, ziU16* final, z
|
||||
for (; index < count; index++) {
|
||||
if (((text[index] >= 0xF341) && (text[index] <= 0xF35A)) || ((text[index] >= 0x41) && (text[index] <= 0x5A))) {
|
||||
if ((convertedCount != 0) && (current[convertedCount - 1] != 0xF360) && (current[convertedCount - 1] != 0x27)) {
|
||||
current[convertedCount] = 0x27;
|
||||
convertedCount++;
|
||||
current[convertedCount++] = 0x27;
|
||||
}
|
||||
current[convertedCount] = (text[index] & 0xFF) + 0x20;
|
||||
current[convertedCount++] = (text[index] & 0xFF) + 0x20;
|
||||
} else {
|
||||
current[convertedCount] = text[index];
|
||||
current[convertedCount++] = text[index];
|
||||
}
|
||||
convertedCount++;
|
||||
}
|
||||
|
||||
count = convertedCount;
|
||||
outputIndex = 0;
|
||||
*bestInitial = 0;
|
||||
*bestFinal = 0;
|
||||
while ((outputIndex < 0x10) && (count != 0)) {
|
||||
while (count != 0) {
|
||||
initial[outputIndex] = 0;
|
||||
final[outputIndex] = 0;
|
||||
value = *current;
|
||||
@@ -484,41 +493,44 @@ check_pinyin_extension:
|
||||
if (value < 0xF361) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
if (value <= 0xF37A) {
|
||||
value += 0xC9F;
|
||||
goto pinyin_initial;
|
||||
}
|
||||
if (value <= 0xF37A) goto pinyin_extension;
|
||||
invalid_pinyin:
|
||||
initial[0] = 0xFFFF;
|
||||
final[0] = 0xFFFF;
|
||||
*bestInitial = 0xFFFF;
|
||||
*bestFinal = 0xFFFF;
|
||||
*bestInitial = *bestFinal = initial[0] = final[0] = 0xFFFF;
|
||||
return 1;
|
||||
pinyin_extension:
|
||||
value -= 0xF361;
|
||||
goto pinyin_initial;
|
||||
pinyin_ascii:
|
||||
value -= 0x61;
|
||||
pinyin_initial:
|
||||
firstInitial = Zi8PinyinInitials[value];
|
||||
if (firstInitial != 0) {
|
||||
convertedCount = Zi8PinyinInitials[value];
|
||||
if (convertedCount != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = (ziU16)firstInitial << 9;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
final[outputIndex] = (ziU16)(convertedCount & 0x7f) << 9;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
count--;
|
||||
if (count == 0) {
|
||||
break;
|
||||
}
|
||||
current += 1;
|
||||
if (((firstInitial & 0x80) != 0) && ((current[0] == 0x68) || (current[0] == 0xF368))) {
|
||||
if ((convertedCount & 0x80) != 0) {
|
||||
if (alternateInitial) {
|
||||
initial[outputIndex] &= 0xfdff;
|
||||
final[outputIndex] &= 0xfdff;
|
||||
}
|
||||
value = *current;
|
||||
if (value != 0x68 && value != 0xF368) goto scan_final;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
final[outputIndex] += 0x200;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
count--;
|
||||
if (count == 0) {
|
||||
break;
|
||||
@@ -528,80 +540,80 @@ pinyin_initial:
|
||||
} else if ((*current == 0xF369) || (*current == 0x69)) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
scan_final:
|
||||
partial = 0;
|
||||
for (index = 0; index < 4; index++) {
|
||||
pinyin[index] = 0;
|
||||
}
|
||||
index = 0;
|
||||
do {
|
||||
while (1) {
|
||||
if (index > 3) {
|
||||
goto finish_final;
|
||||
}
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if ((value > 0xF330) && (value < 0xF336)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if ((value < 0x61) || (value > 0x7A)) {
|
||||
if (value < 0xF361) {
|
||||
goto finish_final;
|
||||
}
|
||||
value += 0xC9F;
|
||||
if (value > 0x19) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
} else {
|
||||
value -= 0x61;
|
||||
}
|
||||
pinyin[index] = (ziU8)value + 1;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
break;
|
||||
}
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
if (count == 0) {
|
||||
goto finish_final;
|
||||
while (index < 4) {
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
if (index > 2) {
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
if ((value >= 0xF331) && (value < 0xF336)) {
|
||||
if (index != 0) {
|
||||
partial = 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
pinyin[index + 1] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
pinyin[index + 1] = 0;
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
if ((value < 0x61) || (value > 0x7A)) {
|
||||
if (value < 0xF361) {
|
||||
goto finish_final;
|
||||
}
|
||||
value -= 0xF361;
|
||||
if (value > 0x19) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
goto finish_final;
|
||||
}
|
||||
} else {
|
||||
value -= 0x61;
|
||||
}
|
||||
pinyin[index] = (ziU8)value + 1;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) goto try_final_extension;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
pinyin[index + 1] = 0;
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
} while (count != 0);
|
||||
if (count == 0) {
|
||||
goto finish_final;
|
||||
}
|
||||
continue;
|
||||
try_final_extension:
|
||||
|
||||
if (index < 3) {
|
||||
pinyin[index + 1] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
pinyin[index + 1] = 0;
|
||||
current++;
|
||||
index++;
|
||||
count--;
|
||||
if (count == 0) break;
|
||||
} else {
|
||||
pinyin[index + 1] = 0;
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
pinyin[index] = 0;
|
||||
partial = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
finish_final:
|
||||
if ((index > 3) && (count != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
|
||||
if ((index > 3) && (count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
@@ -611,35 +623,38 @@ finish_final:
|
||||
if (index > 3) {
|
||||
partial = 1;
|
||||
}
|
||||
if (!partial) {
|
||||
pinyin[index] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) == 0) {
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (firstInitial == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
}
|
||||
} else {
|
||||
if (firstInitial == 0) {
|
||||
if (partial && alternateInitial == 0) {
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
} else {
|
||||
if ((index != 0) && (count != 0)) {
|
||||
goto invalid_pinyin;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
pinyin[index] = 0xFF;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
if ((outputIndex == 0) && (count == 0)) {
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (firstInitial == 0) {
|
||||
if (convertedCount == 0) {
|
||||
*bestInitial = 0x7E00;
|
||||
*bestFinal = 0x200;
|
||||
}
|
||||
@@ -647,45 +662,42 @@ finish_final:
|
||||
*bestFinal |= (ziU16)pyFinal << 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (firstInitial == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
} else {
|
||||
if ((index != 0) && (count != 0)) {
|
||||
goto invalid_pinyin;
|
||||
pinyin[index] = 0;
|
||||
if (Zi8GetPyFinal(pinyin, &pyInitial, &pyFinal) != 0) {
|
||||
if (convertedCount == 0) {
|
||||
result++;
|
||||
initial[outputIndex] = 0x7E00;
|
||||
final[outputIndex] = 0x200;
|
||||
}
|
||||
initial[outputIndex] |= (ziU16)pyInitial << 3;
|
||||
final[outputIndex] |= (ziU16)pyFinal << 3;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
convertedCount = count;
|
||||
}
|
||||
if (count != 0) {
|
||||
value = *current;
|
||||
if ((value == 0x27) || (value == 0xF360) || (value == 0x20)) {
|
||||
current++;
|
||||
convertedCount = count - 1;
|
||||
count--;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
} else if ((value > 0xF330) && ((ziU16)(value + 0xCCF) < 5)) {
|
||||
} else if ((value >= 0xF331) && ((value -= 0xF331) <= 4)) {
|
||||
value++;
|
||||
initial[outputIndex] |= 7;
|
||||
final[outputIndex] |= value + 0xCD0;
|
||||
*bestInitial = initial[outputIndex];
|
||||
*bestFinal = final[outputIndex];
|
||||
convertedCount = count - 1;
|
||||
final[outputIndex] |= value;
|
||||
*bestInitial = initial[0];
|
||||
*bestFinal = final[0];
|
||||
count--;
|
||||
current++;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
}
|
||||
if ((convertedCount != 0) && ((*current == 0x27) || (*current == 0xF360) || (*current == 0x20))) {
|
||||
convertedCount = count - 2;
|
||||
if ((count != 0) && (((value = *current) == 0x27) || (value == 0xF360) || (value == 0x20))) {
|
||||
count--;
|
||||
current++;
|
||||
if (outputIndex == 0) {
|
||||
*resultCount = *resultCount + 1;
|
||||
@@ -693,10 +705,10 @@ finish_final:
|
||||
}
|
||||
}
|
||||
}
|
||||
count = convertedCount;
|
||||
outputIndex++;
|
||||
if (outputIndex > 0xf) break;
|
||||
}
|
||||
if ((*resultCount > 1) && (text[*resultCount - 1] > 0xF340) && (text[*resultCount - 1] < 0xF35B)) {
|
||||
if ((result > 1) && (text[*resultCount - 1] >= 0xF341) && (text[*resultCount - 1] <= 0xF35A)) {
|
||||
*resultCount = *resultCount - 1;
|
||||
}
|
||||
return result;
|
||||
|
||||
@@ -89,7 +89,12 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
|
||||
for (;;) {
|
||||
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (entry == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
word = entry + 1;
|
||||
wordSize = *entry;
|
||||
@@ -158,8 +163,6 @@ next:
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 result;
|
||||
@@ -167,11 +170,12 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if ((ziU8)result != 0) break;
|
||||
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
|
||||
if (++ZI_WORK->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
continuation = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
|
||||
if (candidate->text[position] != word->text[position]) break;
|
||||
position++;
|
||||
}
|
||||
if (position == length) {
|
||||
@@ -56,8 +56,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
length = ZI_WORK->uwdCount;
|
||||
ZI_WORK->uwdCount = length + 1;
|
||||
length = ZI_WORK->uwdCount++;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
@@ -91,8 +90,11 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziWChar folded;
|
||||
int fallback = 0;
|
||||
int visited = 0;
|
||||
int position, prefixLength, previousOffset;
|
||||
ziU32 size, entryLanguage, entryLength;
|
||||
int prefixLength;
|
||||
int position, previousOffset;
|
||||
ziU32 size;
|
||||
ziU8 entryLanguage;
|
||||
ziU32 entryLength;
|
||||
ziU8* cursor;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
@@ -103,18 +105,33 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziUserDictionary* dictionary;
|
||||
int firstSegment;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation == 0) {
|
||||
if (continuation != 0) {
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return entryLength;
|
||||
}
|
||||
{
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
ZI_WORK->unk_0x13C = 0;
|
||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
prefixLength = 0;
|
||||
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
|
||||
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||
position++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
@@ -123,7 +140,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ZI_WORK->unk_0x141[1] = language;
|
||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||
previousOffset = 4;
|
||||
for (; ++position, prefixLength > 0; prefixLength--) {
|
||||
for (; prefixLength > 0; prefixLength--, position++) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -131,12 +148,10 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
|
||||
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
previousOffset++;
|
||||
break;
|
||||
}
|
||||
previousOffset++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -146,7 +161,8 @@ rescan:
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
cursor = begin;
|
||||
firstSegment = begin < boundary;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||
size = *cursor;
|
||||
candidate = (ziUserWord*)cursor;
|
||||
@@ -185,7 +201,7 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (complete != 0 && length == 1) {
|
||||
if (complete == 1 && length != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
visited = 0;
|
||||
|
||||
@@ -22,7 +22,8 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
node += offset;
|
||||
if (((ziU32)header & 2) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
|
||||
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||
offset += *((ziU8*)node + 2);
|
||||
} else {
|
||||
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||
offset += (ziU32)*((ziU8*)node + 1);
|
||||
@@ -43,7 +44,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor;
|
||||
ziU8* cursor = node;
|
||||
ziS32 depth;
|
||||
ziS32 offset;
|
||||
|
||||
@@ -53,29 +54,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 4) == 0) {
|
||||
node = 0;
|
||||
} else {
|
||||
cursor = node;
|
||||
if ((header & 8) != 0) {
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
cursor = node + 2;
|
||||
node += 2;
|
||||
} else {
|
||||
cursor = node + 1;
|
||||
node += 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
if ((*node & 0x80) == 0) {
|
||||
node += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
node += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
|
||||
if ((*node & 0x80) != 0) {
|
||||
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||
(ziU32)node[2] + 0x8000;
|
||||
} else {
|
||||
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
|
||||
0x8000 + (ziU32)cursor[2];
|
||||
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||
}
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
@@ -89,24 +90,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 1) != 0) {
|
||||
if ((header & 2) == 0) {
|
||||
depth++;
|
||||
} else if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
} else if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
if ((header & 4) == 0) {
|
||||
depth--;
|
||||
} else if ((header & 8) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
@@ -163,16 +164,10 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
result = 0;
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
goto graph_invalid;
|
||||
return 0;
|
||||
}
|
||||
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||
if (pair == 0) {
|
||||
goto graph_valid;
|
||||
}
|
||||
graph_invalid:
|
||||
result = 0;
|
||||
goto graph_done;
|
||||
graph_valid:
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
@@ -182,19 +177,18 @@ graph_valid:
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if ((end <= (ziU32)entry) ||
|
||||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (end <= (ziU32)entry) {
|
||||
result = 0;
|
||||
break;
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||
@@ -215,8 +209,7 @@ graph_valid:
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
graph_done:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData)
|
||||
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
|
||||
|
||||
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziPtr workData) {
|
||||
ziPtr workData) {
|
||||
struct {
|
||||
ziU8 characterIndex;
|
||||
ziU8 matched;
|
||||
@@ -44,7 +44,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
ziU8* table1;
|
||||
} state;
|
||||
ziU16 buffer[100];
|
||||
ziU32 result;
|
||||
ziU8 result;
|
||||
ziU16 currentCharacter;
|
||||
ziU8* selectedTable;
|
||||
|
||||
@@ -72,13 +72,13 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
state.tableCount31 = Zi8GetTableCount(ZI8_LANG_KO, 0x31, workData);
|
||||
|
||||
for (state.elementIndex = 0; state.elementIndex < params->elementCount;
|
||||
state.elementIndex++) {
|
||||
state.elementIndex++) {
|
||||
currentCharacter = params->elements[state.elementIndex];
|
||||
|
||||
if ((currentCharacter >= 0x61) && (currentCharacter <= 0x7A)) {
|
||||
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x61) * 2];
|
||||
} else if ((currentCharacter >= 0x41) && (currentCharacter <= 0x5A)) {
|
||||
buffer[state.elementIndex] = state.table1[(currentCharacter - 0x41) * 2 + 1];
|
||||
buffer[state.elementIndex] = (state.table1 + (currentCharacter - 0x41) * 2)[1];
|
||||
} else {
|
||||
state.matched = 0;
|
||||
for (; state.table2[state.matched * 3] != 0; state.matched++) {
|
||||
@@ -86,8 +86,8 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
}
|
||||
if (state.table2[state.matched * 3] != 0) {
|
||||
buffer[state.elementIndex] =
|
||||
((ziU16)state.table2[state.matched * 3 + 1] << 8) |
|
||||
state.table2[state.matched * 3 + 2];
|
||||
((ziU16)(state.table2 + state.matched * 3)[1] << 8) |
|
||||
(state.table2 + state.matched * 3)[2];
|
||||
} else {
|
||||
Zi8LogError(0x161, workData);
|
||||
return 0;
|
||||
@@ -98,13 +98,13 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
result = 0;
|
||||
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
|
||||
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
|
||||
&state.inputIndex, workData) != 0) {
|
||||
&state.inputIndex, workData) != 0) {
|
||||
state.matched = Zi8_81481E6C(&state.nextIndex,
|
||||
buffer + currentCharacter + 1,
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
workData);
|
||||
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1) && (state.characterIndex < 0x1F)) {
|
||||
buffer + currentCharacter + 1,
|
||||
state.characterIndex,
|
||||
(state.elementIndex - currentCharacter) - 1,
|
||||
workData);
|
||||
if ((((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 1)) {
|
||||
switch (state.characterIndex) {
|
||||
case 1:
|
||||
selectedTable = (ziU8*)Zi8GetTableAddress(ZI8_LANG_KO, 0x1E, workData);
|
||||
@@ -170,37 +170,30 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
} else {
|
||||
state.matched = 0;
|
||||
}
|
||||
if (state.matched == 0) {
|
||||
if (state.currentCandidate == 0) {
|
||||
for (state.index = 0; state.index < state.tableCount31; state.index++) {
|
||||
if (((ziU16)state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
|
||||
((ziU16)state.table31[(state.index * 3) + 1] == buffer[currentCharacter + 1])) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[result] =
|
||||
state.tableCount0 + state.table31[(state.index * 3) + 2];
|
||||
result++;
|
||||
currentCharacter++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (state.index == state.tableCount31) {
|
||||
params->candidates[result] = buffer[currentCharacter];
|
||||
if (buffer[currentCharacter] < 0xFF) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[result] += state.tableCount0;
|
||||
result++;
|
||||
}
|
||||
}
|
||||
if (state.matched != 0) {
|
||||
if (state.tableCount6 == 0) {
|
||||
state.nextIndex += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
if (state.currentCandidate != 0) {
|
||||
state.currentCandidate--;
|
||||
} else {
|
||||
params->candidates[(ziU8)result] =
|
||||
((ziU16)selectedTable[state.nextIndex * 2] << 8) | (selectedTable + state.nextIndex * 2)[1];
|
||||
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
|
||||
params->candidates[(ziU8)result] += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
result++;
|
||||
}
|
||||
if (currentCharacter == 0) {
|
||||
params->count = state.matched + 1;
|
||||
}
|
||||
currentCharacter += state.matched;
|
||||
} else {
|
||||
if (state.currentCandidate != 0) {
|
||||
state.index = 0;
|
||||
while ((state.index < state.tableCount31) &&
|
||||
(((ziU16)state.table31[(state.index * 3)] != buffer[currentCharacter]) ||
|
||||
((ziU16)state.table31[(state.index * 3) + 1] != buffer[currentCharacter + 1]))) {
|
||||
state.index++;
|
||||
for (; state.index < state.tableCount31; state.index++) {
|
||||
if (state.table31[state.index * 3] == buffer[currentCharacter] &&
|
||||
(state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1]) break;
|
||||
}
|
||||
if (state.index == state.tableCount31) {
|
||||
state.currentCandidate--;
|
||||
@@ -208,25 +201,30 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (state.tableCount6 == 0) {
|
||||
state.nextIndex += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
if (state.currentCandidate == 0) {
|
||||
params->candidates[result] =
|
||||
(selectedTable[state.nextIndex * 2] << 8) | selectedTable[state.nextIndex * 2 + 1];
|
||||
if ((state.tableCount6 != 0) && (((struct __zi8_work_data_s*)workData)->unk_0x1B30 == 0)) {
|
||||
params->candidates[result] += state.inputIndex * state.tableCount3;
|
||||
}
|
||||
result++;
|
||||
} else {
|
||||
state.currentCandidate--;
|
||||
for (state.index = 0; state.index < state.tableCount31; state.index++) {
|
||||
if ((state.table31[(state.index * 3)] == buffer[currentCharacter]) &&
|
||||
((state.table31 + state.index * 3)[1] == buffer[currentCharacter + 1])) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[(ziU8)result] =
|
||||
state.tableCount0 + (state.table31 + state.index * 3)[2];
|
||||
result++;
|
||||
currentCharacter++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (state.index == state.tableCount31) {
|
||||
if ((params->candidates[(ziU8)result] = buffer[currentCharacter]) < 0xFF) {
|
||||
if (currentCharacter == 0) {
|
||||
params->count = 1;
|
||||
}
|
||||
params->candidates[(ziU8)result] += state.tableCount0;
|
||||
result++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (currentCharacter == 0) {
|
||||
params->count = state.matched + 1;
|
||||
}
|
||||
currentCharacter += state.matched;
|
||||
}
|
||||
if (result >= params->maxCandidates) {
|
||||
break;
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
|
||||
typedef struct ziChineseEntry {
|
||||
ziU8 data[9];
|
||||
ziU8 offsetHigh;
|
||||
ziU16 offsetLow;
|
||||
ziU8 offsetLow[2];
|
||||
} ziChineseEntry;
|
||||
|
||||
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
@@ -26,19 +26,22 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziU8 remaining, group;
|
||||
ziU16 value = 0;
|
||||
int count;
|
||||
int offset;
|
||||
ziU8 group;
|
||||
ziU8 remaining;
|
||||
ziU16 value;
|
||||
ziWChar* cursor;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
int length, count, offset;
|
||||
int length;
|
||||
int unmatched;
|
||||
ziChineseEntry* entry;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
search.flags = 0;
|
||||
search.word = 0;
|
||||
search.length = 0;
|
||||
@@ -52,7 +55,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
if (language != 1) {
|
||||
for (length = 0; word[length] != 0; length++) {
|
||||
if (word[length] > 0xEFF0 || length == 64) return 0;
|
||||
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||
}
|
||||
((ziU8*)&search.length)[0] = length;
|
||||
((ziU8*)&search.flags)[2] = 1;
|
||||
@@ -91,21 +94,34 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
if (word[length] == 0) {
|
||||
count = length - 1;
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
if (length == 64) return 0;
|
||||
} while (word[length] != 0);
|
||||
{
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
group = *data & 7;
|
||||
if (group == 5) offset = 4;
|
||||
else if (group < 5) {
|
||||
if (group == 2) offset = 2;
|
||||
else if (group < 2) offset = 1;
|
||||
else offset = 3;
|
||||
} else offset = 1;
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
offset = 3;
|
||||
break;
|
||||
case 5:
|
||||
offset = 4;
|
||||
break;
|
||||
default:
|
||||
offset = 1;
|
||||
break;
|
||||
}
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) == 0) return 0;
|
||||
@@ -134,11 +150,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
Zi8LogError(0x2BD, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
} while (length != 64);
|
||||
}
|
||||
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
@@ -156,10 +168,9 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
found:
|
||||
if (key < 32) {
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
}
|
||||
if (key >= 32) return 0;
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ ziU32 Zi8_814834AC(ziGetParam* param, ziU16* remaining, ziU8* count,
|
||||
Zi8_81483308(param, param->candidates[filter.compactIndex], inserted, ZI_WORK);
|
||||
}
|
||||
}
|
||||
*remaining -= (ziU8)matched;
|
||||
*remaining = *remaining - matched;
|
||||
*count = 0;
|
||||
}
|
||||
}
|
||||
@@ -285,8 +285,8 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
|
||||
|
||||
search.previousIndex = 0xFFFF;
|
||||
search.resultCount = 0;
|
||||
search.packedKeys.bytes[4] = 0;
|
||||
search.packedKeys.firstWord = 0;
|
||||
search.packedKeys.bytes[4] = 0;
|
||||
search.remainingLetters = 0;
|
||||
search.wordIndex = 0;
|
||||
search.candidateCount = 0;
|
||||
@@ -317,15 +317,15 @@ ziU32 Zi8GetKOcandidates(ziGetParam* param, ZiKoreanCandidateOptions* options ZI
|
||||
if (((search.keyIndex = Zi8_8148302C(param->currentWord[0], keyTable, ZI_WORK)) != 0xFFFF) &&
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 8) != 0)) {
|
||||
search.wordOffset = ((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childLow |
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 3) << 16 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childHigh << 8);
|
||||
((((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->keyBytes[4] & 3) << 16 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->childHigh << 8);
|
||||
search.remainingLetters = param->wordCharCount - 1;
|
||||
search.wordIndex = 1;
|
||||
wordNode = search.wordTable + search.wordOffset;
|
||||
match_word:
|
||||
while (search.remainingLetters != 0) {
|
||||
search.keyIndex = Zi8_8148302C(param->currentWord[search.wordIndex], (ziU8*)keyTable, ZI_WORK);
|
||||
if (search.keyIndex == (ziU16)((*wordNode & 0x1F) << 8 | wordNode[1])) {
|
||||
if (search.keyIndex == (((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1])) {
|
||||
--search.remainingLetters;
|
||||
++search.wordIndex;
|
||||
if ((*wordNode & 0x40) != 0) {
|
||||
@@ -341,9 +341,9 @@ match_word:
|
||||
}
|
||||
}
|
||||
if (search.remainingLetters == 0) {
|
||||
search.keyIndex = (*wordNode & 0x1F) << 8 | wordNode[1];
|
||||
search.character = (ziU16)(((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterLow);
|
||||
search.keyIndex = ((ziU16)*wordNode & 0x1F) << 8 | (ziU16)wordNode[1];
|
||||
search.character = (ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.keyIndex << 3) + search.keyIndex) + keyTable))->characterLow);
|
||||
if (param->wordCharCount == 1) {
|
||||
if (search.keyIndex == search.previousIndex) {
|
||||
for (; (*wordNode & 0x40) == 0; wordNode = wordNode + 2) {
|
||||
@@ -355,55 +355,46 @@ match_word:
|
||||
}
|
||||
search.previousIndex = search.keyIndex;
|
||||
if (param->elementCount == 0) {
|
||||
if (search.remainingCandidates == 0) {
|
||||
if (search.remainingCandidates != 0) {
|
||||
--search.remainingCandidates;
|
||||
} else {
|
||||
if (options->countOnly != 0) {
|
||||
++search.prefixCount;
|
||||
if ((ziS32)search.prefixCount < (ziS32)options->maxCount) {
|
||||
if (++search.prefixCount < (ziS32)options->maxCount) {
|
||||
goto skip_word;
|
||||
}
|
||||
return options->maxCount;
|
||||
}
|
||||
param->candidates[search.candidateCount] = search.character;
|
||||
++search.candidateCount;
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters >= param->maxCandidates) {
|
||||
return param->letters;
|
||||
}
|
||||
} else {
|
||||
--search.remainingCandidates;
|
||||
}
|
||||
} else {
|
||||
param->candidates[search.candidateCount] = search.character;
|
||||
++search.candidateCount;
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters >= param->maxCandidates) {
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
if (param->maxCandidates <= search.candidateCount) {
|
||||
if (options->countOnly == 0) {
|
||||
return search.candidateCount;
|
||||
}
|
||||
search.prefixCount += search.candidateCount;
|
||||
if ((ziS32)options->maxCount <= (ziS32)search.prefixCount) {
|
||||
return options->maxCount;
|
||||
}
|
||||
if (search.candidateCount < param->maxCandidates) goto skip_word;
|
||||
if (options->countOnly != 0) {
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
param->unk_0x20 = 0;
|
||||
param->letters = 0;
|
||||
search.candidateCount = 0;
|
||||
} else {
|
||||
return search.candidateCount;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (search.candidateIndex = 0;
|
||||
(search.candidateIndex < search.candidateCount &&
|
||||
(search.character != param->candidates[search.candidateIndex]));
|
||||
search.candidateIndex = search.candidateIndex + 1) {
|
||||
for (search.candidateIndex = 0; search.candidateIndex < search.candidateCount; search.candidateIndex++) {
|
||||
if (search.character == param->candidates[search.candidateIndex]) break;
|
||||
}
|
||||
if ((search.candidateIndex == search.candidateCount) &&
|
||||
(Zi8_814833F0(param, search.character, ZI_WORK) == 0)) {
|
||||
param->candidates[search.candidateCount] = search.character;
|
||||
++search.candidateCount;
|
||||
param->candidates[search.candidateCount++] = search.character;
|
||||
++param->unk_0x20;
|
||||
if (++param->letters < param->maxCandidates) {
|
||||
goto skip_word;
|
||||
@@ -411,17 +402,14 @@ match_word:
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
if (param->maxCandidates <= search.candidateCount) {
|
||||
if (options->countOnly == 0) {
|
||||
return search.candidateCount;
|
||||
}
|
||||
search.prefixCount += search.candidateCount;
|
||||
if ((ziS32)options->maxCount <= (ziS32)search.prefixCount) {
|
||||
return options->maxCount;
|
||||
}
|
||||
if (search.candidateCount < param->maxCandidates) goto skip_word;
|
||||
if (options->countOnly != 0) {
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
param->unk_0x20 = 0;
|
||||
param->letters = 0;
|
||||
search.candidateCount = 0;
|
||||
} else {
|
||||
return search.candidateCount;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -444,18 +432,21 @@ search_table:
|
||||
if (search.candidateCount != 0) {
|
||||
Zi8_814834AC(param, &search.remainingCandidates, &search.candidateCount, &search.inserted, ZI_WORK);
|
||||
if (options->countOnly != 0) {
|
||||
search.prefixCount += search.candidateCount;
|
||||
if (search.prefixCount >= (ziS32)options->maxCount) return options->maxCount;
|
||||
if ((search.prefixCount += search.candidateCount) >= (ziS32)options->maxCount) return options->maxCount;
|
||||
search.resultCount = search.prefixCount;
|
||||
}
|
||||
param->unk_0x20 = search.candidateCount;
|
||||
param->letters = search.candidateCount;
|
||||
}
|
||||
if (param->elementCount < 10) {
|
||||
if ((param->elementCount == 0) || (options->countOnly != 0)) {
|
||||
search.matchPass = 1;
|
||||
} else {
|
||||
if (param->elementCount > 9) {
|
||||
param->letters = 0;
|
||||
return 0;
|
||||
}
|
||||
{
|
||||
if (param->elementCount != 0 && options->countOnly == 0) {
|
||||
search.matchPass = 0;
|
||||
} else {
|
||||
search.matchPass = 1;
|
||||
}
|
||||
search.tableCount = Zi8GetTableCount(ZI8_LANG_KO, 9, ZI_WORK);
|
||||
Zi8_81483118(param, search.packedKeys.bytes);
|
||||
@@ -466,8 +457,8 @@ search_table:
|
||||
search.keyByte = 0;
|
||||
if (1 < param->elementCount) {
|
||||
for (search.keyByte = 0;
|
||||
(ziU32)search.keyByte < (int)param->elementCount / 2;
|
||||
search.keyByte = search.keyByte + 1) {
|
||||
(ziS32)search.keyByte < (int)param->elementCount / 2;
|
||||
search.keyByte++) {
|
||||
if (search.packedKeys.bytes[search.keyByte] != search.entry->keyBytes[search.keyByte]) {
|
||||
search.matches = ZI8_FALSE;
|
||||
break;
|
||||
@@ -476,7 +467,7 @@ search_table:
|
||||
}
|
||||
if ((search.matches && ((param->elementCount % 2) != 0)) &&
|
||||
((search.packedKeys.bytes[search.keyByte] & 0xF0) !=
|
||||
(search.entry->keyBytes[search.keyByte] & 0xF0))) {
|
||||
(search.entry->keyBytes[search.keyByte] & 0xF0))) {
|
||||
search.matches = ZI8_FALSE;
|
||||
}
|
||||
if (search.matches) {
|
||||
@@ -499,17 +490,15 @@ search_table:
|
||||
if (++search.resultCount >= (ziS32)options->maxCount) return options->maxCount;
|
||||
} else {
|
||||
param->candidates[search.candidateCount++] =
|
||||
(ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterLow);
|
||||
(ziU16)((ziU16)((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterHigh << 8 |
|
||||
((ZiKoreanKeyEntry*)(((search.tableIndex << 3) + search.tableIndex) + keyTable))->characterLow);
|
||||
if (++param->letters >= param->maxCandidates) return param->letters;
|
||||
}
|
||||
}
|
||||
next_entry:
|
||||
;
|
||||
}
|
||||
} while (++search.matchPass < 2);
|
||||
} else {
|
||||
param->letters = 0;
|
||||
} while (++search.matchPass < 2);
|
||||
}
|
||||
if (options->countOnly != 0) return search.resultCount;
|
||||
return param->letters;
|
||||
|
||||
@@ -44,13 +44,12 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
|
||||
}
|
||||
|
||||
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
|
||||
ziU8 numKeys;
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU32 totalCharacters;
|
||||
ziU16 charCount;
|
||||
ziU32 keyIndex;
|
||||
ziU16 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
|
||||
dataAddress = 0;
|
||||
@@ -93,15 +92,15 @@ tables_ready:
|
||||
return 0;
|
||||
}
|
||||
|
||||
totalCharacters = 0;
|
||||
keyIndex = totalCharacters;
|
||||
tableCount = 0;
|
||||
keyIndex = tableCount;
|
||||
for (; (ziU16)keyIndex < key; keyIndex++) {
|
||||
totalCharacters += dataAddress[(ziU16)keyIndex];
|
||||
tableCount += dataAddress[(ziU16)keyIndex];
|
||||
}
|
||||
if ((charCount = (ziU8)dataAddress[key]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
|
||||
dataAddress = dataAddress + numKeys + (tableCount * 2);
|
||||
keyIndex = 0;
|
||||
for (; (ziU16)keyIndex < charCount; keyIndex++) {
|
||||
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |
|
||||
|
||||
@@ -23,48 +23,60 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
|
||||
}
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
|
||||
ziWChar folded;
|
||||
ziU8 fallback = 0;
|
||||
ziU32 index;
|
||||
ziS32 index;
|
||||
ziU32 position;
|
||||
ziU32 fallback = 0;
|
||||
if (!continuation) ZI_WORK->oemIdx = 0;
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
capacity--;
|
||||
if (length >= capacity) goto noMatch;
|
||||
word[capacity] = 0;
|
||||
word[length] = complete ? 1 : 0;
|
||||
for (;;) {
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
|
||||
if (length != 1 || !complete || continuation) goto noMatch;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
continue;
|
||||
}
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
|
||||
if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
|
||||
}
|
||||
}
|
||||
if ((ziS32)position >= length) {
|
||||
if (fallback) {
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
ZI_WORK->oemIdx = index + 1;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
}
|
||||
word[length] = complete ? 1 : 0;
|
||||
index++;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
noMatch:
|
||||
word[capacity] = 0;
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
goto matchRetry;
|
||||
posEntry:
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((ziS32)position < length) {
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
index++;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
goto matchRetry;
|
||||
}
|
||||
if (fallback) {
|
||||
index = 0;
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
index++;
|
||||
ZI_WORK->oemIdx = index;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
matchRetry:
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
|
||||
goto posEntry;
|
||||
oemFailed:
|
||||
if (length != 1 || !complete || continuation) goto tail0;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
goto matchRetry;
|
||||
tail0:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
if ((index != 0) && ((buffers.component[5] & 1) == 0)) {
|
||||
index--;
|
||||
match->arrD[index] &= 0xf0;
|
||||
match->arr1[index] = match->arr1[index] & 0xf0;
|
||||
match->arr1[index] &= 0xf0;
|
||||
}
|
||||
nibbles = (ziU8)(buffers.component[5] + 1);
|
||||
if (8 < nibbles) {
|
||||
@@ -132,16 +132,16 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
case 1:
|
||||
case 2:
|
||||
case 4:
|
||||
match->arr1[0] |= (ziU8)(mode << 4);
|
||||
match->arrD[0] |= (ziU8)(mode << 4);
|
||||
break;
|
||||
match->arr1[0] |= (ziU8)(mode << 4);
|
||||
match->arrD[0] |= (ziU8)(mode << 4);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (nibbles == 0) {
|
||||
nibbles = 1;
|
||||
}
|
||||
if (((request->getMode == '\0') || (request->getMode == '\x10')) ||
|
||||
(request->getMode == '\x05')) {
|
||||
(request->getMode == '\x05')) {
|
||||
Zi8Memcpy(buffers.masks,match->arr1,0xc);
|
||||
Zi8Memcpy(buffers.strokes,match->arrD,0xc);
|
||||
do {
|
||||
@@ -170,26 +170,26 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
nibbles++;
|
||||
}
|
||||
if ((nibbles & 1) != 0) {
|
||||
buffers.strokes[nibbles >> 1] = buffers.strokes[nibbles >> 1] | stroke;
|
||||
buffers.strokes[nibbles >> 1] |= stroke;
|
||||
if (element == 0xef0b) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 8;
|
||||
buffers.masks[nibbles >> 1] |= 8;
|
||||
}
|
||||
else if (element == 0xef0a) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 4;
|
||||
buffers.masks[nibbles >> 1] |= 4;
|
||||
}
|
||||
else if (element != 0xef00) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 7;
|
||||
buffers.masks[nibbles >> 1] |= 7;
|
||||
}
|
||||
} else {
|
||||
buffers.strokes[nibbles >> 1] = buffers.strokes[nibbles >> 1] | (ziU8)(stroke << 4);
|
||||
} else {
|
||||
buffers.strokes[nibbles >> 1] |= stroke << 4;
|
||||
if (element == 0xef0b) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x80;
|
||||
buffers.masks[nibbles >> 1] |= 0x80;
|
||||
}
|
||||
else if (element == 0xef0a) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x40;
|
||||
buffers.masks[nibbles >> 1] |= 0x40;
|
||||
}
|
||||
else if (element != 0xef00) {
|
||||
buffers.masks[nibbles >> 1] = buffers.masks[nibbles >> 1] | 0x70;
|
||||
buffers.masks[nibbles >> 1] |= 0x70;
|
||||
}
|
||||
}
|
||||
nibbles++;
|
||||
@@ -219,7 +219,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segs1 + match->nSeg,buffers.masks,0xc);
|
||||
Zi8Memcpy((ziU8 (*)[12])match->segsD + match->nSeg,buffers.strokes,0xc);
|
||||
match->nSeg++;
|
||||
if (((stroke != 0xff) || (elementCount <= elementIndex)) || (0xf < match->nSeg)) goto complete;
|
||||
if (stroke != 0xff || elementIndex >= elementCount || match->nSeg >= 0x10) goto complete;
|
||||
Zi8Memset(buffers.masks,0,0xc);
|
||||
Zi8Memset(buffers.strokes,0,0xc);
|
||||
buffers.masks[0] = match->arr1[0] & 0xf0;
|
||||
@@ -239,7 +239,7 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
}
|
||||
if ((request->getMode == '\x01') || (request->getMode == '\f')) {
|
||||
match->nCand = Zi8GetPyPhonetic(request->elements,elementCount,match->phon,match->phon2,
|
||||
&request->count,&match->first,&match->first2,__zi8_work_data);
|
||||
&request->count,&match->first,&match->first2,__zi8_work_data);
|
||||
}
|
||||
else {
|
||||
initial = 0;
|
||||
@@ -253,12 +253,24 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
request->count = request->elementCount;
|
||||
phoneticLength = 1;
|
||||
for (index = 0; index < elementCount; index++) {
|
||||
if (Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
|
||||
__zi8_work_data) == 0) {
|
||||
stroke = Zi8GetBpmfPhonetic(buffers.phoneticInput,phoneticLength,&initial,&final,&bestInitial,&bestFinal,
|
||||
__zi8_work_data);
|
||||
if (stroke != 0) {
|
||||
previousInitial = bestInitial;
|
||||
previousFinal = bestFinal;
|
||||
savePhonetic:
|
||||
match->phon[match->nCand] = initial;
|
||||
match->phon2[match->nCand] = final;
|
||||
if (match->nCand == 0) {
|
||||
match->first = bestInitial;
|
||||
match->first2 = bestFinal;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ((index == 0) ||
|
||||
((((1 < phoneticLength && (buffers.phoneticInput[phoneticLength - 2] == 0xF360)) &&
|
||||
(buffers.phoneticInput[phoneticLength - 1] == 0xF360)) ||
|
||||
(++match->nCand == 0x10)))) {
|
||||
((((1 < phoneticLength && (buffers.phoneticInput[phoneticLength - 2] == 0xF360)) &&
|
||||
(buffers.phoneticInput[phoneticLength - 1] == 0xF360)) ||
|
||||
(++match->nCand == 0x10)))) {
|
||||
initial = 0xffff;
|
||||
final = 0xffff;
|
||||
bestInitial = 0xffff;
|
||||
@@ -277,21 +289,10 @@ ziBool Zi8PrepareMatch(ziGetParam* request, ziMatchParam* match, ziU8 skipMode Z
|
||||
if (match->nCand == 1) {
|
||||
request->count = phoneticLength - 1;
|
||||
}
|
||||
buffers.phoneticInput += phoneticLength - 1;
|
||||
buffers.phoneticInput = buffers.phoneticInput + phoneticLength - 1;
|
||||
phoneticLength = 0;
|
||||
index--;
|
||||
}
|
||||
else {
|
||||
savePhonetic:
|
||||
match->phon[match->nCand] = initial;
|
||||
match->phon2[match->nCand] = final;
|
||||
previousFinal = bestFinal;
|
||||
previousInitial = bestInitial;
|
||||
if (match->nCand == 0) {
|
||||
match->first = bestInitial;
|
||||
match->first2 = bestFinal;
|
||||
}
|
||||
}
|
||||
phoneticLength++;
|
||||
}
|
||||
if (elementCount != 0) {
|
||||
@@ -305,25 +306,23 @@ savePhonetic:
|
||||
}
|
||||
}
|
||||
if (((request->context & contextMask) != 0) &&
|
||||
((1 < match->nCand || (request->count != elementCount)))) {
|
||||
((1 < match->nCand || (request->count != elementCount)))) {
|
||||
match->phon[0] = 0xFFFF;
|
||||
match->phon2[0] = 0xFFFF;
|
||||
match->nCand = 0;
|
||||
}
|
||||
if (((request->getOptions & 0x20) == 0) &&
|
||||
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
|
||||
if (match->nCand < 2) {
|
||||
phoneticInitial = match->phon[0];
|
||||
phoneticMask = match->phon2[0];
|
||||
((match->phon[0] != 0xFFFF || (match->phon2[0] != 0xFFFF)))) {
|
||||
if (match->nCand > 1) {
|
||||
phoneticInitial = match->phon[match->nCand - 1] & 0xfff8;
|
||||
phoneticMask = match->phon2[match->nCand - 1] & 0xfff8;
|
||||
}
|
||||
else {
|
||||
phoneticInitial = match->phon[match->nCand - 1];
|
||||
phoneticMask = match->phon2[match->nCand - 1];
|
||||
phoneticInitial = match->phon[0] & 0xfff8;
|
||||
phoneticMask = match->phon2[0] & 0xfff8;
|
||||
}
|
||||
phoneticInitial = phoneticInitial & 0xfff8;
|
||||
phoneticMask = phoneticMask & 0xfff8;
|
||||
for (phoneticLength = 0; phoneticLength < phoneticCount; phoneticLength++) {
|
||||
phoneticCode = (buffers.phoneticTable[phoneticLength * 2 + 1] << 8) | buffers.phoneticTable[phoneticLength * 2];
|
||||
phoneticCode = buffers.phoneticTable[phoneticLength * 2] | ((ziU16)buffers.phoneticTable[phoneticLength * 2 + 1] << 8);
|
||||
if (phoneticMask == (phoneticCode & phoneticInitial)) break;
|
||||
}
|
||||
if (phoneticLength == phoneticCount) {
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
||||
s32 uhf_ker_delete_sem(int sem);
|
||||
|
||||
s32 uhf_ker_get_sem(int sem);
|
||||
|
||||
@@ -62,9 +62,9 @@ typedef struct CXUncompContextHuffman {
|
||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||
} CXUncompContextHuffman;
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -68,7 +68,7 @@ void KPADInit();
|
||||
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
|
||||
|
||||
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
|
||||
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
|
||||
|
||||
void KPADSetPosParam(s32 chan, f32 x, f32 y);
|
||||
void KPADSetBtnRepeat(s32 chan, f32, f32);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
||||
|
||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
|
||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||
|
||||
|
||||
@@ -80,11 +80,11 @@ typedef struct {
|
||||
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
|
||||
|
||||
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
|
||||
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
|
||||
WADProcessCallback processCB);
|
||||
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
|
||||
WADProcessCallback processCallback);
|
||||
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
|
||||
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
|
||||
|
||||
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
|
||||
|
||||
|
||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
||||
}
|
||||
}
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
int i;
|
||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
}
|
||||
|
||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
||||
UINT32 *mem_pool_size)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
|
||||
@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
|
||||
GKI_freebuf(p_msg);
|
||||
}
|
||||
|
||||
void bte_hcisu_task(int param_1)
|
||||
void bte_hcisu_task(int unused)
|
||||
{
|
||||
if (p_hcisu_if)
|
||||
{
|
||||
|
||||
@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
|
||||
GKI_shutdown();
|
||||
}
|
||||
|
||||
void bta_usb_close_evt(INT8 param_1)
|
||||
void bta_usb_close_evt(INT8 status)
|
||||
{
|
||||
if (_bte_app_info)
|
||||
{
|
||||
if (param_1 >= 0)
|
||||
if (status >= 0)
|
||||
(*_bte_app_info)(0);
|
||||
else
|
||||
(*_bte_app_info)(1);
|
||||
|
||||
@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
|
||||
MSG_HC_TO_STACK_HCI_EVT,
|
||||
};
|
||||
|
||||
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
|
||||
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
|
||||
{
|
||||
switch (param_1)
|
||||
switch (event)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
|
||||
case 4:
|
||||
bta_usb_close_evt(param_2);
|
||||
bta_usb_close_evt(status);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
{
|
||||
UINT16 bytes_read = 0;
|
||||
UINT8 byte;
|
||||
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
if (p_cb->at_0x1e != 2)
|
||||
return 0;
|
||||
|
||||
r27 = param_1 + 1;
|
||||
r27 = pipe + 1;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
++bytes_read;
|
||||
msg_received = FALSE;
|
||||
|
||||
switch (p_cb->at_0x1a[param_1])
|
||||
switch (p_cb->at_0x1a[pipe])
|
||||
{
|
||||
case 0:
|
||||
if (r27 == 1)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[param_1] = 4;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[pipe] = 4;
|
||||
}
|
||||
else if (r27 == 2)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[param_1] = 2;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[pipe] = 2;
|
||||
}
|
||||
else if (r27 == 3)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[param_1] = 3;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (p_cb->at_0x00[param_1])
|
||||
if (p_cb->at_0x00[pipe])
|
||||
{
|
||||
p_cb->at_0x00[param_1]->len = 0;
|
||||
p_cb->at_0x00[param_1]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x00[param_1]->offset = 0;
|
||||
p_cb->at_0x1a[param_1] = 1;
|
||||
p_cb->at_0x00[pipe]->len = 0;
|
||||
p_cb->at_0x00[pipe]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
|
||||
p_cb->at_0x00[pipe]->offset = 0;
|
||||
p_cb->at_0x1a[pipe] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
"HCIS: Unable to allocate buffer for incoming HCI "
|
||||
"message.");
|
||||
|
||||
p_cb->at_0x1a[param_1] = 2;
|
||||
p_cb->at_0x1a[pipe] = 2;
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x0c[pipe] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
|
||||
|
||||
/* fallthrough */
|
||||
|
||||
case 1:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
{
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
if ((p_cb->at_0x00[param_1] =
|
||||
if ((p_cb->at_0x00[pipe] =
|
||||
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
||||
(BT_HDR *)p_cb->at_0x00[param_1]))
|
||||
(BT_HDR *)p_cb->at_0x00[pipe]))
|
||||
== 0)
|
||||
{
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (msg_len == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
else
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (sizeof(HC_BT_HDR)
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
|
||||
+ msg_len
|
||||
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
|
||||
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
|
||||
{
|
||||
GKI_freebuf(p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
GKI_freebuf(p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
BT_TRACE(HCI, ERROR,
|
||||
"HCIS: Invalid length for incoming HCI message.");
|
||||
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
|
||||
if (msg_len != 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 3;
|
||||
p_cb->at_0x1a[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 2:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 3:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
len = UUSB_Read(param_1 + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len,
|
||||
p_cb->at_0x0c[param_1]);
|
||||
len = UUSB_Read(pipe + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len,
|
||||
p_cb->at_0x0c[pipe]);
|
||||
|
||||
p_cb->at_0x00[param_1]->len += len;
|
||||
p_cb->at_0x0c[param_1] -= len;
|
||||
p_cb->at_0x00[pipe]->len += len;
|
||||
p_cb->at_0x0c[pipe] -= len;
|
||||
bytes_read += len;
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
if (p_cb->at_0x14[param_1] == 2
|
||||
if (p_cb->at_0x14[pipe] == 2
|
||||
&& l2cap_link_chk_pkt_end() == 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 4:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (msg_received)
|
||||
{
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
|
||||
hcisu_h2_send_msg_now(p_cb, p_msg);
|
||||
}
|
||||
|
||||
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
||||
{
|
||||
hcisu_h2_cb.at_0x1e = 0;
|
||||
|
||||
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
hcisu_h2_cb.at_0x1a[1] = 0;
|
||||
hcisu_h2_cb.at_0x1a[2] = 0;
|
||||
|
||||
hcisu_h2_cb.at_0x1f = param_1;
|
||||
hcisu_h2_cb.at_0x20 = param_2;
|
||||
hcisu_h2_cb.at_0x12 = param_3;
|
||||
hcisu_h2_cb.at_0x1f = taskId;
|
||||
hcisu_h2_cb.at_0x20 = mbox;
|
||||
hcisu_h2_cb.at_0x12 = bufSize;
|
||||
}
|
||||
|
||||
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
||||
|
||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
||||
}
|
||||
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable)
|
||||
{
|
||||
tL2C_LCB *p_lcb;
|
||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
}
|
||||
}
|
||||
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
||||
{
|
||||
#if 0
|
||||
/* ... */
|
||||
|
||||
@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
|
||||
(void)uusb;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
|
||||
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
|
||||
return 0;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
{
|
||||
short sp18 = 0;
|
||||
IOSError ret = 0;
|
||||
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
if (usb.state != 2)
|
||||
return 0;
|
||||
|
||||
switch (param_1)
|
||||
switch (pipe)
|
||||
{
|
||||
case 0:
|
||||
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
||||
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
memcpy(p_buffer, p_data, len);
|
||||
|
||||
if (len > 190)
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
||||
|
||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||
{
|
||||
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
break;
|
||||
}
|
||||
|
||||
(void)param_4;
|
||||
(void)unused;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char lbl_81693350[0xd0] = {
|
||||
char scCntCacheStrs[0xd0] = {
|
||||
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
|
||||
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
|
||||
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
|
||||
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
|
||||
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
|
||||
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
|
||||
};
|
||||
char lbl_81693420[0x16] = {
|
||||
char scCntCacheTitleDataFmt[0x16] = {
|
||||
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
|
||||
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
|
||||
};
|
||||
const char* __CNTCACHEVersion = lbl_81693350;
|
||||
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
|
||||
const char* __CNTCACHEVersion = scCntCacheStrs;
|
||||
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r30, scCntCacheStrs@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, lbl_81693350@l
|
||||
addi r30, r30, scCntCacheStrs@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
@@ -146,7 +146,7 @@ L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
@@ -284,7 +284,7 @@ L_350:
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, lbl_81693420@ha
|
||||
lis r5, scCntCacheTitleDataFmt@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, lbl_81693420@l
|
||||
addi r5, r5, scCntCacheTitleDataFmt@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, lbl_81693420@ha
|
||||
lis r27, scCntCacheTitleDataFmt@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
@@ -488,7 +488,7 @@ L_5e8:
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, lbl_81693420@l
|
||||
addi r5, r27, scCntCacheTitleDataFmt@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
@@ -529,7 +529,7 @@ L_6d4:
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
|
||||
@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
|
||||
return CX_SECURE_ERR_OK;
|
||||
}
|
||||
|
||||
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
const u8* a = param_1;
|
||||
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
|
||||
const u8* a = table;
|
||||
const u8* b = a + 1;
|
||||
u32 c = *a;
|
||||
const u8* d = (u8*)param_1 + ((c + 1) << 1);
|
||||
const u8* d = (u8*)table + ((c + 1) << 1);
|
||||
|
||||
u8 e[sizeof(u8) * 0x40];
|
||||
u32 i;
|
||||
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
e[i] = 0;
|
||||
}
|
||||
|
||||
if (param_2 == 4 && c >= 16) {
|
||||
if (bitSize == 4 && c >= 16) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
|
||||
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return CX_STREAMING_ERR_OK;
|
||||
}
|
||||
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
|
||||
int bytesParsed = 0;
|
||||
|
||||
while (*pHdrLen) {
|
||||
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
}
|
||||
}
|
||||
|
||||
if (param_5 > 0 && param_5 < *pOutLen) {
|
||||
*pOutLen = param_5;
|
||||
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
|
||||
*pOutLen = maxOutLen;
|
||||
}
|
||||
|
||||
return bytesParsed;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include <revolution/fa.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
char* __FAVersion = "<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>";
|
||||
s32 FAFileSysInitialized;
|
||||
char* __FAVersion[2] = {"<< RVL_SDK - FA \trelease build: Apr 20 2010 11:20:14 (0x4199_60831) >>", NULL};
|
||||
s32 FAInInitializing;
|
||||
s32 FAFileSysInitialized;
|
||||
extern s32 FADiskInitialized;
|
||||
extern s32 pdm_init_diskmanager(s32 config, void* parameter);
|
||||
extern s32 pfstub_init_prfile2(s32 config, void* parameter);
|
||||
@@ -31,6 +31,6 @@ FAError FAInit(int flag) {
|
||||
}
|
||||
}
|
||||
FAInInitializing = 0;
|
||||
OSRegisterVersion(__FAVersion);
|
||||
OSRegisterVersion(__FAVersion[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
static FAInsertCallback g_attach_func;
|
||||
static FAEjectCallback g_detach_func;
|
||||
static FAInsertCallback g_attach_func;
|
||||
|
||||
extern s32 uhf_msc_is_media_insert(void);
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@ char NAND_Org_Path[64];
|
||||
NAND_DISK_INFO nanddisk_info[23];
|
||||
NAND_SEMAPHORE csem;
|
||||
NAND_SEMAPHORE osem;
|
||||
s32 Nanddisk_Internal_Info_Init;
|
||||
s32 NAND_Init;
|
||||
s32 fa_nanad_semid;
|
||||
s32 Nanddisk_Internal_Info_Init = 0;
|
||||
s32 NAND_Init = 0;
|
||||
s32 fa_nanad_semid = 0;
|
||||
|
||||
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
|
||||
NAND_DISK_INFO* info;
|
||||
@@ -169,13 +169,14 @@ static s32 fa_nanddrv_ParseCreateNANDFile(NAND_DISK_INFO* info) {
|
||||
if (error == 0 || error == -6 || error == -1) {
|
||||
error = NANDChangeDir(name);
|
||||
if (error != 0) { return error; }
|
||||
path++;
|
||||
pf_memset(name, 0, 16);
|
||||
next = name;
|
||||
length = 0;
|
||||
break;
|
||||
} else {
|
||||
return error;
|
||||
}
|
||||
return error;
|
||||
path++;
|
||||
pf_memset(name, 0, 16);
|
||||
next = name;
|
||||
length = 0;
|
||||
break;
|
||||
case 0:
|
||||
if (length > 12) { return -20; }
|
||||
error = NANDCreate(name, 0x30, 0);
|
||||
@@ -403,8 +404,8 @@ s32 fa_nanddrv_init_drv_tbl(PDM_DISK_TBL* table, u32 extension) {
|
||||
return 0;
|
||||
}
|
||||
s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
|
||||
NAND_DISK_INFO* info;
|
||||
u16 index;
|
||||
|
||||
if (pf_strlen(path) >= 76) { return -20; }
|
||||
if (Nanddisk_Internal_Info_Init == 0) {
|
||||
pf_memset(nanddisk_info, 0, sizeof(nanddisk_info));
|
||||
@@ -416,10 +417,9 @@ s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
|
||||
if (fa_nanad_semid == 0) { return -21; }
|
||||
}
|
||||
for (index = 0; index < 23; index++) {
|
||||
info = &nanddisk_info[index];
|
||||
if (pf_strcmp(info->path, path) == 0) { return 0; }
|
||||
if (pf_strcmp(nanddisk_info[index].path, path) == 0) { return 0; }
|
||||
if (nanddisk_info[index].disk == 0) {
|
||||
pf_strcpy(info->path, path);
|
||||
pf_strcpy(nanddisk_info[index].path, path);
|
||||
nanddisk_info[index].file_size = size;
|
||||
break;
|
||||
}
|
||||
@@ -481,15 +481,15 @@ static s32 fa_nanddrv_physical_read(u32 count, u8* buf, u32 block, u32 bps, u32*
|
||||
return error;
|
||||
}
|
||||
static s32 fa_nanddrv_physical_write(u32 count, const u8* buf, u32 block, u32 bps, u32* success, PDM_DISK* disk) {
|
||||
u32 remaining;
|
||||
u32 wanted;
|
||||
u32 file_size;
|
||||
NAND_DISK_INFO* info = 0;
|
||||
u32 wanted;
|
||||
u32 remaining;
|
||||
u16 index;
|
||||
u32 offset;
|
||||
u32 position;
|
||||
s32 error;
|
||||
u8 work[512] __attribute__((aligned(32)));
|
||||
NAND_DISK_INFO* info = 0;
|
||||
for (index = 0; index < 23; index++) {
|
||||
if (nanddisk_info[index].disk == disk) { info = &nanddisk_info[index]; break; }
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@ extern pf_s32 pdm_part_is_attached_partition(PDM_PARTITION* partition);
|
||||
|
||||
pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
|
||||
pf_u32 partition_index;
|
||||
PDM_PARTITION* partition;
|
||||
PF_VOLUME* volume;
|
||||
pf_u8 count;
|
||||
pf_s8* next_drive;
|
||||
pf_u32 volume_index;
|
||||
PDM_PARTITION* partition;
|
||||
pf_u16 volume_index;
|
||||
PF_VOLUME* volume;
|
||||
if (drives == NULL || capacity == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -20,8 +20,7 @@ pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
|
||||
for (partition_index = 0; partition_index < 26; partition_index++, partition++) {
|
||||
if (pdm_part_is_attached_partition(partition) && partition->p_disk == disk) {
|
||||
volume = pf_vol_set.volumes;
|
||||
for (volume_index = 0; volume_index < 26; volume++) {
|
||||
volume_index++;
|
||||
for (volume_index = 0; volume_index < 26; volume_index++, volume++) {
|
||||
if (volume->p_part == partition) {
|
||||
count++;
|
||||
*next_drive++ = volume->drv_char;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include <stddef.h>
|
||||
#include <revolution/fa/types.h>
|
||||
#include <revolution/os.h>
|
||||
#include <revolution/sdi.h>
|
||||
@@ -32,8 +33,8 @@ PFD_SDDRV_INFO g_pfd_sddrv_info;
|
||||
PFD_SDDEV_STORAGE g_pfd_sddev;
|
||||
u8 g_pfd_sddrv_buf[0x200];
|
||||
|
||||
static FAInsertCallback g_attach_func;
|
||||
static FAEjectCallback g_detach_func;
|
||||
static FAInsertCallback g_attach_func = 0;
|
||||
static FAEjectCallback g_detach_func = 0;
|
||||
u32 g_event;
|
||||
|
||||
extern u8 pfd_get_media_drv_char(FADisk*, s8*, u32);
|
||||
@@ -135,17 +136,17 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
u8 bytes[2];
|
||||
} PFD_SDDRV_U16_BYTES;
|
||||
|
||||
#define pfd_sddrv_store_le16(field, value) \
|
||||
#define pfd_sddrv_store_le16(buffer, field, offset, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 1) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
(field)[1] = (u8)((value) >> 8); \
|
||||
} else { \
|
||||
*(u16*)(field) = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
((u16*)(buffer))[(offset) / 2 + (offset) % 2] = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define pfd_sddrv_store_le32(field, value) \
|
||||
#define pfd_sddrv_store_le32(buffer, field, offset, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 3) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
@@ -153,7 +154,7 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
(field)[2] = (u8)((value) >> 16); \
|
||||
(field)[3] = (u8)((value) >> 24); \
|
||||
} else { \
|
||||
*(u32*)(field) = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
((u32*)(buffer))[(offset) / 4 + (offset) % 4] = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
(((value) & 0xff000000) >> 24 | ((value) & 0xff0000) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
@@ -242,23 +243,39 @@ static inline void clear_mount_flag(void) {
|
||||
g_pfd_sddrv_info.flags &= ~2;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_flags(const PFD_SDDRV_INFO* info) {
|
||||
return info->flags;
|
||||
}
|
||||
|
||||
static inline SDDev* pfd_sddrv_device(const PFD_SDDRV_INFO* info) {
|
||||
return info->device;
|
||||
}
|
||||
|
||||
static inline FADisk* pfd_sddrv_disk(const PFD_SDDRV_INFO* info) {
|
||||
return info->disk;
|
||||
}
|
||||
|
||||
static inline s8 pfd_sddrv_drive(const PFD_SDDRV_INFO* info) {
|
||||
return info->drive;
|
||||
}
|
||||
|
||||
s32 pfd_st_inter_callback(s32 status, void* data) {
|
||||
s32 result;
|
||||
|
||||
if ((status & 1) != 1) {
|
||||
return 0;
|
||||
}
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
g_event = 2;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_inter_callback()\n");
|
||||
}
|
||||
}
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_insert(g_pfd_sddrv_info.disk);
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_attach_func != 0) {
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_attach_func != 0) {
|
||||
g_attach_func(g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
@@ -274,17 +291,17 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
|
||||
return 0;
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
g_event = 1;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_removal_callback()\n");
|
||||
}
|
||||
}
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_eject(g_pfd_sddrv_info.disk);
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_detach_func != 0) {
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_detach_func != 0) {
|
||||
g_detach_func(g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
@@ -299,7 +316,7 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 1) != 0) {
|
||||
OSReport("INFO SD Card driver is already initialize. pfd_sddrv_init()\n");
|
||||
if (disk == g_pfd_sddrv_info.disk) {
|
||||
return 0;
|
||||
@@ -328,11 +345,11 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
OSReport("ERR Failed to get sd card status. [ret = 0x%x]\n", sd_result);
|
||||
return 21;
|
||||
}
|
||||
if ((status & 1) == 1) {
|
||||
if ((status & 1) != 0) {
|
||||
g_pfd_sddrv_info.media_inserted = 1;
|
||||
}
|
||||
g_pfd_sddrv_info.device = device;
|
||||
if (g_pfd_sddrv_info.media_inserted == 1) {
|
||||
if (g_pfd_sddrv_info.media_inserted != 0) {
|
||||
g_event = 2;
|
||||
sd_result = ISD_RegisterDeviceIntrHandler(device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (sd_result != 0) {
|
||||
@@ -456,7 +473,7 @@ s32 pfd_sddrv_unmount(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 2) != 0) {
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
return 0;
|
||||
@@ -468,7 +485,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 2) {
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
@@ -483,7 +500,7 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
}
|
||||
g_pfd_sddrv_info.flags = g_pfd_sddrv_info.flags & 0xfffffffe;
|
||||
g_pfd_sddrv_info.media_inserted = g_pfd_sddrv_info.media_ejected = 0;
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
g_pfd_sddrv_info.disk = 0;
|
||||
g_pfd_sddrv_info.drive = 0;
|
||||
return 0;
|
||||
@@ -574,7 +591,7 @@ s32 pfd_sddrv_is_media_insert(void) {
|
||||
|
||||
static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_read) {
|
||||
s32 result;
|
||||
u32 current_sector;
|
||||
s32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -639,7 +656,7 @@ static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes
|
||||
|
||||
s32 pfd_sddrv_physical_write(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_written) {
|
||||
s32 result;
|
||||
u32 current_sector;
|
||||
s32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -731,7 +748,8 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
multiplier = (csd[2] >> 8) & 0xf;
|
||||
minimum_multiplier = multiplier >= 9 ? multiplier : 9;
|
||||
max_multiplier = minimum_multiplier <= 11 ? minimum_multiplier : 11;
|
||||
multiplier_factor = 1 << (u16)(max_multiplier - 9);
|
||||
multiplier_factor = 1;
|
||||
multiplier_factor <<= (u16)(max_multiplier - 9);
|
||||
*sectors = cluster_blocks * multiplier_factor;
|
||||
} else {
|
||||
*sectors = ((csd[1] >> 8 & 0x3fffff) + 1) * 0x400;
|
||||
@@ -740,20 +758,27 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_encode_serial(s32 year, s32 month, s32 day, s32 hour, s32 minute, s32 second) {
|
||||
u32 date;
|
||||
u32 time;
|
||||
date = (day & 0x1f) | ((month & 0xf) << 5) | (((year - 1900) & 0x7f) << 9);
|
||||
time = (second & 0x1f) | ((minute & 0x3f) << 5) | ((hour & 0x1f) << 11);
|
||||
return (date << 16) + time;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
u32 fat_entry_bits;
|
||||
u32 fat_sectors;
|
||||
u32 next_fat_sectors;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u32 current_start;
|
||||
u32 reserved_sectors;
|
||||
u32 total_sectors;
|
||||
u32 fat_sectors;
|
||||
u32 fat_entry_bits;
|
||||
u32 fixed_sectors;
|
||||
u32 start_sector;
|
||||
u32 current_start;
|
||||
u32 next_fat_sectors;
|
||||
u32 clusters;
|
||||
u32 candidate_fat_sectors;
|
||||
u32 reserve_count;
|
||||
@@ -781,10 +806,9 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
sectors_per_cluster = settings.sectors_per_cluster;
|
||||
format_data->sectors_per_cluster = sectors_per_cluster;
|
||||
format_data->sectors_per_cluster = settings.sectors_per_cluster;
|
||||
total_sectors = format_data->total_sectors;
|
||||
clusters = total_sectors / sectors_per_cluster;
|
||||
clusters = total_sectors / format_data->sectors_per_cluster;
|
||||
if (clusters < 0x1005) {
|
||||
fat_entry_bits = 12;
|
||||
} else if (clusters < 0xfff5) {
|
||||
@@ -792,7 +816,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
} else {
|
||||
return -31;
|
||||
}
|
||||
if (total_sectors % sectors_per_cluster != 0) {
|
||||
if (total_sectors % format_data->sectors_per_cluster != 0) {
|
||||
clusters++;
|
||||
}
|
||||
candidate_fat_sectors = clusters * fat_entry_bits;
|
||||
@@ -819,7 +843,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
start_sector += reserved_sectors;
|
||||
}
|
||||
moved_start = 0;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / sectors_per_cluster + 1;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / format_data->sectors_per_cluster + 1;
|
||||
if (clusters >= 0xfe5 && clusters < 0x1005) {
|
||||
current_start += reserved_sectors;
|
||||
start_sector = current_start - fixed_sectors;
|
||||
@@ -844,7 +868,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->partition_start_sector = start_sector;
|
||||
format_data->partition_sector_count = format_data->total_sectors - start_sector;
|
||||
clusters = (format_data->partition_sector_count - (fat_sectors * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
clusters = (format_data->partition_sector_count - (format_data->sectors_per_fat * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
if (clusters < 0xff5) {
|
||||
format_data->fat_type = 0;
|
||||
} else if (clusters >= 0xff5) {
|
||||
@@ -853,22 +877,18 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
return -31;
|
||||
}
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
format_data->volume_serial_number = ((((current_time.year - 1900) & 0x7f) << 9) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(current_time.mday & 0x1f)) * 0x10000 +
|
||||
(((current_time.hour & 0x1f) << 11) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
(current_time.sec & 0x1f));
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u16 sectors_16;
|
||||
s32 result;
|
||||
u32 sectors_32;
|
||||
@@ -914,42 +934,41 @@ s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_BPB, bytes_per_sector), 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, 1);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_BPB, reserved_sector_count), 1);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, (u16)sectors_16);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_BPB, root_entry_count), 0x200);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_BPB, total_sectors_16), (u16)sectors_16);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, sectors_32);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_BPB, sectors_per_fat_16), (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_BPB, total_sectors_32), sectors_32);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u8 start_head;
|
||||
u8 end_head;
|
||||
u8 partition_type;
|
||||
u32 sectors_per_cylinder;
|
||||
u16 start_cylinder;
|
||||
u16 end_cylinder;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
@@ -971,13 +990,12 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
sectors_per_cylinder = settings.fat_copies * settings.root_entries;
|
||||
start_cylinder = format_data->partition_start_sector / sectors_per_cylinder;
|
||||
end_cylinder = (format_data->total_sectors - 1) / sectors_per_cylinder;
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
end_cylinder = (format_data->total_sectors - 1) / (settings.fat_copies * settings.root_entries);
|
||||
end_head = ((format_data->total_sectors - 1) % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = (format_data->total_sectors - 1) % settings.root_entries + 1;
|
||||
start_head = (format_data->partition_start_sector % sectors_per_cylinder) / settings.root_entries;
|
||||
end_head = ((format_data->total_sectors - 1) % sectors_per_cylinder) / settings.root_entries;
|
||||
if (format_data->partition_sector_count == 0) {
|
||||
return -30;
|
||||
}
|
||||
@@ -993,14 +1011,14 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = start_head;
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = end_head;
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
return 0;
|
||||
@@ -1055,8 +1073,9 @@ s32 pfd_sddrv_build_mbr_bpb(u32 total_sectors) {
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u32 available_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
u32 fat_sector_count;
|
||||
u32 available_sectors;
|
||||
u32 fat_sectors;
|
||||
u32 cluster_count;
|
||||
u32 entry_index;
|
||||
@@ -1069,10 +1088,7 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u32 attempts;
|
||||
s32 result;
|
||||
u32 next_data_region;
|
||||
u32 date;
|
||||
u32 time;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
OSCalendarTime current_time;
|
||||
|
||||
if (format_data == 0) {
|
||||
@@ -1148,37 +1164,32 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->reserved_sectors = reserved_sectors;
|
||||
format_data->partition_start_sector = 0x2000;
|
||||
format_data->partition_sector_count = total_sectors - 0x2000;
|
||||
format_data->partition_sector_count = format_data->total_sectors - 0x2000;
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
time = ((current_time.hour & 0x1f) << 11) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
(current_time.sec & 0x1f);
|
||||
date = (((current_time.year - 1900) & 0x7f) << 9) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(current_time.mday & 0x1f);
|
||||
format_data->volume_serial_number = time + date * 0x10000;
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u32 cylinder_size;
|
||||
u16 start_cylinder;
|
||||
u8 partition_type;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 end_cylinder;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
u32 partition_end;
|
||||
u8 partition_type;
|
||||
|
||||
if (format_data == 0) {
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
@@ -1198,42 +1209,42 @@ s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
cylinder_size = settings.fat_copies * settings.root_entries;
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
if (format_data->partition_start_sector <= 0xfb0400) {
|
||||
start_cylinder = format_data->partition_start_sector / cylinder_size;
|
||||
start_head = (format_data->partition_start_sector % cylinder_size) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
} else {
|
||||
start_cylinder = 0x3ff;
|
||||
if (format_data->partition_start_sector > 0xfb0400) {
|
||||
start_head = 0xfe;
|
||||
start_sector = 0x3f;
|
||||
}
|
||||
if (partition_end <= 0xfb0400) {
|
||||
end_cylinder = partition_end / cylinder_size;
|
||||
end_head = (partition_end % cylinder_size) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
start_cylinder = 0x3ff;
|
||||
} else {
|
||||
end_cylinder = 0x3ff;
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
}
|
||||
if (format_data->total_sectors > 0xfb0400) {
|
||||
end_head = 0xfe;
|
||||
end_sector = 0x3f;
|
||||
end_cylinder = 0x3ff;
|
||||
partition_type = 0x0c;
|
||||
} else {
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
end_cylinder = partition_end / (settings.fat_copies * settings.root_entries);
|
||||
end_head = (partition_end % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
}
|
||||
pf_memset(sector_buffer, 0, 0x200);
|
||||
master_boot_record = (PFD_SDDRV_MBR*)sector_buffer;
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = (u8)start_head;
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = (u8)end_head;
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le16(master_boot_record->signature, 0xaa55);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1287,13 +1298,13 @@ s32 pfd_sddrv_store_fat32_fsi_buf(u8* sector_buffer) NO_INLINE {
|
||||
|
||||
s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_FAT32_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
|
||||
if (format_data == 0) {
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
@@ -1321,33 +1332,29 @@ s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_FAT32_BPB, bytes_per_sector), 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, format_data->reserved_sectors);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_FAT32_BPB, reserved_sector_count), format_data->reserved_sectors);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_FAT32_BPB, root_entry_count), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_16), 0);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(boot_sector->sectors_per_fat_32, format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->ext_flags, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->filesystem_version, 0);
|
||||
pfd_sddrv_store_le32(boot_sector->root_cluster, 2);
|
||||
pfd_sddrv_store_le16(boot_sector->fsinfo_sector, 1);
|
||||
pfd_sddrv_store_le16(boot_sector->backup_boot_sector, 6);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_16), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_FAT32_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_FAT32_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_32), format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->sectors_per_fat_32, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_32), format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->ext_flags, offsetof(PFD_SDDRV_FAT32_BPB, ext_flags), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->filesystem_version, offsetof(PFD_SDDRV_FAT32_BPB, filesystem_version), 0);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->root_cluster, offsetof(PFD_SDDRV_FAT32_BPB, root_cluster), 2);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->fsinfo_sector, offsetof(PFD_SDDRV_FAT32_BPB, fsinfo_sector), 1);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->backup_boot_sector, offsetof(PFD_SDDRV_FAT32_BPB, backup_boot_sector), 6);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
if (((u32)boot_sector->signature & 1) != 0) {
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
} else {
|
||||
*(u16*)boot_sector->signature = 0x55aa;
|
||||
}
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_FAT32_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
static s32 st_uhs_msc_status;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command);
|
||||
|
||||
s32 usbh_msc_read10(UHF_MSC_DEVICE* device, u32 sector, u16 count, void* buffer, void* sense) {
|
||||
|
||||
@@ -26,11 +26,10 @@ FAFuncTbl st_uhs_msc_blk_func = {
|
||||
};
|
||||
|
||||
static inline UHF_MSC_DEVICE* uhf_msc_blk_find_device(FADisk* disk) {
|
||||
UHF_MSC_DEVICE* entry = uhg_msc_blk_device_tbl;
|
||||
UHF_MSC_DEVICE* device = NULL;
|
||||
u32 index;
|
||||
for (index = 0; index < 8; entry++, index++) {
|
||||
if (entry->disk == disk) {
|
||||
for (index = 0; index < 8; index++) {
|
||||
if (uhg_msc_blk_device_tbl[index].disk == disk) {
|
||||
device = &uhg_msc_blk_device_tbl[index];
|
||||
break;
|
||||
}
|
||||
@@ -88,9 +87,8 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
|
||||
}
|
||||
|
||||
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
|
||||
u16 transfer_blocks;
|
||||
UHF_MSC_DEVICE* device;
|
||||
s32 error;
|
||||
UHF_MSC_DEVICE* device;
|
||||
u32 block_size;
|
||||
u8* transfer_buffer;
|
||||
u32 transfer_limit;
|
||||
@@ -129,7 +127,7 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
transfer_buffer = buffer;
|
||||
}
|
||||
do {
|
||||
transfer_blocks = transfer_limit;
|
||||
u16 transfer_blocks = transfer_limit;
|
||||
if (blocks <= transfer_limit) {
|
||||
transfer_blocks = blocks;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/pdm.h>
|
||||
#include <revolution/types.h>
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 2] << 16) + (buf)[offset] + (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 1] << 8)))
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 1] << 8) + (buf)[offset])
|
||||
static inline pf_u16 read_boot_u16(pf_u8* buf, pf_u32 offset) {
|
||||
if ((pf_u32)&buf[offset] & 1) { return (buf[offset + 1] << 8) | buf[offset]; }
|
||||
return PF_SWAP_16(*(pf_u16*)&buf[(offset + 1) & ~1]);
|
||||
@@ -10,24 +10,34 @@ pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mb
|
||||
pf_s16 index;
|
||||
pf_u32 start[4];
|
||||
pf_u32 count[4];
|
||||
pf_u32* p_start;
|
||||
pf_u32* p_count;
|
||||
*p_is_mbr = 0;
|
||||
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
start[index] = 0;
|
||||
start[index] = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
count[index] = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (start[index] != 0 && count[index] != 0) {
|
||||
*p_start = 0;
|
||||
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (*p_start != 0 && *p_count != 0) {
|
||||
if (index == 0) { *p_is_mbr = 1; }
|
||||
} else {
|
||||
if (index == 0) { return 2; }
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
buf += 16;
|
||||
}
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
if (start[index] + count[index] > total) {
|
||||
if (*p_start + *p_count > total) {
|
||||
if (index == 0) { *p_is_mbr = 0; }
|
||||
return 2;
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define PF_FA_CP932_TABLE
|
||||
#define VFiPFCODE_CP932_OEM2Unicode PFCODE_CP932_OEM2Unicode
|
||||
#define VFiPFCODE_CP932_OEMCharWidth PFCODE_CP932_OEMCharWidth
|
||||
#define VFiPFCODE_CP932_Unicode2OEM PFCODE_CP932_Unicode2OEM
|
||||
|
||||
@@ -214,21 +214,19 @@ pf_s32 PFDIR_CheckDirIsEmpty(PF_ENT_ITER* iter, pf_u32* is_empty) {
|
||||
PFDIR_SDD* PFDIR_GetSDD(PF_VOLUME* volume, PF_DIR_ENT* entry) {
|
||||
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)volume;
|
||||
PFDIR_SDD* first_free_sdd = 0;
|
||||
PFDIR_SDD* free_candidate = volume_dirs->sdds;
|
||||
pf_s32 i;
|
||||
pf_s32 remaining = 3;
|
||||
|
||||
for (i = 0; remaining != 0; remaining--) {
|
||||
if ((volume_dirs->sdds[i].stat & 1) == 0 || ((volume_dirs->sdds[i].stat & 1) != 0 && (!volume_dirs->sdds[i].stat & 2) != 0)) {
|
||||
if (first_free_sdd == 0) {
|
||||
first_free_sdd = free_candidate;
|
||||
first_free_sdd = &volume_dirs->sdds[i];
|
||||
}
|
||||
} else if (entry->p_vol == volume_dirs->sdds[i].dir_entry.p_vol &&
|
||||
entry->entry_sector == volume_dirs->sdds[i].dir_entry.entry_sector &&
|
||||
entry->entry_offset == volume_dirs->sdds[i].dir_entry.entry_offset) {
|
||||
return &volume_dirs->sdds[i];
|
||||
}
|
||||
free_candidate++;
|
||||
i++;
|
||||
}
|
||||
if (first_free_sdd == 0) {
|
||||
@@ -1072,7 +1070,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
|
||||
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
|
||||
if (error != 0) { return error; }
|
||||
if (PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
|
||||
if (volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
|
||||
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
|
||||
if (error != 0) { return error; }
|
||||
if (PFSTR_GetCodeMode(&destination_name) == 2) {
|
||||
|
||||
@@ -654,7 +654,7 @@ pf_s32 PFENT_MakeRootDir(PF_VOLUME* p_vol) {
|
||||
return 7;
|
||||
}
|
||||
{
|
||||
static pf_u8 default_volume_label[16] = "NO NAME ";
|
||||
static pf_u8 default_volume_label[12] = "NO NAME ";
|
||||
PFDRV_LoadVolumeLabelFromBuf(p_vol, default_volume_label);
|
||||
}
|
||||
return 0;
|
||||
|
||||
@@ -347,7 +347,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@@ -366,7 +366,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -424,7 +424,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
}
|
||||
if ((p_ent->attr & 0x10) == 0 || p_ent->short_name[0] != '.') {
|
||||
p_ent->path_len = (PFSTR_StrNumChar(&token, 1) + 1) + p_ent->path_len;
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) != 0)) {
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) != 0)) {
|
||||
p_ent->path_len -= PFSTR_StrNumChar(&token, 2);
|
||||
}
|
||||
}
|
||||
@@ -689,7 +689,7 @@ pf_s32 PFENT_ITER_FindEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_STR*
|
||||
if (PFSTR_StrNCmp(p_pattern, (pf_s8*)"\\", 1, 0, 1) == 0 || PFSTR_StrNCmp(p_pattern, (pf_s8*)"/", 1, 0, 1) == 0) {
|
||||
err = PFENT_GetRootDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0", 2, 0, 1) == 0) return 0;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0\0\0", 2, 0, 1) == 0) return 0;
|
||||
} else {
|
||||
err = PFVOL_GetCurrentDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
@@ -728,20 +728,23 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
|
||||
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
pf_u32 i;
|
||||
pf_u32 index;
|
||||
pf_s32 err;
|
||||
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
|
||||
index = 0;
|
||||
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
|
||||
pf_u16* destination;
|
||||
err = PFENT_ITER_Retreat(p_iter, 0);
|
||||
if (err != 0) return err;
|
||||
err = PFENT_ITER_LoadEntry(p_iter);
|
||||
if (err != 0) return err;
|
||||
destination = &p_ent->long_name[(i * 26U) / 2U];
|
||||
destination = &p_ent->long_name[index];
|
||||
pf_memcpy(destination, &p_iter->buf[1], 10);
|
||||
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
|
||||
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
|
||||
index += 13;
|
||||
}
|
||||
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) / 2U] = 0;
|
||||
p_ent->long_name[index] = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (*start == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
@@ -1852,13 +1856,15 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
s32 alreadyAllocated;
|
||||
u32 completedBytes;
|
||||
s32 error;
|
||||
s32 error2;
|
||||
|
||||
error = 0;
|
||||
if ((volume->fsi_flag & 4) != 0) {
|
||||
error = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error != 0) { goto finished; }
|
||||
{
|
||||
error2 = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error2 != 0) {
|
||||
return error2;
|
||||
} else {
|
||||
error = PFSEC_ReadData(
|
||||
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
|
||||
volume->bpb.bytes_per_sector, &completedBytes, 0);
|
||||
|
||||
@@ -120,12 +120,13 @@ pf_s32 VFiPFFAT12_WriteFATEntry(PF_VOLUME* p_vol, pf_u16 cluster, pf_u16 value)
|
||||
}
|
||||
|
||||
pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 value, PF_CACHE_PAGE* p_page) {
|
||||
pf_s32 err;
|
||||
pf_u32 next_sector;
|
||||
pf_u32 offset_in_sector;
|
||||
pf_u16 current_fat;
|
||||
pf_s32 fat_offset;
|
||||
pf_u32 fat_sector;
|
||||
pf_s32 result;
|
||||
pf_s32 err;
|
||||
fat_offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
|
||||
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
|
||||
@@ -146,25 +147,25 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = (p_page->p_buf[(pf_u16)offset_in_sector] & 0xF) | ((value << 4) & 0xF0);
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = value >> 4;
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
|
||||
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = value >> 4;
|
||||
}
|
||||
} else {
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = value;
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = (*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) & 0xF0) | ((pf_u8)(value >> 8));
|
||||
}
|
||||
}
|
||||
if (err != 0) { result = err; }
|
||||
|
||||
@@ -102,7 +102,7 @@ pf_s32 PFFAT16_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_u32 cluster, pf_u32 val
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, fat_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
}
|
||||
p_page->p_buf[offset_in_sector] = value;
|
||||
(offset_in_sector + p_page->p_buf)[1] = value >> 8;
|
||||
p_page->p_buf[offset_in_sector + 1] = value >> 8;
|
||||
if (err != 0) {
|
||||
result = err;
|
||||
}
|
||||
|
||||
@@ -400,20 +400,22 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
|
||||
case '*': {
|
||||
do {
|
||||
pattern_width = volume->codeset.oem_char_width(pattern);
|
||||
if (pattern_width == 1) {
|
||||
pattern_char = pf_toupper(*pattern);
|
||||
if (pattern_width != 1) {
|
||||
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)pattern);
|
||||
} else {
|
||||
pattern_char = PF_GET_LE_U16((const pf_u8*)pattern);
|
||||
read_char = pf_toupper(*pattern);
|
||||
}
|
||||
pattern_char = (pf_u16)read_char;
|
||||
pattern += pattern_width;
|
||||
if (pattern_char == '?') {
|
||||
if (name_char == 0) { return 1; }
|
||||
name += name_width;
|
||||
name_width = volume->codeset.oem_char_width(name);
|
||||
if (name_width == 1) { name_char = pf_toupper(*name); }
|
||||
else { name_char = PF_GET_LE_U16((const pf_u8*)name); }
|
||||
if (name_width == 1) { read_char = pf_toupper(*name); }
|
||||
else { read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name); }
|
||||
name_char = (pf_u16)read_char;
|
||||
}
|
||||
} while (pattern_char == '*' || pattern_char == '?');
|
||||
} while (pattern_char == '?' || pattern_char == '*');
|
||||
if (pattern_char == 0) {
|
||||
return 0;
|
||||
}
|
||||
@@ -428,21 +430,21 @@ pf_s32 PFPATH_cmpNameImpl(const pf_s8* name, const pf_s8* pattern, pf_u32* match
|
||||
}
|
||||
name_width = volume->codeset.oem_char_width(name);
|
||||
if (name_width == 1) {
|
||||
name_char = pf_toupper(*name);
|
||||
read_char = pf_toupper(*name);
|
||||
} else {
|
||||
name_char = PF_GET_LE_U16((const pf_u8*)name);
|
||||
read_char = (pf_u16)PF_GET_LE_U16((const pf_u8*)name);
|
||||
}
|
||||
name_char = (pf_u16)read_char;
|
||||
}
|
||||
if (*name == 0 || *pattern == 0) {
|
||||
*matched_end = 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
default:
|
||||
if (name_char != pattern_char) { return 1; }
|
||||
break;
|
||||
}
|
||||
name += name_width;
|
||||
if (*name == 0 || *pattern == 0) {
|
||||
*matched_end = 1;
|
||||
}
|
||||
}
|
||||
return *name != 0;
|
||||
}
|
||||
@@ -1014,7 +1016,7 @@ void PFPATH_SetSearchPattern(pf_s8* p_buf_local, pf_u16* p_buf_unicode, PF_STR*
|
||||
|
||||
pf_u32 PFPATH_CheckExtShortNameSignature(PF_STR* p_str) {
|
||||
pf_u32 result = 0;
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
|
||||
if (PFSTR_StrNCmp(p_str, sig, 1, 0, 2) == 0) {
|
||||
result = 1;
|
||||
@@ -1027,7 +1029,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
pf_s16 i;
|
||||
pf_s16 num;
|
||||
pf_bool is_wildcard = PF_FALSE;
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
pf_s8* p_c;
|
||||
pf_u16* p_wc;
|
||||
|
||||
@@ -1035,7 +1037,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 0, 1) == 0 &&
|
||||
(PFSTR_StrNCmp(p_str, (pf_s8*)"?", target, 1, 1) == 0 || PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0)) ||
|
||||
PFSTR_StrNCmp(p_str, (pf_s8*)"*", target, 0, 1) == 0) {
|
||||
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) != 0 &&
|
||||
for (i = 2; i < 8 && PF_IS_PATH_SEPERATOR(p_str, target, i) == PF_FALSE && PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) != 0 &&
|
||||
PF_IS_PATH_NOT_NULL(p_str, target, i);
|
||||
i++) {
|
||||
if (PFSTR_GetCodeMode(p_str) == 1) {
|
||||
@@ -1059,7 +1061,7 @@ pf_u32 PFPATH_CheckExtShortName(PF_STR* p_str, pf_u32 target, pf_bool wildcard)
|
||||
}
|
||||
}
|
||||
if (i == 8 || is_wildcard == PF_TRUE) {
|
||||
if (PFSTR_StrNCmp(p_str, (pf_s8*)" ", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
|
||||
if (PFSTR_StrNCmp(p_str, (pf_s8*)"\x20\0\0", target, i, 1) == 0 || PF_IS_PATH_SEPERATOR(p_str, target, i) == 0 ||
|
||||
PF_IS_PATH_NULL(p_str, target, i)) {
|
||||
result = i;
|
||||
}
|
||||
@@ -1073,7 +1075,7 @@ pf_u32 PFPATH_GetExtShortNameIndex(PF_STR* p_str, pf_u32* p_index) {
|
||||
pf_s16 i;
|
||||
pf_s16 num;
|
||||
pf_u32 index;
|
||||
pf_s8 sig[2] = {1, 2};
|
||||
pf_s8 sig[2] = "\x01\x02";
|
||||
pf_s8* p_c;
|
||||
pf_u16* p_wc;
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ void* pfstub_entry(void* argument) {
|
||||
pf_vol_set.context_id = message->task_id;
|
||||
if (message->operation >= 0 && message->operation < 100) {
|
||||
pfstub_call_function_standard(message);
|
||||
} else if (received->operation >= 100 && received->operation < 200) {
|
||||
} else if (((s32*)received)[1] >= 100 && ((s32*)received)[1] < 200) {
|
||||
pfstub_call_function_unicode(message);
|
||||
} else {
|
||||
message->result.status = -1;
|
||||
|
||||
@@ -224,6 +224,9 @@ typedef struct PFVOL_SET {
|
||||
|
||||
PFVOL_SET pf_vol_set;
|
||||
|
||||
static s8 default_volume_label[12] = "NO NAME ";
|
||||
static const u8 deleted_entry_mark[8] = {0xE5};
|
||||
|
||||
extern s32 PFDRV_mount(PFVOL_VOLUME* volume);
|
||||
extern s32 PFDRV_unmount(PFVOL_VOLUME* volume, u32 mode);
|
||||
extern s32 PFDRV_format(PFVOL_VOLUME* volume, const u8* format_options);
|
||||
@@ -370,12 +373,7 @@ static inline s32 finalize_volume(PFVOL_VOLUME* volume) {
|
||||
return 0;
|
||||
}
|
||||
static inline s32 copy_codeset(const PFVOL_CHARCODE* code_set) {
|
||||
pf_vol_set.codeset.oem2unicode = code_set->oem2unicode;
|
||||
pf_vol_set.codeset.unicode2oem = code_set->unicode2oem;
|
||||
pf_vol_set.codeset.oem_char_width = code_set->oem_char_width;
|
||||
pf_vol_set.codeset.is_oem_mb_char = code_set->is_oem_mb_char;
|
||||
pf_vol_set.codeset.unicode_char_width = code_set->unicode_char_width;
|
||||
pf_vol_set.codeset.is_unicode_mb_char = code_set->is_unicode_mb_char;
|
||||
pf_vol_set.codeset = *code_set;
|
||||
return 0;
|
||||
}
|
||||
s32 PFVOL_DoMountVolume(PFVOL_VOLUME* volume) {
|
||||
@@ -500,7 +498,9 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
|
||||
s32 error;
|
||||
|
||||
error = PFENT_GetRootDir(volume, &root_entry);
|
||||
if (error == 0) {
|
||||
if (error != 0) {
|
||||
return error;
|
||||
} else {
|
||||
PFFAT_InitFFD(&ffd, &hint, volume, &root_entry.start_cluster);
|
||||
PFSTR_InitStr(&path, "*", 1);
|
||||
PFSTR_SetLocalStr(&path, 0);
|
||||
@@ -514,7 +514,7 @@ s32 PFVOL_p_setvol(PFVOL_VOLUME* volume, const s8* label) {
|
||||
entry.start_cluster = 0;
|
||||
}
|
||||
} else {
|
||||
PFSTR_InitStr(&path, "", 1);
|
||||
PFSTR_InitStr(&path, "\0\0\0", 1);
|
||||
PFSTR_SetLocalStr(&path, 0);
|
||||
error = PFENT_allocateEntry(&entry, 1, &ffd, previous_cluster, &path);
|
||||
if (error != 0) {
|
||||
@@ -584,7 +584,7 @@ s32 PFVOL_p_rmvvol(PFVOL_VOLUME* volume) {
|
||||
u32 logical_position;
|
||||
u32 entry_position;
|
||||
u32 processed;
|
||||
u8 deleted = (u8)"\xE5"[0];
|
||||
u8 deleted = deleted_entry_mark[0];
|
||||
s32 error;
|
||||
|
||||
error = PFENT_GetRootDir(volume, &root_entry);
|
||||
@@ -913,7 +913,7 @@ s32 PFVOL_getvol(s8 drive, PFVOL_VOLUME_INFO* volume_info) {
|
||||
} else {
|
||||
volume = &pf_vol_set.volumes[volume_index];
|
||||
}
|
||||
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
|
||||
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
|
||||
pf_vol_set.last_error = 3;
|
||||
volume->last_error = 3;
|
||||
return 3;
|
||||
@@ -945,7 +945,7 @@ s32 PFVOL_rmvvol(s8 drive) {
|
||||
} else {
|
||||
volume = &pf_vol_set.volumes[volume_index];
|
||||
}
|
||||
if (pf_memcmp(volume->label, "NO NAME ", 11) == 0) {
|
||||
if (pf_memcmp(volume->label, default_volume_label, 11) == 0) {
|
||||
pf_vol_set.last_error = 3;
|
||||
volume->last_error = 3;
|
||||
return 3;
|
||||
@@ -956,7 +956,7 @@ s32 PFVOL_rmvvol(s8 drive) {
|
||||
volume->last_error = error;
|
||||
return error;
|
||||
}
|
||||
error = PFDRV_StoreVolumeLabelToBPB(volume, (const s8*)"NO NAME ");
|
||||
error = PFDRV_StoreVolumeLabelToBPB(volume, default_volume_label);
|
||||
if (error != 0) {
|
||||
pf_vol_set.last_error = error;
|
||||
volume->last_error = error;
|
||||
@@ -1536,3 +1536,4 @@ s32 PFVOL_setencode(u32 mode) {
|
||||
pf_vol_set.setting = pf_vol_set.setting & ~3 | mode;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,17 +69,17 @@ typedef struct {
|
||||
} KBDChannel;
|
||||
|
||||
typedef struct {
|
||||
u32 callbackAddress;
|
||||
USBKBDCmdLEDCallback callbackAddress;
|
||||
void* callbackArg;
|
||||
} KBDLEDCallbackData;
|
||||
|
||||
const char* __KBDVersion =
|
||||
"<< RVL_SDK - KBD \trelease build: Apr 20 2010 11:21:43 (0x4199_60831) >>";
|
||||
|
||||
static BOOL kbdInitialized;
|
||||
static USBKBDAttachCallback kbdDevAttachCallback;
|
||||
static USBKBDDetachCallback kbdDevDetachCallback;
|
||||
static void (*kbdKeyCallback)(KBDKeyEventData* event);
|
||||
static USBKBDDetachCallback kbdDevDetachCallback;
|
||||
static USBKBDAttachCallback kbdDevAttachCallback;
|
||||
static BOOL kbdInitialized;
|
||||
|
||||
KBDKeyMapTable kbdKeyMaps = {0};
|
||||
typedef struct {
|
||||
@@ -346,7 +346,6 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
|
||||
|
||||
event.channel = channel;
|
||||
event.state = pressed;
|
||||
event.modifiers = 0;
|
||||
kbdGetModState(channel, &event.modifiers);
|
||||
map = &kbdKeyMaps.maps[data->country];
|
||||
keyCount = map->keypadCount;
|
||||
@@ -402,86 +401,86 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
|
||||
|
||||
static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
|
||||
KBDChannel* data;
|
||||
u32 modState;
|
||||
s32 delta;
|
||||
u8 flags;
|
||||
KBDModifierState state;
|
||||
|
||||
u32 finalState;
|
||||
s8 value;
|
||||
data = &kbdData[channel];
|
||||
delta = (pressed & 1) != 0 ? 1 : -1;
|
||||
flags = kbdKeyMaps.maps[data->country].flags;
|
||||
state.value = data->modState;
|
||||
|
||||
kbdGetModState(channel, &state.value);
|
||||
kbdGetModState(channel, &modState);
|
||||
switch (key) {
|
||||
case 0xF001:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 2;
|
||||
modState ^= 2;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[1] + delta;
|
||||
data->lockCount[1] = value;
|
||||
state.keys.rightControl = (u8)value != 0;
|
||||
modState = (modState & ~0x2) | (((u8)value != 0) << 1);
|
||||
}
|
||||
break;
|
||||
case 0xF005:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 0x20;
|
||||
modState ^= 0x20;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[4] + delta;
|
||||
data->lockCount[4] = value;
|
||||
state.keys.rightAlt = (u8)value != 0;
|
||||
modState = (modState & ~0x20) | (((u8)value != 0) << 5);
|
||||
}
|
||||
break;
|
||||
case 0xF000:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 1;
|
||||
modState ^= 1;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[0] + delta;
|
||||
data->lockCount[0] = value;
|
||||
state.keys.leftControl = (u8)value != 0;
|
||||
modState = (modState & ~0x1) | ((u8)value != 0);
|
||||
}
|
||||
break;
|
||||
case 0xF008:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
state.value ^= 0x200;
|
||||
modState ^= 0x200;
|
||||
}
|
||||
break;
|
||||
case 0xF007:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
state.value ^= 0x100;
|
||||
modState ^= 0x100;
|
||||
}
|
||||
break;
|
||||
case 0xF006:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
u32 oldState;
|
||||
u32 lockState;
|
||||
oldState = state.value;
|
||||
oldState = modState;
|
||||
lockState = oldState & 0xC0;
|
||||
switch (lockState) {
|
||||
case 0:
|
||||
if ((flags & 1) == 1) {
|
||||
state.value = oldState | 0x40;
|
||||
modState = oldState | 0x40;
|
||||
}
|
||||
break;
|
||||
case 0x40:
|
||||
{
|
||||
state.value = oldState & 0xFFFFFFBF;
|
||||
modState = oldState & 0xFFFFFFBF;
|
||||
if ((flags & 4) == 4) {
|
||||
state.value = oldState & 0xFFFFFFBF | 0x80;
|
||||
modState = oldState & 0xFFFFFFBF | 0x80;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0x80:
|
||||
state.value = oldState & 0xFFFFFF7F;
|
||||
modState = oldState & 0xFFFFFF7F;
|
||||
break;
|
||||
case 0xC0:
|
||||
state.value = oldState & 0xFFFFFF3F;
|
||||
modState = oldState & 0xFFFFFF3F;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -489,43 +488,43 @@ static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
|
||||
case 0xF002:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 4;
|
||||
modState ^= 4;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[2] + delta;
|
||||
data->lockCount[2] = value;
|
||||
state.keys.leftShift = (u8)value != 0;
|
||||
modState = (modState & ~0x4) | (((u8)value != 0) << 2);
|
||||
}
|
||||
break;
|
||||
case 0xF003:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 8;
|
||||
modState ^= 8;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[3] + delta;
|
||||
data->lockCount[3] = value;
|
||||
state.keys.rightShift = (u8)value != 0;
|
||||
modState = (modState & ~0x8) | (((u8)value != 0) << 3);
|
||||
}
|
||||
break;
|
||||
case 0xF004:
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state.value ^= 0x10;
|
||||
modState ^= 0x10;
|
||||
}
|
||||
} else {
|
||||
value = data->lockCount[5] + delta;
|
||||
data->lockCount[5] = value;
|
||||
state.keys.leftAlt = (u8)value != 0;
|
||||
modState = (modState & ~0x10) | (((u8)value != 0) << 4);
|
||||
}
|
||||
break;
|
||||
case 0xF021:
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
state.value ^= 0x400;
|
||||
modState ^= 0x400;
|
||||
}
|
||||
break;
|
||||
}
|
||||
finalState = state.value | 0x1000;
|
||||
finalState = modState | 0x1000;
|
||||
KBDSetModState(channel, finalState);
|
||||
}
|
||||
|
||||
@@ -564,28 +563,26 @@ static inline u32 kbdChannelFlags(u32 channel) {
|
||||
|
||||
static void kbd_led_handler(BOOL success, void* callbackArg) {
|
||||
u32 index;
|
||||
u32 result;
|
||||
u32 callbackAddress;
|
||||
u32 err;
|
||||
index = (u32)callbackArg;
|
||||
callbackAddress = kbdLCBuf[index].callbackAddress;
|
||||
|
||||
kbdCmdBuf[index].device = 0;
|
||||
if (callbackAddress == 0) {
|
||||
if (kbdLCBuf[index].callbackAddress == (USBKBDCmdLEDCallback)(u32)kbdCmdBuf[index].device) {
|
||||
return;
|
||||
}
|
||||
switch (success) {
|
||||
case TRUE:
|
||||
result = 0;
|
||||
break;
|
||||
default:
|
||||
result = 7;
|
||||
err = 7;
|
||||
break;
|
||||
case TRUE:
|
||||
err = 0;
|
||||
break;
|
||||
}
|
||||
((USBKBDCmdLEDCallback)kbdLCBuf[index].callbackAddress)(result, kbdLCBuf[index].callbackArg);
|
||||
kbdLCBuf[index].callbackAddress(err, kbdLCBuf[index].callbackArg);
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback, void* callbackArg) {
|
||||
u32 index;
|
||||
s32 index;
|
||||
u32 ofs;
|
||||
u8 ledBits;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
@@ -595,62 +592,66 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
if ((s32)kbdData[(u8)channel].flags == 1 || (s32)kbdData[(u8)channel].flags == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds;
|
||||
interrupts = OSDisableInterrupts();
|
||||
for (index = 0; index < 12; index++) {
|
||||
if (kbdCmdBuf[index].device == 0) {
|
||||
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
kbdLCBuf[index].callbackAddress = (u32)callback;
|
||||
kbdLCBuf[index].callbackArg = callbackArg;
|
||||
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
|
||||
kbd_led_handler, (void*)index);
|
||||
switch (result) {
|
||||
case 0:
|
||||
return 0;
|
||||
default:
|
||||
return 7;
|
||||
}
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
u32 index;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
if (!kbdInitialized) {
|
||||
return 2;
|
||||
}
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
return 5;
|
||||
}
|
||||
leds &= 0xff;
|
||||
ledBits = leds;
|
||||
interrupts = OSDisableInterrupts();
|
||||
index = 0;
|
||||
while (index < 12) {
|
||||
if ((kbdCmdBuf + index)->device == 0) {
|
||||
kbdCmdBuf[index].device = (u32)kbdData[channel].device;
|
||||
for (index = 0, ofs = 0; index < 12; index++, ofs += sizeof(KBDLEDCommand)) {
|
||||
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
|
||||
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
result = USBKBDSetLED((u32)kbdData[channel].device, leds,
|
||||
kbdLCBuf[index].callbackAddress = callback;
|
||||
kbdLCBuf[index].callbackArg = callbackArg;
|
||||
result = USBKBDSetLEDAsync((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLEDAsync*)&kbdCmdBuf[index],
|
||||
kbd_led_handler, (void*)index);
|
||||
switch (result) {
|
||||
default:
|
||||
return 7;
|
||||
case 0:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
u32 index;
|
||||
KBDLEDCommand* command;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
u8 ledBits;
|
||||
if (!kbdInitialized) {
|
||||
return 2;
|
||||
}
|
||||
if (channel >= 4) {
|
||||
return 4;
|
||||
}
|
||||
if ((s32)kbdChannelFlags(channel) == 1 || (s32)kbdChannelFlags(channel) == 4) {
|
||||
return 5;
|
||||
}
|
||||
ledBits = leds & 0xff;
|
||||
interrupts = OSDisableInterrupts();
|
||||
index = 0;
|
||||
command = kbdCmdBuf;
|
||||
while (index < 12) {
|
||||
if (command->device == 0) {
|
||||
command->device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
command++;
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
return 7;
|
||||
}
|
||||
result = USBKBDSetLED((u32)kbdData[channel].device, ledBits,
|
||||
(USBKBDCmdLED*)&kbdCmdBuf[index]);
|
||||
kbdCmdBuf[index].device = 0;
|
||||
switch (result) {
|
||||
@@ -837,30 +838,28 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
|
||||
kbdData[channel].modState = value & ~0x1000;
|
||||
} else {
|
||||
BOOL interrupts;
|
||||
KBDModifierState* state;
|
||||
KBDModifierState oldState;
|
||||
KBDModifierState newState;
|
||||
interrupts = OSDisableInterrupts();
|
||||
state = (KBDModifierState*)&kbdData[channel].modState;
|
||||
newState.value = value & 0xfc0;
|
||||
oldState = *state;
|
||||
oldState.value = kbdData[channel].modState;
|
||||
newState.bits.physical = oldState.bits.physical;
|
||||
*state = newState;
|
||||
kbdData[channel].modState = newState.value;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
|
||||
KBDKeyMap* map;
|
||||
u16* table;
|
||||
u32 keyIndex;
|
||||
u16 entry;
|
||||
s32 mask;
|
||||
u16* table;
|
||||
u16 activeFlag;
|
||||
u16 entry;
|
||||
KBDKeyMap* map;
|
||||
s32 offset;
|
||||
s32 group;
|
||||
u32 shiftFlag;
|
||||
u16 activeFlag;
|
||||
u32 keyIndex;
|
||||
|
||||
if (kbdInitialized == FALSE) {
|
||||
return 0xFFFF;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -156,10 +156,10 @@ void KPRInitRegionUS(void) {
|
||||
}
|
||||
|
||||
void KPRInitQueue(KPRQueue* queue) {
|
||||
static u8 once;
|
||||
if (!once) {
|
||||
static union { u64 align; u8 flag; } once;
|
||||
if (!once.flag) {
|
||||
OSRegisterVersion(__KPRVersion);
|
||||
once = TRUE;
|
||||
once.flag = TRUE;
|
||||
}
|
||||
queue->mode = KPR_MODE_ALT_KEYPAD;
|
||||
queue->oCount = 0;
|
||||
@@ -244,10 +244,9 @@ u8 KPRLookAhead(KPRQueue* queue, u16* destination, u32 capacity) {
|
||||
|
||||
BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
if (queue->altVal != 0) {
|
||||
u32 leadingZero = queue->altVal & 0x80000000;
|
||||
u32 accumulator = queue->altVal;
|
||||
u32 accumulator = queue->altVal & 0x7FFFFFFF;
|
||||
u32 value;
|
||||
accumulator &= 0x7FFFFFFF;
|
||||
u32 leadingZero = queue->altVal & 0x80000000;
|
||||
queue->altVal = accumulator;
|
||||
if (character >= 0xF130 && character <= 0xF139) {
|
||||
if (accumulator > 0x6666666) {
|
||||
@@ -302,7 +301,7 @@ BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
void KPRProcessDeadKeys(KPRQueue* queue) {
|
||||
int index;
|
||||
int firstFallback;
|
||||
int secondFallback;
|
||||
u32 secondFallback;
|
||||
if (queue->iCount == 1) {
|
||||
for (index = 0; index < 107; ++index) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent) {
|
||||
@@ -313,17 +312,15 @@ void KPRProcessDeadKeys(KPRQueue* queue) {
|
||||
queue->iCount = 0;
|
||||
return;
|
||||
}
|
||||
firstFallback = 0;
|
||||
secondFallback = 107;
|
||||
for (index = 0; index < 107; ++index) {
|
||||
u16 first = queue->text[queue->oCount];
|
||||
if (first == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
queue->text[queue->oCount] = kprDeadKeyMap[index].composed;
|
||||
queue->iCount = 0;
|
||||
++queue->oCount;
|
||||
return;
|
||||
}
|
||||
if (first == kprDeadKeyMap[index].accent && first == kprDeadKeyMap[index].base) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount] == kprDeadKeyMap[index].base) {
|
||||
firstFallback = index;
|
||||
}
|
||||
if (queue->text[queue->oCount + 1] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
|
||||
@@ -169,13 +169,13 @@ static inline char* __nupFindTag(char* response, const char* endTag, const char*
|
||||
char** value, size_t* length) {
|
||||
char* start;
|
||||
char* end;
|
||||
if (response != 0 && (start = strstr(response, startTag)) != 0 &&
|
||||
(end = strstr(start, endTag)) != 0) {
|
||||
*value = start + strlen(startTag);
|
||||
*length = end - *value;
|
||||
return end + strlen(endTag);
|
||||
if (response == 0 || (start = strstr(response, startTag)) == 0 ||
|
||||
(end = strstr(start, endTag)) == 0) {
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
*value = start + strlen(startTag);
|
||||
*length = end - *value;
|
||||
return end + strlen(endTag);
|
||||
}
|
||||
|
||||
static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* messageId,
|
||||
@@ -192,11 +192,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* versionStartTag = "<Version>";
|
||||
afterEnd = __nupFindTag(response, versionEndTag, versionStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
|
||||
if (afterEnd == 0 || valueLength != strlen("1.0") || strncmp(start, "1.0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -207,11 +203,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* deviceIdStartTag = "<DeviceId>";
|
||||
afterEnd = __nupFindTag(response, deviceIdEndTag, deviceIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (strtoull(start, 0, 10) != deviceId) {
|
||||
if (afterEnd == 0 || strtoull(start, 0, 10) != deviceId) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -222,11 +214,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* messageIdStartTag = "<MessageId>";
|
||||
afterEnd = __nupFindTag(response, messageIdEndTag, messageIdStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
|
||||
if (afterEnd == 0 || valueLength != strlen(messageId) || strncmp(start, messageId, valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -237,11 +225,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* errorCodeStartTag = "<ErrorCode>";
|
||||
afterEnd = __nupFindTag(response, errorCodeEndTag, errorCodeStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || strncmp(start, "0", valueLength) != 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -252,15 +236,15 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* uploadAuditStartTag = "<UploadAuditData>";
|
||||
afterEnd = __nupFindTag(response, uploadAuditEndTag, uploadAuditStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
if (afterEnd == 0 || valueLength != strlen("0") || (*start != '0' && *start != '1')) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength != strlen("0") || (*start != '0' && *start != '1')) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
if (*start == '0') {
|
||||
context->uploadAuditData = 0;
|
||||
} else {
|
||||
context->uploadAuditData = 1;
|
||||
}
|
||||
context->uploadAuditData = *start == '1';
|
||||
}
|
||||
|
||||
{
|
||||
@@ -268,11 +252,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* contentPrefixStartTag = "<ContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, contentPrefixEndTag, contentPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength == 0) {
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -290,11 +270,7 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
const char* uncachedPrefixStartTag = "<UncachedContentPrefixURL>";
|
||||
afterEnd = __nupFindTag(response, uncachedPrefixEndTag, uncachedPrefixStartTag,
|
||||
&start, &valueLength);
|
||||
if (afterEnd == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if (valueLength == 0) {
|
||||
if (afterEnd == 0 || valueLength == 0) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
@@ -310,19 +286,14 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
titleCount = 0;
|
||||
cursor = response;
|
||||
{
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
for (;;) {
|
||||
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag, &start, &valueLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag, &start, &valueLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&start, &valueLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&start, &valueLength)) != 0) {
|
||||
titleCount++;
|
||||
}
|
||||
}
|
||||
@@ -335,26 +306,19 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
memset(context->titles, 0, titleCount * sizeof(NUPTitleInfo));
|
||||
cursor = response;
|
||||
{
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
const char* versionEndTag = "</Version>";
|
||||
const char* versionStartTag = "<Version>";
|
||||
for (;;) {
|
||||
char* titleStart;
|
||||
char* versionStart;
|
||||
size_t titleLength;
|
||||
size_t versionLength;
|
||||
char* parsedEnd;
|
||||
cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&titleStart, &titleLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&versionStart, &versionLength);
|
||||
if (cursor == 0) {
|
||||
break;
|
||||
}
|
||||
const char* titleIdEndTag = "</TitleId>";
|
||||
const char* titleIdStartTag = "<TitleId>";
|
||||
char* titleStart;
|
||||
char* versionStart;
|
||||
size_t titleLength;
|
||||
size_t versionLength;
|
||||
char* parsedEnd;
|
||||
while ((cursor = __nupFindTag(cursor, titleIdEndTag, titleIdStartTag,
|
||||
&titleStart, &titleLength)) != 0 &&
|
||||
(cursor = __nupFindTag(cursor, versionEndTag, versionStartTag,
|
||||
&versionStart, &versionLength)) != 0) {
|
||||
unsigned long long titleId = strtoull(titleStart, &parsedEnd, 16);
|
||||
if (parsedEnd != titleStart + titleLength) {
|
||||
result = -5004;
|
||||
@@ -365,12 +329,13 @@ static s32 __nupParseServerInfo(NUPContextInfo* context, char* response, char* m
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
if ((u16)version != version) {
|
||||
u16 checkedVersion = version;
|
||||
if (version != checkedVersion) {
|
||||
result = -5004;
|
||||
goto done;
|
||||
}
|
||||
context->titles[context->titleCount].titleId = titleId;
|
||||
context->titles[context->titleCount].serverVersion = version;
|
||||
context->titles[context->titleCount].serverVersion = checkedVersion;
|
||||
context->titleCount++;
|
||||
}
|
||||
}
|
||||
@@ -401,9 +366,9 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
|
||||
result = -5000;
|
||||
} else {
|
||||
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
|
||||
requestSize = strlen(messageId);
|
||||
requestSize += strlen(productArea);
|
||||
requestSize += strlen(countryCode) + 0x449;
|
||||
requestSize = strlen(messageId) + strlen(productArea);
|
||||
unsigned long countryLength = strlen(countryCode);
|
||||
requestSize += countryLength + 0x449;
|
||||
if (auditData != 0) {
|
||||
requestSize += strlen(auditData);
|
||||
}
|
||||
@@ -514,8 +479,11 @@ static u32 __nupSetAuditState(u8 state) {
|
||||
}
|
||||
#pragma dont_inline reset
|
||||
|
||||
static inline unsigned long __nupBase64EncodedSize(unsigned long length) {
|
||||
return ((length + 2) / 3) * 4;
|
||||
}
|
||||
|
||||
static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
const char* alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
@@ -523,23 +491,31 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
|
||||
while (input != end) {
|
||||
count++;
|
||||
value = value << 8 | *input++;
|
||||
value <<= 8;
|
||||
value |= *input++;
|
||||
if (count < 3) {
|
||||
continue;
|
||||
}
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
output[3] = alphabet[value & 0x3f];
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
|
||||
output[2] = encodedThird;
|
||||
output[3] = encodedFourth;
|
||||
count = 0;
|
||||
output += 4;
|
||||
}
|
||||
|
||||
if (count == 2) {
|
||||
value <<= 8;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
output[2] = alphabet[value >> 6 & 0x3f];
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
output[2] = encodedThird;
|
||||
output[3] = fillByte;
|
||||
return;
|
||||
}
|
||||
@@ -547,8 +523,10 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
return;
|
||||
}
|
||||
value <<= 16;
|
||||
output[0] = alphabet[value >> 18 & 0x3f];
|
||||
output[1] = alphabet[value >> 12 & 0x3f];
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
output[1] = encodedSecond;
|
||||
output[2] = fillByte;
|
||||
output[3] = fillByte;
|
||||
}
|
||||
@@ -558,16 +536,16 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
u32 auditFormat = 0;
|
||||
ESTicketView* ticketViews = 0;
|
||||
u32 viewCount;
|
||||
u32 selected = 0;
|
||||
u32 selectedIndex = 0;
|
||||
void* auditRecord = 0;
|
||||
void* signatureCertificate = 0;
|
||||
void* deviceCertificate = 0;
|
||||
NUPSignedAuditData* signedData = 0;
|
||||
void* encodedData = 0;
|
||||
u32 i;
|
||||
u32 selectedIndex;
|
||||
u32 selected = 0;
|
||||
ESSignature signature ALIGN32;
|
||||
char deviceInfo[0x21];
|
||||
u32 i;
|
||||
|
||||
for (i = 0; selected == 0 && i < context->ownedTitleCount; i++) {
|
||||
ESTitleId ownedTitleId = context->ownedTitleIds[i];
|
||||
@@ -594,11 +572,13 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
if (selected != 0) {
|
||||
memset(deviceInfo, 0, sizeof(deviceInfo));
|
||||
char* productCode = SCGetProductCode();
|
||||
unsigned long productCodeSize = 0;
|
||||
unsigned long productCodeSize;
|
||||
if (productCode != 0) {
|
||||
memcpy(deviceInfo, productCode, 5);
|
||||
deviceInfo[4] = '\0';
|
||||
productCodeSize = strlen(deviceInfo);
|
||||
} else {
|
||||
productCodeSize = 0;
|
||||
}
|
||||
if (SCGetProductSNString(deviceInfo + productCodeSize, sizeof(deviceInfo) - productCodeSize) == 0) {
|
||||
memset(deviceInfo + productCodeSize, 0, sizeof(deviceInfo) - productCodeSize);
|
||||
@@ -629,16 +609,22 @@ static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
result = -5000;
|
||||
} else {
|
||||
memcpy(&signedData->format, &auditFormat, sizeof(auditFormat));
|
||||
memcpy(&signedData->auditRecord, auditRecord, sizeof(NUPAuditRecord));
|
||||
memcpy(signedData->signature, signature, sizeof(signature));
|
||||
memcpy(signedData->signatureCertificate, signatureCertificate, 0x180);
|
||||
memcpy(signedData->deviceCertificate, deviceCertificate, 0x180);
|
||||
encodedData = nup::__nupMalloc(0x5a1);
|
||||
u8* auditCursor = (u8*)&signedData->auditRecord;
|
||||
memcpy(auditCursor, auditRecord, sizeof(NUPAuditRecord));
|
||||
auditCursor += sizeof(NUPAuditRecord);
|
||||
memcpy(auditCursor, signature, sizeof(signature));
|
||||
auditCursor += sizeof(signature);
|
||||
memcpy(auditCursor, signatureCertificate, 0x180);
|
||||
memcpy(auditCursor + sizeof(signedData->signatureCertificate),
|
||||
deviceCertificate, sizeof(signedData->deviceCertificate));
|
||||
unsigned long auditSize = sizeof(NUPSignedAuditData);
|
||||
unsigned long encodedSize = __nupBase64EncodedSize(auditSize);
|
||||
encodedData = nup::__nupMalloc(encodedSize + 1);
|
||||
if (encodedData == 0) {
|
||||
result = -5000;
|
||||
} else {
|
||||
__nupBase64Encode((u8*)encodedData, (u8*)signedData, sizeof(NUPSignedAuditData));
|
||||
((u8*)encodedData)[0x5a0] = 0;
|
||||
__nupBase64Encode((u8*)encodedData, (u8*)signedData, auditSize);
|
||||
((u8*)encodedData)[encodedSize] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -695,23 +681,59 @@ static s32 __nupGetTmdView(ESTitleId titleId, ESTmdView** tmdView) {
|
||||
}
|
||||
#pragma dont_inline reset
|
||||
|
||||
template <class Title>
|
||||
static inline BOOL __nupHasContent(const Title* title, ESContentId contentId) {
|
||||
if (title->contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent;
|
||||
u32 index;
|
||||
for (index = 0; index < title->contentCount; index++) {
|
||||
if (contentId == *(installedContent = &title->contentIds[index])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return index < title->contentCount;
|
||||
}
|
||||
|
||||
static inline BOOL __nupHasInstalledContent(const ESTitleVersion* title, ESContentId contentId,
|
||||
u32 contentCount) {
|
||||
if (contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent;
|
||||
u32 index;
|
||||
for (index = 0; index < contentCount; index++) {
|
||||
if (contentId == *(installedContent = &title->contentIds[index])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return index < contentCount;
|
||||
}
|
||||
|
||||
static inline s32 __nupSetBootTitleVersion(ESTitleVersion* title) {
|
||||
u32 bootVersion;
|
||||
s32 result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
u16 installedVersion = bootVersion;
|
||||
if (installedVersion != bootVersion) {
|
||||
result = -0x1389;
|
||||
} else {
|
||||
title->installedVersion = installedVersion;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
s32 result;
|
||||
ESTmdView* tmdView = 0;
|
||||
|
||||
if (title->titleId == 0x0000000100000001ULL) {
|
||||
u32 bootVersion;
|
||||
title->hasTicket = 1;
|
||||
title->hasTmd = 1;
|
||||
title->hasContent = 1;
|
||||
result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
if ((bootVersion & 0xffff) == bootVersion) {
|
||||
title->installedVersion = bootVersion;
|
||||
} else {
|
||||
result = -0x1389;
|
||||
}
|
||||
}
|
||||
result = __nupSetBootTitleVersion(title);
|
||||
} else {
|
||||
u32 i;
|
||||
for (i = 0; i < context->ownedTitleCount; i++) {
|
||||
@@ -729,49 +751,48 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
title->installedVersion = tmdView->head.titleVersion;
|
||||
} else if (result == -0x6a) {
|
||||
result = 0;
|
||||
}
|
||||
|
||||
if (result < 0) {
|
||||
} else if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
if (tmdView != 0) {
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, 0, &title->contentCount);
|
||||
if (result == -0x6a) {
|
||||
result = 0;
|
||||
} else if (result == 0) {
|
||||
if (result == 0) {
|
||||
if (title->contentCount != 0) {
|
||||
title->contentIds = (ESContentId*)nup::__nupMalloc(title->contentCount * sizeof(ESContentId));
|
||||
if (title->contentIds == 0) {
|
||||
result = -5000;
|
||||
title->contentCount = 0;
|
||||
} else {
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
|
||||
if (result != 0) {
|
||||
nup::__nupFree(title->contentIds);
|
||||
title->contentIds = 0;
|
||||
title->contentCount = 0;
|
||||
}
|
||||
goto done;
|
||||
}
|
||||
result = ES_ListTitleContentsOnCard(title->titleId, title->contentIds, &title->contentCount);
|
||||
if (result != 0) {
|
||||
nup::__nupFree(title->contentIds);
|
||||
title->contentIds = 0;
|
||||
title->contentCount = 0;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (result == 0 && title->contentCount >= tmdView->head.numContents) {
|
||||
s32 contentIndex;
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
u32 installedIndex;
|
||||
for (installedIndex = 0; installedIndex < title->contentCount; installedIndex++) {
|
||||
if (title->contentIds[installedIndex] == tmdView->contents[contentIndex].cid) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (installedIndex == title->contentCount) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (contentIndex >= tmdView->head.numContents) {
|
||||
title->hasContent = 1;
|
||||
u32 installedContentCount = title->contentCount;
|
||||
if (installedContentCount < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
s32 contentIndex;
|
||||
for (contentIndex = 0; contentIndex < tmdView->head.numContents; contentIndex++) {
|
||||
if (!__nupHasInstalledContent(title, tmdView->contents[contentIndex].cid,
|
||||
installedContentCount)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (contentIndex < tmdView->head.numContents) {
|
||||
goto done;
|
||||
}
|
||||
title->hasContent = 1;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (result == -0x6a) {
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
@@ -884,24 +905,9 @@ static s32 __nupGetTmd(NUPTitleInfo* title, char* contentPrefixUrl) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline BOOL __nupHasContent(const NUPTitleInfo* title, ESContentId contentId) {
|
||||
if (title->contentCount == 0 || title->contentIds == 0) {
|
||||
return FALSE;
|
||||
}
|
||||
ESContentId* installedContent = title->contentIds;
|
||||
u32 index;
|
||||
for (index = 0; index < title->contentCount; index++) {
|
||||
if (contentId == *installedContent) {
|
||||
break;
|
||||
}
|
||||
installedContent++;
|
||||
}
|
||||
return index < title->contentCount;
|
||||
}
|
||||
|
||||
static s32 __nupGetTitleSize(NUPTitleInfo* title) {
|
||||
s32 contentIndex;
|
||||
s32 result = 0;
|
||||
s32 contentIndex;
|
||||
title->progressStep += 2;
|
||||
if (title->hasTicket == 0) {
|
||||
title->progressStep += 1;
|
||||
@@ -917,14 +923,15 @@ static s32 __nupGetTitleSize(NUPTitleInfo* title) {
|
||||
title->installedContentSize += 0x4000;
|
||||
for (contentIndex = 0; contentIndex < ((ESTmdView*)title->tmdView)->head.numContents; contentIndex++) {
|
||||
ESCmdView* content = &((ESTmdView*)title->tmdView)->contents[contentIndex];
|
||||
if (!__nupHasContent(title, content->cid) ||
|
||||
ESContentId contentId = content->cid;
|
||||
if (!__nupHasContent(title, contentId) ||
|
||||
title->titleId == 0x0000000100000001ULL) {
|
||||
if (content->size >= 0xfffffff0ULL) {
|
||||
if (content->size > 0xffffffefULL) {
|
||||
result = -0x1394;
|
||||
break;
|
||||
}
|
||||
title->updateContentSize += (content->size + 0xf) & 0xfffffffffffffff0ULL;
|
||||
title->installedContentSize += (content->size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->installedContentSize += (((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0x3fff) & 0xffffffffffffc000ULL;
|
||||
title->progressStep++;
|
||||
}
|
||||
}
|
||||
@@ -977,10 +984,11 @@ static s32 __nupGetContentFull(NUPContextInfo* context, NUPTitleInfo* title, cha
|
||||
}
|
||||
|
||||
static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl) {
|
||||
s32 contentIndex;
|
||||
s32 result = 0;
|
||||
char* url;
|
||||
unsigned long urlSize = strlen(contentPrefixUrl) + 0x28;
|
||||
char* url = (char*)nup::__nupMalloc(urlSize);
|
||||
url = (char*)nup::__nupMalloc(urlSize);
|
||||
s32 contentIndex;
|
||||
|
||||
if (url == 0) {
|
||||
result = -5000;
|
||||
@@ -989,14 +997,14 @@ static s32 __nupGetContentIncr(NUPContextInfo* context, NUPTitleInfo* title, cha
|
||||
ESContentId contentId = ((ESTmdView*)title->tmdView)->contents[contentIndex].cid;
|
||||
if (!__nupHasContent(title, contentId)) {
|
||||
snprintf(url, urlSize, "%s/%016llx/%08x", contentPrefixUrl, title->titleId, contentId);
|
||||
unsigned long contentSize = ((ESTmdView*)title->tmdView)->contents[contentIndex].size;
|
||||
unsigned long contentSize = (u32)((((ESTmdView*)title->tmdView)->contents[contentIndex].size + 0xf) & 0xfffffffffffffff0ULL);
|
||||
ESFd fd = ES_ImportContentBegin(title->titleId, contentId);
|
||||
result = fd;
|
||||
if (result < 0) {
|
||||
ES_ImportContentEnd(fd);
|
||||
break;
|
||||
}
|
||||
result = __nupHttpGetIncr(url, (contentSize + 0xf) & 0xfffffff0,
|
||||
result = __nupHttpGetIncr(url, contentSize,
|
||||
__nupUpdateStatusIncr, context, __nupHttpBufferFlushES, (void*)fd);
|
||||
if (result != 0) {
|
||||
ES_ImportContentEnd(fd);
|
||||
@@ -1085,6 +1093,16 @@ static void __nupCleanup(NUPContextInfo* context) {
|
||||
context->productArea = 0;
|
||||
}
|
||||
|
||||
static inline s32 __nupCheckTitleSpace(const NUPTitleInfo* title) {
|
||||
ISFSStats stats;
|
||||
s32 result = ISFS_GetStats(&stats);
|
||||
if (result == 0 && (title->installedContentSize >> 14) <= stats.freeBlocks &&
|
||||
title->progressStep <= stats.freeInodes) {
|
||||
result = 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char* contentPrefixUrl,
|
||||
char* uncachedContentPrefixUrl) {
|
||||
s32 result;
|
||||
@@ -1109,13 +1127,9 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
goto cleanup;
|
||||
} else {
|
||||
ISFSStats stats;
|
||||
result = ISFS_GetStats(&stats);
|
||||
if (result == 0 && stats.freeBlocks >= (title->installedContentSize >> 14) &&
|
||||
title->progressStep <= stats.freeInodes) {
|
||||
result = 1;
|
||||
}
|
||||
result = __nupCheckTitleSpace(title);
|
||||
if (result == 0) {
|
||||
result = -0x1392;
|
||||
goto done;
|
||||
@@ -1144,47 +1158,97 @@ static s32 __nupUpdateTitle(NUPContextInfo* context, NUPTitleInfo* title, char*
|
||||
goto done;
|
||||
}
|
||||
result = ES_ImportTitleDone();
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (result == 0) {
|
||||
__nupCleanupTitleInfo(title);
|
||||
title->updateRequired = 0;
|
||||
}
|
||||
cleanup:
|
||||
__nupCleanupTitleInfo(title);
|
||||
title->updateRequired = 0;
|
||||
done:
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 __nupGetBoot2Version(u16* version) {
|
||||
u32 bootVersion;
|
||||
s32 result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
u16 checkedVersion = bootVersion;
|
||||
if (checkedVersion != bootVersion) { result = -0x1389; }
|
||||
if (checkedVersion == bootVersion) { *version = checkedVersion; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 __nupGetOwnedTitles(NUPContextInfo* context) {
|
||||
s32 result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
|
||||
if (result == 0) {
|
||||
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
|
||||
if (context->ownedTitleIds != 0) {
|
||||
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
|
||||
} else {
|
||||
result = -5000;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline s32 __nupCheckTitleVersion(NUPContextInfo* context, NUPTitleInfo* title) {
|
||||
s32 result = __nupGetBootVersion(context, (ESTitleVersion*)title);
|
||||
if (result == 0) {
|
||||
if (title->hasTicket && title->hasTmd && title->hasContent &&
|
||||
title->installedVersion >= title->serverVersion) {
|
||||
title->updateRequired = 0;
|
||||
} else {
|
||||
title->updateRequired = 1;
|
||||
}
|
||||
}
|
||||
if (result >= 0) {
|
||||
result = title->updateRequired;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = status;
|
||||
if (status < 0) {
|
||||
context->progress.message = __nupStatusMessage[5];
|
||||
} else if (status >= 4) {
|
||||
context->progress.message = __nupStatusMessage[4];
|
||||
} else {
|
||||
context->progress.message = __nupStatusMessage[status];
|
||||
}
|
||||
OSUnlockMutex(&context->mutex);
|
||||
}
|
||||
|
||||
extern "C" void* __nupOp(void* argument) {
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
NUPTitleInfo* bootTitle = 0;
|
||||
NUPTitleInfo* menuTitle = 0;
|
||||
NUPTitleInfo* systemTitle = 0;
|
||||
u32 deviceId;
|
||||
u32 bootVersion;
|
||||
u16 serverBootVersion = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
NUPTitleInfo* bootTitle = 0;
|
||||
NUPTitleInfo* menuTitle = 0;
|
||||
NUPTitleInfo* systemTitle = 0;
|
||||
NUPContextInfo* context = (NUPContextInfo*)argument;
|
||||
u32 deviceId;
|
||||
char messageId[0x15];
|
||||
NANDStatus auditStatus;
|
||||
s32 result;
|
||||
u32 i;
|
||||
BOOL needsAudit;
|
||||
|
||||
snprintf(messageId, sizeof(messageId), "%llu", OSGetTime());
|
||||
result = ES_GetDeviceId(&deviceId);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
serverBootVersion = bootVersion;
|
||||
if (serverBootVersion != bootVersion) {
|
||||
result = -0x1389;
|
||||
}
|
||||
}
|
||||
currentDeviceId = deviceId;
|
||||
result = __nupGetBoot2Version(&serverBootVersion);
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1203,15 +1267,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
systemMenuVersion = tmdView->head.titleVersion;
|
||||
nup::__nupFree(tmdView);
|
||||
tmdView = 0;
|
||||
result = ES_ListOwnedTitles(0, &context->ownedTitleCount);
|
||||
if (result == 0) {
|
||||
context->ownedTitleIds = (ESTitleId*)nup::__nupMalloc(context->ownedTitleCount * sizeof(ESTitleId));
|
||||
if (context->ownedTitleIds != 0) {
|
||||
result = ES_ListOwnedTitles(context->ownedTitleIds, &context->ownedTitleCount);
|
||||
} else {
|
||||
result = -5000;
|
||||
}
|
||||
}
|
||||
result = __nupGetOwnedTitles(context);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1230,7 +1286,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
context->progress.message = __nupStatusMessage[2];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
result = __nupGetServerInfo((char*)context->serverAddress, messageId,
|
||||
0x0000000100000000ULL | deviceId,
|
||||
0x0000000100000000ULL | currentDeviceId,
|
||||
(char*)context->productArea, (char*)context->countryCode,
|
||||
context->systemVersion, auditData, serverBootVersion, bootTitleVersion,
|
||||
currentTitleId, systemMenuVersion, (char**)&response);
|
||||
@@ -1242,7 +1298,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
}
|
||||
auditData = 0;
|
||||
result = __nupParseServerInfo(context, (char*)response, messageId,
|
||||
0x0000000100000000ULL | deviceId);
|
||||
0x0000000100000000ULL | currentDeviceId);
|
||||
if (result != 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1254,18 +1310,7 @@ extern "C" void* __nupOp(void* argument) {
|
||||
}
|
||||
for (i = 0; i < context->titleCount; i++) {
|
||||
NUPTitleInfo* title = &context->titles[i];
|
||||
result = __nupGetBootVersion(context, (ESTitleVersion*)title);
|
||||
if (result == 0) {
|
||||
if (title->hasTicket && title->hasTmd && title->hasContent &&
|
||||
title->installedVersion >= title->serverVersion) {
|
||||
title->updateRequired = 0;
|
||||
} else {
|
||||
title->updateRequired = 1;
|
||||
}
|
||||
}
|
||||
if (result >= 0) {
|
||||
result = title->updateRequired;
|
||||
}
|
||||
result = __nupCheckTitleVersion(context, title);
|
||||
if (result < 0) {
|
||||
goto done;
|
||||
}
|
||||
@@ -1305,11 +1350,11 @@ extern "C" void* __nupOp(void* argument) {
|
||||
OSUnlockMutex(&context->mutex);
|
||||
for (i = 0; i < context->titleCount; i++) {
|
||||
NUPTitleInfo* title = &context->titles[i];
|
||||
if (title->titleId == 0x0000000100000001ULL) {
|
||||
if (context->titles[i].titleId == 0x0000000100000001ULL) {
|
||||
bootTitle = title;
|
||||
} else if (title->titleId == 0x0000000100000002ULL) {
|
||||
} else if (context->titles[i].titleId == 0x0000000100000002ULL) {
|
||||
menuTitle = title;
|
||||
} else if (title->titleId == currentTitleId) {
|
||||
} else if (context->titles[i].titleId == currentTitleId) {
|
||||
systemTitle = title;
|
||||
}
|
||||
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {
|
||||
@@ -1368,17 +1413,11 @@ done:
|
||||
}
|
||||
__nupCleanup(context);
|
||||
if (result >= 0) {
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = 0;
|
||||
context->progress.message = __nupStatusMessage[0];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
__nupSetStatus(context, 0);
|
||||
} else {
|
||||
OSLockMutex(&context->mutex);
|
||||
context->progress.result = result;
|
||||
context->progress.message = __nupStatusMessage[5];
|
||||
OSUnlockMutex(&context->mutex);
|
||||
__nupSetStatus(context, result);
|
||||
}
|
||||
return 0;
|
||||
return (void*)result;
|
||||
}
|
||||
|
||||
void* NUP_Init(MEMAllocator* allocator) {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#define SD_SLOT_PATH_LENGTH 32
|
||||
|
||||
char lbl_81691748[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
char __sdPathData[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
"/dev/sdio/slot0\0/dev/sdio/slot1\0/dev/sdio/slotw";
|
||||
|
||||
typedef void (*SDCallbackFunc)(s32, void*);
|
||||
@@ -55,17 +55,17 @@ enum {
|
||||
|
||||
static IOSFd sduOpenFD(u32 slot);
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
|
||||
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
|
||||
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
|
||||
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
@@ -73,7 +73,7 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
switch (data->unk_0x0C) {
|
||||
case 4: {
|
||||
if (result != 0) {
|
||||
OSReport(lbl_81691748, result);
|
||||
OSReport(__sdPathData, result);
|
||||
data->dev->SDDevRca = 0;
|
||||
} else {
|
||||
if (data->dev != NULL) {
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (param_3 != NULL) {
|
||||
if (outValue != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
*outValue = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
*status = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (param_9 != 0) {
|
||||
if (dma != 0) {
|
||||
readCount = 2;
|
||||
writeCount = 1;
|
||||
} else {
|
||||
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
ISD_Error ret;
|
||||
u32* sdCmd;
|
||||
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
sdCmd[6] = buffer;
|
||||
sdCmd[4] = blockCount;
|
||||
sdCmd[5] = sectorSize;
|
||||
sdCmd[7] = param_9;
|
||||
sdCmd[7] = dma;
|
||||
|
||||
if (resp != NULL) {
|
||||
if (cb != NULL) {
|
||||
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
|
||||
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
|
||||
}
|
||||
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
|
||||
|
||||
DCInvalidateRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
|
||||
|
||||
DCFlushRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -570,7 +570,7 @@ ISD_Error ISD_UnmountCard(SDDev* dev) {
|
||||
|
||||
ISD_Error ISD_InitCard() {
|
||||
static u8* lo;
|
||||
char* paths = lbl_81691748;
|
||||
char* paths = __sdPathData;
|
||||
ISD_Error ret = SD_ERROR_SUCCESS;
|
||||
BOOL enabled;
|
||||
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x30(r1)
|
||||
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
|
||||
stw r5, 0x18(r28)
|
||||
stw r0, 0x1c(r28)
|
||||
stw r3, 0x20(r28)
|
||||
beq ISD_GetCardSize_no_param2
|
||||
beq ISD_GetCardSize_no_outSize
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_param2:
|
||||
ISD_GetCardSize_no_outSize:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_param3
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_param3:
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
cmpwi r31, 0
|
||||
beq ISD_GetCardSize_success_return
|
||||
li r0, 0x200
|
||||
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
|
||||
blr
|
||||
}
|
||||
#else
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
}
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
}
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -34,13 +34,13 @@ static void uhf_ker_sem_inline_1() {
|
||||
}
|
||||
}
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags) {
|
||||
int i, k;
|
||||
|
||||
if (param_1 != 0 && param_1 != 1) {
|
||||
if (initCount != 0 && initCount != 1) {
|
||||
return -5;
|
||||
}
|
||||
if (param_2 != 0) {
|
||||
if (flags != 0) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
OSInitSemaphore(&st_uhf_ker_sem[i], 1);
|
||||
sem = &st_uhf_ker_sem[i];
|
||||
|
||||
for (k = (int)(1 - param_1); k > 0; k--) {
|
||||
for (k = (int)(1 - initCount); k > 0; k--) {
|
||||
OSWaitSemaphore((OSSemaphore*)sem);
|
||||
}
|
||||
|
||||
st_uhs_ker_sem_mng.entries[i].sem = sem;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = param_1;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = param_2;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = initCount;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = flags;
|
||||
st_uhs_ker_sem_mng.unk_0x90++;
|
||||
|
||||
uhf_ker_sem_inline_1();
|
||||
|
||||
@@ -96,13 +96,13 @@ USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback d
|
||||
return USB_KBD_ERR_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32 param_1, u8 param_2, USBKBDCmdLED* cmd) {
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
|
||||
cmd->unk_0x04 = param_2;
|
||||
cmd->unk_0x00 = param_1;
|
||||
cmd->unk_0x04 = ledBits;
|
||||
cmd->unk_0x00 = device;
|
||||
|
||||
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
|
||||
}
|
||||
@@ -114,12 +114,12 @@ static IOSError usbKbdSetLEDHandler(IOSError error, void* arg) {
|
||||
return IPC_RESULT_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 param_1, u8 param_2, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
cmd->base.unk_0x00 = param_1;
|
||||
cmd->base.unk_0x04 = param_2;
|
||||
cmd->base.unk_0x00 = device;
|
||||
cmd->base.unk_0x04 = ledBits;
|
||||
cmd->cb = cb;
|
||||
cmd->cbArg = cbArg;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include <private/os/OSTime.h>
|
||||
#include <private/bus.h>
|
||||
|
||||
static int __i2c_ident_flag = 1;
|
||||
static volatile int __i2c_ident_flag = 1;
|
||||
static u32 __i2c_ident_first;
|
||||
|
||||
#define I2C_OUT 0xCD8000C0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user