Compare commits
8 Commits
cleanup/bt
...
cleanup/ip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
657911d5a9 | ||
|
|
11c75ddb62 | ||
|
|
15b9f71a6e | ||
|
|
0a7baea67a | ||
|
|
6f6f63cb81 | ||
|
|
4a046a17ab | ||
|
|
842c850c10 | ||
|
|
6b95233f01 |
@@ -16,12 +16,12 @@ public:
|
||||
AXVPB* getAXVPB() { return mpVPB; }
|
||||
u32 getState() { return mState; }
|
||||
u32 getUnk_0x08() { return unk_0x08; }
|
||||
int getUnk_0x0C() { return unk_0x0C; }
|
||||
int getUpdateFlag() { return mUpdateFlag; }
|
||||
|
||||
void setAXVPB(AXVPB* newVal) { mpVPB = newVal; }
|
||||
void setState(u32 newVal) { mState = newVal; }
|
||||
void setUnk_0x08(u32 newVal) { unk_0x08 = newVal; }
|
||||
void setUnk_0x0C(u32 newVal) { unk_0x0C = newVal; }
|
||||
void setUpdateFlag(u32 newVal) { mUpdateFlag = newVal; }
|
||||
|
||||
AXPBMIX* getMix() { return &mMix; }
|
||||
|
||||
@@ -31,7 +31,7 @@ private:
|
||||
AXVPB* mpVPB; // 0x00
|
||||
u32 mState; // 0x04
|
||||
u32 unk_0x08; // 0x08
|
||||
int unk_0x0C; // 0x0c
|
||||
int mUpdateFlag; // 0x0c
|
||||
AXPBMIX mMix; // 0x10
|
||||
};
|
||||
|
||||
|
||||
@@ -212,11 +212,11 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x09;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 unk_0x0B;
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 targetCount; // 0x0C
|
||||
ziU32 unk_0x10;
|
||||
ziU16 unk_0x14;
|
||||
ziU8 cangjieEnabled; // 0x16
|
||||
ziU8 unk_0x17;
|
||||
ziU8 zhPudMinPrefix;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 separator; // 0x1A
|
||||
@@ -270,8 +270,8 @@ struct __zi8_work_data_s {
|
||||
ziU8 formatCount;
|
||||
ziU8 unk_0x1419;
|
||||
ziU16 capacity; // 0x141A
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 forceAltGraph; // 0x141C (lang FI + group 0xC -> graphTableId 0x10)
|
||||
ziU8 advanceGroup; // 0x141D (nonzero: skip first dawg group)
|
||||
ziU8 graphTableId; // 0x141E
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x1420[4];
|
||||
|
||||
@@ -33,7 +33,7 @@ ziS32 Zi8Punctuation(ziGetParam* param ZI_NEED_WORK) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (count >= (ziS32)ZI_WORK->unk_0x0C) {
|
||||
if (count >= (ziS32)ZI_WORK->targetCount) {
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ ziU8* NextDawgGroup(ziU8* group, ziU8 language, ziPtr __zi8_work_data)
|
||||
Zi8LogError(0x962,ZI_WORK);
|
||||
return 0;
|
||||
}
|
||||
if (ZI_WORK->unk_0x141D == 0) {
|
||||
if (ZI_WORK->advanceGroup == 0) {
|
||||
return group;
|
||||
}
|
||||
}
|
||||
@@ -231,7 +231,7 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->matchOffset = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->forceAltGraph != 0) {
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
} else {
|
||||
ZI_WORK->graphTableId = 0;
|
||||
|
||||
@@ -8,11 +8,15 @@ extern ziU8 Zi8SyllablesROMdata(ziWChar* keys, ziU8 count, ziU8 lang, ziWChar* o
|
||||
ziU16 a, ziU8 b, ziU8* cntOut, ziU8 c ZI_NEED_WORK);
|
||||
|
||||
typedef struct _ziSwParam {
|
||||
ziU8 flag;
|
||||
ziU8 unk_0x01[0xB];
|
||||
ziS32 count;
|
||||
ziU16 cap;
|
||||
ziU8 unk_0x12[2];
|
||||
ziU8 countOnly; // 0x00 - same layout as ZiCandidateOptions
|
||||
ziU8 maxWordLength; // 0x01
|
||||
ziU8 lookupMode; // 0x02
|
||||
ziU8 suffixOnly; // 0x03
|
||||
ziU8 controls[8]; // 0x04
|
||||
ziS32 maxCount; // 0x0C - signed view of ZiCandidateOptions.maxCount
|
||||
ziU16 capacity; // 0x10
|
||||
ziU8 minWordLength; // 0x12
|
||||
ziU8 flags; // 0x13
|
||||
} ziSwParam;
|
||||
|
||||
ziU32 Zi8GetSyllablesCandidates(ziGetParam* param, ziSwParam* sw ZI_NEED_WORK) {
|
||||
@@ -54,16 +58,16 @@ ziU32 Zi8GetSyllablesCandidates(ziGetParam* param, ziSwParam* sw ZI_NEED_WORK) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (sw->flag != 0 || (param->getOptions & 0xFD) != 0x81) {
|
||||
if (sw->countOnly != 0 || (param->getOptions & 0xFD) != 0x81) {
|
||||
out = buf;
|
||||
rem = 0x40;
|
||||
} else {
|
||||
out = (ziWChar*)param->candidates;
|
||||
rem = sw->cap - 1;
|
||||
rem = sw->capacity - 1;
|
||||
}
|
||||
if ((param->getOptions & 0xFD) == 0x80) {
|
||||
u28 = (ziU8*)param->candidates;
|
||||
rem = sw->cap - 1;
|
||||
rem = sw->capacity - 1;
|
||||
}
|
||||
|
||||
if (rem <= param->elementCount) {
|
||||
@@ -94,8 +98,8 @@ ziU32 Zi8GetSyllablesCandidates(ziGetParam* param, ziSwParam* sw ZI_NEED_WORK) {
|
||||
firstCand--;
|
||||
goto L5dc;
|
||||
}
|
||||
if (sw->flag != 0) {
|
||||
if (++count >= sw->count) goto end;
|
||||
if (sw->countOnly != 0) {
|
||||
if (++count >= sw->maxCount) goto end;
|
||||
goto L5dc;
|
||||
}
|
||||
|
||||
@@ -147,8 +151,8 @@ L464b:
|
||||
firstCand--;
|
||||
goto L560;
|
||||
}
|
||||
if (sw->flag != 0) {
|
||||
if (++count >= sw->count) goto end;
|
||||
if (sw->countOnly != 0) {
|
||||
if (++count >= sw->maxCount) goto end;
|
||||
goto L560;
|
||||
}
|
||||
if (u28 != 0) {
|
||||
@@ -202,7 +206,7 @@ dec:
|
||||
goto L560;
|
||||
|
||||
end:
|
||||
if (sw->flag != 0) {
|
||||
if (sw->countOnly != 0) {
|
||||
param->letters = 0;
|
||||
} else {
|
||||
param->letters = (ziU8)count;
|
||||
|
||||
@@ -20,7 +20,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x09 = 1;
|
||||
ZI_WORK->maxWordLength = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
*(ziU16*)&ZI_WORK->targetCount = 0xFFFF;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->koAltTables = 0;
|
||||
@@ -47,7 +47,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->capacity = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
ZI_WORK->zhPudMinPrefix = 5;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
|
||||
ZI_WORK->pyFuzzy.bits.msb = 1;
|
||||
ZI_WORK->unk_0x1B2C.bits.msb = 1;
|
||||
|
||||
@@ -102,7 +102,7 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
wordSize = *word++;
|
||||
entrySize = wordSize;
|
||||
if (language == 1) {
|
||||
if (ZI_WORK->unk_0x17 > *word) goto next;
|
||||
if (ZI_WORK->zhPudMinPrefix > *word) goto next;
|
||||
wordSize--;
|
||||
entrySize--;
|
||||
word++;
|
||||
|
||||
@@ -33,7 +33,7 @@ typedef struct
|
||||
u8 bulkEndpoint1;
|
||||
u8 bulkEndpoint2;
|
||||
u8 intrEndpoint1;
|
||||
char at_0x13; // intrEndpoint2?
|
||||
u8 intrEndpoint2;
|
||||
int vid;
|
||||
int pid;
|
||||
UINT8 cmd_buffer_pool;
|
||||
@@ -46,9 +46,9 @@ typedef struct
|
||||
char pad4_[1];
|
||||
UINT8 reading_intr_data;
|
||||
BUFFER_Q bulk_buffer_q;
|
||||
UINT8 at_0x38;
|
||||
UINT8 bulk_outstanding;
|
||||
BUFFER_Q intr_buffer_q;
|
||||
UINT8 at_0x48;
|
||||
UINT8 intr_outstanding;
|
||||
char pad8_[3];
|
||||
} tUUSB_CB;
|
||||
|
||||
@@ -158,7 +158,7 @@ static void uusb_CloseDeviceCB(long result, void *p_data)
|
||||
usb.bulkEndpoint1 = 0;
|
||||
usb.bulkEndpoint2 = 0;
|
||||
usb.intrEndpoint1 = 0;
|
||||
usb.at_0x13 = 0;
|
||||
usb.intrEndpoint2 = 0;
|
||||
|
||||
usb.fd = 0;
|
||||
|
||||
@@ -363,12 +363,12 @@ static void uusb_WriteCtrlDataCB(long result, void *p_data)
|
||||
|
||||
GKI_disable();
|
||||
|
||||
--usb.at_0x48;
|
||||
--usb.intr_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
|
||||
if (usb.at_0x48 >= 5)
|
||||
if (usb.intr_outstanding >= 5)
|
||||
return;
|
||||
|
||||
if (usb.intr_buffer_q.count == 0)
|
||||
@@ -389,7 +389,7 @@ static void uusb_WriteCtrlDataCB(long result, void *p_data)
|
||||
{
|
||||
GKI_disable();
|
||||
|
||||
++usb.at_0x48;
|
||||
++usb.intr_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
@@ -411,12 +411,12 @@ static void uusb_WriteBulkDataCB(long result, void *p_data)
|
||||
|
||||
GKI_disable();
|
||||
|
||||
--usb.at_0x38;
|
||||
--usb.bulk_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
|
||||
if (usb.at_0x38 >= 5)
|
||||
if (usb.bulk_outstanding >= 5)
|
||||
return;
|
||||
|
||||
if (usb.bulk_buffer_q.count == 0)
|
||||
@@ -436,7 +436,7 @@ static void uusb_WriteBulkDataCB(long result, void *p_data)
|
||||
{
|
||||
GKI_disable();
|
||||
|
||||
++usb.at_0x38;
|
||||
++usb.bulk_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
@@ -504,7 +504,7 @@ void UUSB_Register(tUUSB *uusb)
|
||||
usb.bulkEndpoint1 = 0;
|
||||
usb.bulkEndpoint2 = 0;
|
||||
usb.intrEndpoint1 = 0;
|
||||
usb.at_0x13 = 0;
|
||||
usb.intrEndpoint2 = 0;
|
||||
|
||||
if (uusb_get_devId(usb.vid, usb.pid) < 0)
|
||||
return;
|
||||
@@ -512,13 +512,13 @@ void UUSB_Register(tUUSB *uusb)
|
||||
usb.bulkEndpoint1 = 2;
|
||||
usb.bulkEndpoint2 = 130;
|
||||
usb.intrEndpoint1 = 129;
|
||||
usb.at_0x13 = 0;
|
||||
usb.intrEndpoint2 = 0;
|
||||
|
||||
GKI_init_q(&usb.bulk_buffer_q);
|
||||
usb.at_0x38 = 0;
|
||||
usb.bulk_outstanding = 0;
|
||||
|
||||
GKI_init_q(&usb.intr_buffer_q);
|
||||
usb.at_0x48 = 0;
|
||||
usb.intr_outstanding = 0;
|
||||
|
||||
usb.cmd_buffer_pool = GKI_create_pool(660, 45, 1, NULL);
|
||||
usb.acl_buffer_pool = GKI_create_pool(1800, 30, 1, NULL);
|
||||
@@ -607,7 +607,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
|
||||
memcpy(p_buffer, p_data, len);
|
||||
|
||||
if (usb.at_0x48 < 5 && usb.intr_buffer_q.count == 0)
|
||||
if (usb.intr_outstanding < 5 && usb.intr_buffer_q.count == 0)
|
||||
{
|
||||
ret = IUSB_WriteCtrlMsgAsync(usb.fd, 0x20, 0, 0, 0, len, p_buffer,
|
||||
uusb_WriteCtrlDataCB, p_buf);
|
||||
@@ -634,7 +634,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
{
|
||||
GKI_disable();
|
||||
|
||||
++usb.at_0x48;
|
||||
++usb.intr_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
@@ -658,7 +658,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
if (len > 190)
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
||||
|
||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||
if (usb.bulk_outstanding < 5 && usb.bulk_buffer_q.count == 0)
|
||||
{
|
||||
ret = IUSB_WriteBlkMsgAsync(usb.fd, usb.bulkEndpoint1, len,
|
||||
p_buffer, uusb_WriteBulkDataCB, p_buf);
|
||||
@@ -685,7 +685,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
{
|
||||
GKI_disable();
|
||||
|
||||
++usb.at_0x38;
|
||||
++usb.bulk_outstanding;
|
||||
|
||||
GKI_enable();
|
||||
}
|
||||
|
||||
@@ -9,10 +9,10 @@ static struct {
|
||||
OSThread* thread; // 0x00
|
||||
u8 stack[0x33C]; // 0x04
|
||||
} entries[MAX_PUH_TSK]; // 0x00
|
||||
u32 unk_0x680;
|
||||
u32 unk_0x684;
|
||||
u32 unk_0x688;
|
||||
u32 unk_0x68C;
|
||||
u32 pad_0x680;
|
||||
u32 pad_0x684;
|
||||
u32 pad_0x688;
|
||||
u32 pad_0x68C;
|
||||
} st_uhs_ker_tsk_mng;
|
||||
|
||||
s32 uhf_ker_set_priority(int tsk, int priority) {
|
||||
|
||||
@@ -53,7 +53,7 @@ void AudioFrameCallback() {
|
||||
|
||||
for (i = 0; i < AX_VOICE_MAX; i++) {
|
||||
VoiceInfo* currVoice = &Voices[i];
|
||||
if (currVoice->getAXVPB() == NULL && currVoice->getUnk_0x0C() != 2) {
|
||||
if (currVoice->getAXVPB() == NULL && currVoice->getUpdateFlag() != 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ void AudioFrameCallback() {
|
||||
currVoice->setState(0);
|
||||
currVoice->setUnk_0x08(0);
|
||||
}
|
||||
currVoice->setUnk_0x0C(0);
|
||||
currVoice->setUpdateFlag(0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -370,7 +370,7 @@ clean_up:
|
||||
}
|
||||
Voices[axVoiceBuf[i]->index].setAXVPB(axVoiceBuf[i]);
|
||||
Voices[axVoiceBuf[i]->index].setState(1);
|
||||
Voices[axVoiceBuf[i]->index].setUnk_0x0C(1);
|
||||
Voices[axVoiceBuf[i]->index].setUpdateFlag(1);
|
||||
}
|
||||
if (handle != NULL) {
|
||||
for (u32 i = 0; i < chanCount; i++) {
|
||||
@@ -397,7 +397,7 @@ bool AxAdpcmHandle::setVolume(f32 newVolume) {
|
||||
mix.vR = newVolume * mpVoices[i]->getMix()->vR;
|
||||
|
||||
AXSetVoiceMix(mpVoices[i]->getAXVPB(), &mix);
|
||||
mpVoices[i]->setUnk_0x0C(1);
|
||||
mpVoices[i]->setUpdateFlag(1);
|
||||
a = true;
|
||||
}
|
||||
return a;
|
||||
@@ -416,7 +416,7 @@ void AxAdpcmSimplePlayer::stop(AxAdpcmHandle* handle) {
|
||||
}
|
||||
|
||||
handle->getVoice(i)->setState(7);
|
||||
handle->getVoice(i)->setUnk_0x0C(1);
|
||||
handle->getVoice(i)->setUpdateFlag(1);
|
||||
if (handle->getVoice(i)->getUnk_0x08() != 0) {
|
||||
handle->getVoice(i)->setUnk_0x08(0);
|
||||
}
|
||||
@@ -440,8 +440,8 @@ void AxAdpcmSimplePlayer::setVolume(AxAdpcmHandle* handle, f32 volume) {
|
||||
|
||||
void AxAdpcmSimplePlayer::calc() {
|
||||
for (int i = 0; i < AX_VOICE_MAX; i++) {
|
||||
if (Voices[i].getUnk_0x0C() == 1) {
|
||||
Voices[i].setUnk_0x0C(2);
|
||||
if (Voices[i].getUpdateFlag() == 1) {
|
||||
Voices[i].setUpdateFlag(2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace ipl {
|
||||
namespace cs {
|
||||
namespace savedata {
|
||||
struct data {
|
||||
char unk_0x00[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x00
|
||||
char sMountPath[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x00
|
||||
char sPath[MAX_PATH_LENGTH + sizeof(wchar_t)]; // 0x42
|
||||
u8 flag; // 0x84
|
||||
u8* pData; // 0x88
|
||||
@@ -67,7 +67,7 @@ namespace ipl {
|
||||
data* data = static_cast<savedata::data*>(*hdr->value.ptr_v);
|
||||
|
||||
if (data->pData == NULL && data->size == 0) {
|
||||
if (data->unk_0x00[0] == 0) {
|
||||
if (data->sMountPath[0] == 0) {
|
||||
error = load_nand_(vm, data, heap, offset, size, 0x20);
|
||||
} else {
|
||||
error = load_vf_(vm, data, heap, offset, size, 0x20);
|
||||
@@ -127,7 +127,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (data->unk_0x00[0] == '\0') {
|
||||
if (data->sMountPath[0] == '\0') {
|
||||
error = load_nand_(vm, data, csHeap, 0, size, -0x20);
|
||||
} else {
|
||||
error = load_vf_(vm, data, csHeap, 0, size, -0x20);
|
||||
@@ -591,7 +591,7 @@ namespace ipl {
|
||||
memset(data, 0, sizeof(savedata::data));
|
||||
memset(temp, 0, sizeof(temp));
|
||||
if (arg1 != NULL) {
|
||||
util::utf16_to_ascii(data->unk_0x00, temp, MAX_PATH_LENGTH, arg0);
|
||||
util::utf16_to_ascii(data->sMountPath, temp, MAX_PATH_LENGTH, arg0);
|
||||
memset(temp, 0, sizeof(temp));
|
||||
util::utf16_to_ascii(data->sPath, temp, MAX_PATH_LENGTH, arg1);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user