Compare commits
4 Commits
agent/bitt
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91a76aec0c | ||
|
|
426555a34f | ||
|
|
9acff80781 | ||
|
|
3c9af06f34 |
@@ -149,6 +149,7 @@ namespace textinput {
|
||||
void Update();
|
||||
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace textinput {
|
||||
#else
|
||||
~HWKeyboard();
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
void setLanguage(Destination destination, Language language);
|
||||
#endif
|
||||
|
||||
@@ -49,6 +49,7 @@ namespace textinput {
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
|
||||
Manager *mgr() { return mpManager; }
|
||||
const Manager *mgr() const { return mpManager; }
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
|
||||
@@ -19,21 +19,21 @@ typedef struct CXUncompContextRL {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
u16 length; // 0x0C
|
||||
u8 unk_0x0e; // 0x0E
|
||||
u8 unk_0x0f; // 0x0F
|
||||
u16 length; // 0x0C
|
||||
u8 flags; // 0x0E
|
||||
u8 hdrLen; // 0x0F
|
||||
} CXUncompContextRL;
|
||||
|
||||
typedef struct CXUncompContextLZ {
|
||||
u8* outData; // 0x00
|
||||
int outDataLen; // 0x04
|
||||
u32 size; // 0x08
|
||||
int length; // 0x0C
|
||||
u8 unk_0x10; // 0x10
|
||||
u8 unk_0x11; // 0x11
|
||||
u8 unk_0x12; // 0x12
|
||||
u8 unk_0x13; // 0x13
|
||||
u8 unk_0x14; // 0x14
|
||||
int length; // 0x0C
|
||||
u8 lengthBytesLeft; // 0x10
|
||||
u8 flags; // 0x11
|
||||
u8 flagsLeft; // 0x12
|
||||
u8 hdrLen; // 0x13
|
||||
u8 lzType; // 0x14
|
||||
u8 padding[3];
|
||||
} CXUncompContextLZ;
|
||||
|
||||
@@ -52,10 +52,10 @@ typedef struct CXUncompContextHuffman {
|
||||
u32 size; // 0x08
|
||||
CXHuffmanDecodeTableEntry* decodeTable; // 0x0C
|
||||
u32 bits; // 0x10
|
||||
u32 unk_0x14; // 0x14
|
||||
u32 wordBuffer; // 0x14
|
||||
s16 decodeTableSize; // 0x18
|
||||
u8 bitsLeft; // 0x1A
|
||||
u8 unk_0x1b; // 0x1B
|
||||
u8 wordBits; // 0x1B
|
||||
u8 depth; // 0x1C
|
||||
u8 hdrLen; // 0x1D
|
||||
u8 padding[2]; // 0x1E
|
||||
|
||||
@@ -7,21 +7,21 @@ static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*,
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->flags = 0;
|
||||
context->length = 0;
|
||||
context->unk_0x0f = 8;
|
||||
context->hdrLen = 8;
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->outData = data;
|
||||
context->outDataLen = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
context->flags = 0;
|
||||
context->flagsLeft = 0;
|
||||
context->length = 0;
|
||||
context->unk_0x10 = 3;
|
||||
context->unk_0x13 = 8;
|
||||
context->unk_0x14 = 0;
|
||||
context->lengthBytesLeft = 3;
|
||||
context->hdrLen = 8;
|
||||
context->lzType = 0;
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
@@ -31,8 +31,8 @@ void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data) {
|
||||
context->depth = 0;
|
||||
context->decodeTableSize = -1;
|
||||
context->decodeTable = context->decodeTableData;
|
||||
context->unk_0x14 = 0;
|
||||
context->unk_0x1b = 0;
|
||||
context->wordBuffer = 0;
|
||||
context->wordBits = 0;
|
||||
context->bits = 0;
|
||||
context->bitsLeft = 0;
|
||||
context->hdrLen = 8;
|
||||
@@ -42,9 +42,9 @@ void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data) {
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size) {
|
||||
const u8* pSrc = src;
|
||||
|
||||
if (context->unk_0x0f) {
|
||||
if (context->hdrLen) {
|
||||
int a;
|
||||
if (context->unk_0x0f == 8) {
|
||||
if (context->hdrLen == 8) {
|
||||
if ((*pSrc & CX_COMPRESSION_TYPE_MASK) != CX_COMPRESSION_TYPE_RUN_LENGTH) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
@@ -54,18 +54,18 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->unk_0x0f, &context->outDataLen, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->hdrLen, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->unk_0x0f ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->hdrLen ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->outDataLen > 0) {
|
||||
if (!(context->unk_0x0e & 0x80)) {
|
||||
if (!(context->flags & 0x80)) {
|
||||
while (context->length) {
|
||||
*context->outData++ = *pSrc++;
|
||||
|
||||
@@ -93,11 +93,11 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
}
|
||||
}
|
||||
|
||||
context->unk_0x0e = *pSrc++;
|
||||
context->flags = *pSrc++;
|
||||
size--;
|
||||
context->length = context->unk_0x0e & 0x7f;
|
||||
context->length = context->flags & 0x7f;
|
||||
|
||||
if (context->unk_0x0e & 0x80) {
|
||||
if (context->flags & 0x80) {
|
||||
context->length += 3;
|
||||
} else {
|
||||
context->length += 1;
|
||||
@@ -160,39 +160,39 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size) {
|
||||
const u8* pSrc = src;
|
||||
|
||||
if (context->unk_0x13) {
|
||||
if (context->hdrLen) {
|
||||
int a;
|
||||
if (context->unk_0x13 == 8) {
|
||||
if (context->hdrLen == 8) {
|
||||
if ((*pSrc & CX_COMPRESSION_TYPE_MASK) != CX_COMPRESSION_TYPE_LZ) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
|
||||
context->unk_0x14 = *pSrc & 0x0F;
|
||||
context->lzType = *pSrc & 0x0F;
|
||||
|
||||
if (context->unk_0x14 != 0 && context->unk_0x14 != 1) {
|
||||
if (context->lzType != 0 && context->lzType != 1) {
|
||||
return CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
a = CXiReadHeader(&context->unk_0x13, &context->outDataLen, pSrc, size, context->size);
|
||||
a = CXiReadHeader(&context->hdrLen, &context->outDataLen, pSrc, size, context->size);
|
||||
|
||||
pSrc += a;
|
||||
size -= a;
|
||||
|
||||
if (!size) {
|
||||
return !context->unk_0x13 ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
return !context->hdrLen ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
while (context->outDataLen > 0) {
|
||||
while (context->unk_0x12) {
|
||||
while (context->flagsLeft) {
|
||||
s32 a;
|
||||
|
||||
if (!size) {
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
if (!(context->unk_0x11 & 0x80)) {
|
||||
if (!(context->flags & 0x80)) {
|
||||
*context->outData++ = *pSrc++;
|
||||
context->outDataLen--;
|
||||
|
||||
@@ -201,15 +201,15 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
goto there;
|
||||
}
|
||||
|
||||
while (context->unk_0x10) {
|
||||
context->unk_0x10--;
|
||||
while (context->lengthBytesLeft) {
|
||||
context->lengthBytesLeft--;
|
||||
|
||||
if (!context->unk_0x14) {
|
||||
if (!context->lzType) {
|
||||
context->length = *pSrc++;
|
||||
context->length += 0x30;
|
||||
context->unk_0x10 = 0;
|
||||
context->lengthBytesLeft = 0;
|
||||
} else {
|
||||
switch (context->unk_0x10) {
|
||||
switch (context->lengthBytesLeft) {
|
||||
case 2: {
|
||||
context->length = *pSrc++;
|
||||
|
||||
@@ -219,10 +219,10 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
} else if (context->length >> 4 == 0) {
|
||||
context->length = (context->length & 0x0F) << 8;
|
||||
context->length += 0x110;
|
||||
context->unk_0x10 = 1;
|
||||
context->lengthBytesLeft = 1;
|
||||
} else {
|
||||
context->length += 0x10;
|
||||
context->unk_0x10 = 0;
|
||||
context->lengthBytesLeft = 0;
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -249,7 +249,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
|
||||
a = (a | *pSrc++) + 1;
|
||||
size--;
|
||||
context->unk_0x10 = 3;
|
||||
context->lengthBytesLeft = 3;
|
||||
|
||||
if (context->length > context->outDataLen) {
|
||||
if (!context->size) {
|
||||
@@ -271,16 +271,16 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
|
||||
goto out;
|
||||
}
|
||||
|
||||
context->unk_0x11 <<= 1;
|
||||
context->unk_0x12--;
|
||||
context->flags <<= 1;
|
||||
context->flagsLeft--;
|
||||
}
|
||||
|
||||
if (!size) {
|
||||
return context->outDataLen;
|
||||
}
|
||||
|
||||
context->unk_0x11 = *pSrc++;
|
||||
context->unk_0x12 = 8;
|
||||
context->flags = *pSrc++;
|
||||
context->flagsLeft = 8;
|
||||
size--;
|
||||
}
|
||||
|
||||
@@ -369,16 +369,16 @@ CXStreamingResult CXReadUncompHuffman(CXUncompContextHuffman* context, const voi
|
||||
continue;
|
||||
}
|
||||
|
||||
context->unk_0x14 >>= context->depth;
|
||||
context->unk_0x14 |= context->decodeTable->raw << (32 - context->depth);
|
||||
context->wordBuffer >>= context->depth;
|
||||
context->wordBuffer |= context->decodeTable->raw << (32 - context->depth);
|
||||
context->decodeTable = context->decodeTableData + 1;
|
||||
context->unk_0x1b += context->depth;
|
||||
context->wordBits += context->depth;
|
||||
|
||||
if (context->unk_0x1b == 32) {
|
||||
*context->outData = CXiConvertEndian32_(context->unk_0x14);
|
||||
if (context->wordBits == 32) {
|
||||
*context->outData = CXiConvertEndian32_(context->wordBuffer);
|
||||
context->outData++;
|
||||
context->outDataLen -= 4;
|
||||
context->unk_0x1b = 0;
|
||||
context->wordBits = 0;
|
||||
|
||||
if (context->outDataLen <= 0) {
|
||||
goto out;
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
#include "keyboard/tiHKBManager.h"
|
||||
#include "keyboard/tiLayoutGather.h"
|
||||
|
||||
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
|
||||
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
|
||||
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
|
||||
extern "C" bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
||||
extern "C" void __dt__Q49textinput8keyboard5hwkey10HWKeyboardFv();
|
||||
extern "C" void create__Q29textinput4BaseFP12MEMAllocator();
|
||||
@@ -16,86 +13,7 @@ extern "C" void setCommandReceiver__Q29textinput13CommandSenderFPQ29textinput15C
|
||||
extern "C" void sendCommand__Q29textinput13CommandSenderFUlPv();
|
||||
extern "C" void updateFromReceiver__Q29textinput13CommandSenderFUlPv();
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
typedef void (*KeyboardDataFunction)();
|
||||
extern "C" KeyboardDataFunction const scHwKeyboardConvertWCCodeJumpTable[0x3f] = {
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000158),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001d8),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001c0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000170),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x0000017c),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000134),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001a0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000140),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000188),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000194),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000148),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000150),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000164),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001b8),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
|
||||
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001ac)
|
||||
};
|
||||
extern "C" KeyboardDataFunction const __vt__Q49textinput8keyboard5hwkey10HWKeyboard[9] = {
|
||||
NULL,
|
||||
NULL,
|
||||
__dt__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
create__Q29textinput4BaseFP12MEMAllocator,
|
||||
init__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
setCommandReceiver__Q29textinput13CommandSenderFPQ29textinput15CommandReceiver,
|
||||
sendCommand__Q29textinput13CommandSenderFUlPv,
|
||||
updateFromReceiver__Q29textinput13CommandSenderFUlPv,
|
||||
reinterpret_cast<KeyboardDataFunction>(updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager)
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
namespace textinput {
|
||||
|
||||
@@ -637,183 +555,60 @@ const u8 controlKeys[] = {
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
extern "C" asm void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 8(r1)
|
||||
mr r30, r3
|
||||
lwz r3, 0x10(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x98(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq convertWCCode_HWKeyboard_L1
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x58(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq convertWCCode_HWKeyboard_L1
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x34(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne convertWCCode_HWKeyboard_L2
|
||||
cmpwi r31, 0x5b
|
||||
beq convertWCCode_HWKeyboard_L3
|
||||
bge convertWCCode_HWKeyboard_L4
|
||||
cmpwi r31, 0x2d
|
||||
beq convertWCCode_HWKeyboard_L5
|
||||
bge convertWCCode_HWKeyboard_L6
|
||||
cmpwi r31, 0x2c
|
||||
bge convertWCCode_HWKeyboard_L7
|
||||
b convertWCCode_HWKeyboard_L1
|
||||
convertWCCode_HWKeyboard_L6:
|
||||
cmpwi r31, 0x2f
|
||||
bge convertWCCode_HWKeyboard_L1
|
||||
b convertWCCode_HWKeyboard_L8
|
||||
convertWCCode_HWKeyboard_L4:
|
||||
cmpwi r31, 0x5d
|
||||
beq convertWCCode_HWKeyboard_L9
|
||||
b convertWCCode_HWKeyboard_L1
|
||||
convertWCCode_HWKeyboard_L7:
|
||||
li r3, 0x3001
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L8:
|
||||
li r3, 0x3002
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L5:
|
||||
li r3, 0x30fc
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L3:
|
||||
li r3, 0x300c
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L9:
|
||||
li r3, 0x300d
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L2:
|
||||
lwz r3, 0x10(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x34(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 8
|
||||
bne convertWCCode_HWKeyboard_L1
|
||||
addi r0, r31, -0x21
|
||||
cmplwi r0, 0x3e
|
||||
bgt convertWCCode_HWKeyboard_L1
|
||||
lis r3, scHwKeyboardConvertWCCodeJumpTable@ha
|
||||
slwi r0, r0, 2
|
||||
addi r3, r3, scHwKeyboardConvertWCCodeJumpTable@l
|
||||
lwzx r3, r3, r0
|
||||
mtctr r3
|
||||
bctr
|
||||
convertWCCode_HWKeyboard_L11:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf4
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L12:
|
||||
li r3, 0x3002
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L13:
|
||||
li r3, 0x300a
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L14:
|
||||
li r3, 0x300b
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L15:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xff
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L16:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe1
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L17:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf8
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L18:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf7
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L19:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe6
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L20:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xe5
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L21:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xf3
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L22:
|
||||
lis r3, 1
|
||||
addi r3, r3, -0xc1
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L23:
|
||||
li r3, 0x3001
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L24:
|
||||
lbz r3, 0x15(r30)
|
||||
neg r0, r3
|
||||
or r0, r0, r3
|
||||
srwi r3, r0, 0x1f
|
||||
addi r3, r3, 0x2018
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L25:
|
||||
lbz r3, 0x16(r30)
|
||||
neg r0, r3
|
||||
or r0, r0, r3
|
||||
srwi r3, r0, 0x1f
|
||||
addi r3, r3, 0x201c
|
||||
b convertWCCode_HWKeyboard_L10
|
||||
convertWCCode_HWKeyboard_L1:
|
||||
mr r3, r31
|
||||
convertWCCode_HWKeyboard_L10:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
wchar_t HWKeyboard::convertWCCode(wchar_t code) const {
|
||||
if (mgr()->getToolBar()->isQwerty() && mgr()->getPCKeyboard()->getTranslateMode()) {
|
||||
if (mgr()->getLanguage() == JP) {
|
||||
switch (code) {
|
||||
case 0x2C: { return 0x3001; }
|
||||
case 0x2E: { return 0x3002; }
|
||||
case 0x2D: { return 0x30FC; }
|
||||
case 0x5B: { return 0x300C; }
|
||||
case 0x5D: { return 0x300D; }
|
||||
}
|
||||
} else if (mgr()->getLanguage() == CN) {
|
||||
switch (code) {
|
||||
case 0x2C: { return 0xFF0C; }
|
||||
case 0x2E: { return 0x3002; }
|
||||
case 0x3C: { return 0x300A; }
|
||||
case 0x3E: { return 0x300B; }
|
||||
case 0x21: { return 0xFF01; }
|
||||
case 0x3F: { return 0xFF1F; }
|
||||
case 0x28: { return 0xFF08; }
|
||||
case 0x29: { return 0xFF09; }
|
||||
case 0x3A: { return 0xFF1A; }
|
||||
case 0x3B: { return 0xFF1B; }
|
||||
case 0x2D: { return 0xFF0D; }
|
||||
case 0x5F: { return 0xFF3F; }
|
||||
case 0x5C: { return 0x3001; }
|
||||
case 0x27: { if (field_0x15) { return 0x2019; } return 0x2018; }
|
||||
case 0x22: { if (field_0x16) { return 0x201D; } return 0x201C; }
|
||||
}
|
||||
}
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" KeyboardDataFunction const __vt__Q49textinput8keyboard5hwkey10HWKeyboard[9] = {
|
||||
NULL,
|
||||
NULL,
|
||||
__dt__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
create__Q29textinput4BaseFP12MEMAllocator,
|
||||
init__Q49textinput8keyboard5hwkey10HWKeyboardFv,
|
||||
setCommandReceiver__Q29textinput13CommandSenderFPQ29textinput15CommandReceiver,
|
||||
sendCommand__Q29textinput13CommandSenderFUlPv,
|
||||
updateFromReceiver__Q29textinput13CommandSenderFUlPv,
|
||||
reinterpret_cast<KeyboardDataFunction>(updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager)
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
void HWKeyboard::setLanguage(Destination destination, Language language) {
|
||||
if (destination == DST_EU) {
|
||||
input::HKBManager::getInstance().SetCountry(scCountryMap_EU[language]);
|
||||
} else {
|
||||
input::HKBManager::getInstance().SetCountry(scCountryMap_NonEU[language]);
|
||||
}
|
||||
}
|
||||
} // namespace hwkey
|
||||
|
||||
|
||||
@@ -1015,51 +1015,28 @@ namespace ipl {
|
||||
return -1;
|
||||
}
|
||||
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
nofralloc
|
||||
xor r3, r6, r8
|
||||
xor r0, r5, r7
|
||||
or. r0, r3, r0
|
||||
bne isEqualChannel_L1
|
||||
li r3, -2
|
||||
blr
|
||||
isEqualChannel_L1:
|
||||
li r3, -0x100
|
||||
li r0, -1
|
||||
and r9, r6, r3
|
||||
and r3, r8, r3
|
||||
and r4, r5, r0
|
||||
and r0, r7, r0
|
||||
xor r3, r9, r3
|
||||
xor r0, r4, r0
|
||||
or. r0, r3, r0
|
||||
bne isEqualChannel_L4
|
||||
clrlwi r3, r6, 0x18
|
||||
xori r0, r3, 0x41
|
||||
cmpwi r0, 0
|
||||
beq isEqualChannel_L2
|
||||
clrlwi r0, r8, 0x18
|
||||
xori r0, r0, 0x41
|
||||
cmpwi r0, 0
|
||||
bne isEqualChannel_L2
|
||||
li r3, 0
|
||||
blr
|
||||
isEqualChannel_L2:
|
||||
xori r0, r3, 0x41
|
||||
cmpwi r0, 0
|
||||
bne isEqualChannel_L3
|
||||
clrlwi r0, r8, 0x18
|
||||
xori r0, r0, 0x41
|
||||
cmpwi r0, 0
|
||||
beq isEqualChannel_L3
|
||||
li r3, 1
|
||||
blr
|
||||
isEqualChannel_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
isEqualChannel_L4:
|
||||
li r3, -1
|
||||
blr
|
||||
int Manager::isEqualChannel(ESTitleId titleId0, ESTitleId titleId1) {
|
||||
if (titleId0 == titleId1) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
if (TITLE_NO_REGION(titleId0) == TITLE_NO_REGION(titleId1)) {
|
||||
if (TITLE_REGION(titleId0) != TITLE_REGION_ALL) {
|
||||
if (TITLE_REGION(titleId1) == TITLE_REGION_ALL) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (TITLE_REGION(titleId0) == TITLE_REGION_ALL) {
|
||||
if (TITLE_REGION(titleId1) != TITLE_REGION_ALL) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int Manager::isDefaultChannel(ESTitleId32 titleType, ESTitleId32 titleCode) {
|
||||
|
||||
Reference in New Issue
Block a user