Compare commits

..

1 Commits

Author SHA1 Message Date
coah
d7dbc474c0 cleanup: rename CdbBackup progress percent helper
Rename fn_8135B1C0 to getProgressPercent. DOL sha1 unchanged.
2026-10-01 16:54:50 -05:00
8 changed files with 298 additions and 140 deletions

View File

@@ -53,7 +53,7 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.69% | 61.81% | 91.28% |
| 99.37% | 87.69% | 61.81% | 91.27% |
units 916/1027 complete, functions 12211/12563 matched.

View File

@@ -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
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
AOSSThread_813FCCE4__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
@@ -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
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
lbl_8169877C__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
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
lbl_816989BC__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

View File

@@ -75,7 +75,7 @@ namespace homebutton {
private:
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];

View File

@@ -8,10 +8,10 @@ extern u32 CDBGetInitialCode();
extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBDatabaseFree();
extern void CDBRecordCreateAtOnce();
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordInitDescriptor();
extern void CDBRecordIsExistFile();
extern void CDBRecordOpenReadOnly();
extern void CDBRecordKeyArrayInit();
extern void CDBRecordKeyArraySetReverse();
@@ -157,27 +157,59 @@ CDBErr CDBDatabaseOpen(CDBDatabase* database) {
return result;
}
CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBErr result;
CDBErr status;
CDBDatabaseState* instance;
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
if (status != CDB_ERROR_OK) {
result = status;
} else {
instance->flags = 0;
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
asm CDBErr CDBDatabaseClose(CDBDatabase* database) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x10(r1)
mflr r0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 0x8(r1)
mr r30, r3
bl CDBLock
lwz r31, 0x8(r30)
cmpwi r31, 0x0
beq L_8148746C
addis r3, r31, 0x1
lwz r0, -0x3ff0(r3)
cmpwi r0, 0x0
bne L_8148749C
L_8148746C:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487494
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B528@ha
addi r3, r3, lbl_8166B528@l
crclr 4*cr1+eq
bl OSReport
L_81487494:
li r31, 0x1b
b L_814874C4
L_8148749C:
mr r3, r30
bl CDBDatabaseFree
cmpwi r3, 0x0
beq L_814874B4
mr r31, r3
b L_814874C4
L_814874B4:
addis r3, r31, 0x1
li r0, 0x0
stw r0, -0x3ff0(r3)
li r31, 0x0
L_814874C4:
bl CDBUnlock
mr r3, r31
lwz r31, 0xc(r1)
lwz r30, 0x8(r1)
lwz r0, 0x14(r1)
mtlr r0
addi r1, r1, 0x10
blr
#endif
}
CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, char* makerCodeStr, char* gameCodeStr) {
@@ -493,24 +525,72 @@ asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#endif
}
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
CDBErr result;
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
asm CDBErr CDBDatabaseFindByKey() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r5
stw r30, 0x18(r1)
mr r30, r4
stw r29, 0x14(r1)
mr r29, r3
bl CDBLock
mr r3, r31
bl CDBRecordKeyIsValid
cmpwi r3, 0x0
bne L_81487ABC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487AB4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5A8@ha
addi r3, r3, lbl_8166B5A8@l
crclr 4*cr1+eq
bl OSReport
L_81487AB4:
li r31, 0x5
b L_81487B14
L_81487ABC:
mr r3, r30
mr r4, r29
mr r5, r31
bl CDBRecordInitDescriptor
mr r3, r30
bl CDBRecordIsExistFile
cmpwi r3, 0x0
bne L_81487B10
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487B08
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5B8@ha
mr r4, r31
addi r3, r3, lbl_8166B5B8@l
crclr 4*cr1+eq
bl OSReport
L_81487B08:
li r31, 0x23
b L_81487B14
L_81487B10:
li r31, 0x0
L_81487B14:
bl CDBUnlock
mr r3, r31
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
}
CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char* key) {
@@ -2691,81 +2771,160 @@ CDBErr CDBDatabaseCleanUpEmptyDirectoriesMonth(char* year, CDBLocation location,
return CDB_ERROR_OK;
}
CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
CDBDatabase* db;
CDBFindData* find;
int flags;
CDBDatabaseState* instance;
CDBErr result;
BOOL sdAvailable;
db = database;
find = &CDBDatabaseWorkBuf->year;
if (db == NULL) {
return CDB_ERROR_1;
}
CDBLock();
instance = db->instance;
if (instance != NULL) {
flags = instance->flags;
} else {
flags = 0;
}
CDBUnlock();
if (flags == 0) {
CDBReportError(lbl_8166B5D0);
return CDB_ERROR_27;
}
if (flags == 1) {
CDBReportError(lbl_8166B618);
return CDB_ERROR_26;
}
if ((recordLocation & 1) != 0) {
CDBFSFindFirstRoot(find, 1);
while (CDBFindDataIsEnd(find) == 0) {
if (CDBFindDataIsDirectory(find) != 0) {
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 1, NULL);
if (result != CDB_ERROR_OK) {
return result;
}
}
}
CDBFSFindNext(find);
}
CDBFSFindClose(find);
}
CDBVFSync();
sdAvailable = 0;
if (CDBFSSDIsMounted() != 0) {
if (CDBFSSDIsEjected() == 0) {
sdAvailable = 1;
}
}
if (sdAvailable != 0) {
if ((recordLocation & 2) != 0) {
CDBFSFindFirstRoot(find, 2);
while (CDBFindDataIsEnd(find) == 0) {
if (CDBFindDataIsDirectory(find) != 0) {
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 2, NULL);
if (result != CDB_ERROR_OK) {
return result;
}
}
}
CDBFSFindNext(find);
}
CDBFSFindClose(find);
}
}
CDBVFSync();
return CDB_ERROR_OK;
asm CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
cmpwi r3, 0x0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r3
stw r30, 0x18(r1)
stw r29, 0x14(r1)
mr r29, r4
lwz r5, CDBDatabaseWorkBuf(r0)
addi r30, r5, 0x430c
bne L_8148A13C
li r3, 0x1
b L_8148A2FC
L_8148A13C:
bl CDBLock
lwz r3, 0x8(r31)
cmpwi r3, 0x0
beq L_8148A158
addis r3, r3, 0x1
lwz r31, -0x3ff0(r3)
b L_8148A15C
L_8148A158:
li r31, 0x0
L_8148A15C:
bl CDBUnlock
cmpwi r31, 0x0
bne L_8148A198
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148A190
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5D0@ha
addi r3, r3, lbl_8166B5D0@l
crclr 4*cr1+eq
bl OSReport
L_8148A190:
li r3, 0x1b
b L_8148A2FC
L_8148A198:
cmpwi r31, 0x1
bne L_8148A1D0
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148A1C8
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B618@ha
addi r3, r3, lbl_8166B618@l
crclr 4*cr1+eq
bl OSReport
L_8148A1C8:
li r3, 0x1a
b L_8148A2FC
L_8148A1D0:
clrlwi. r0, r29, 31
beq L_8148A24C
mr r3, r30
li r4, 0x1
bl CDBFSFindFirstRoot
b L_8148A234
L_8148A1E8:
mr r3, r30
bl CDBFindDataIsDirectory
cmpwi r3, 0x0
beq L_8148A22C
mr r3, r30
bl CDBFindDataGetName
bl CDBFSIsYearDirName
cmpwi r3, 0x0
beq L_8148A22C
mr r3, r30
bl CDBFindDataGetName
li r4, 0x1
li r5, 0x0
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
cmpwi r3, 0x0
beq L_8148A22C
b L_8148A2FC
L_8148A22C:
mr r3, r30
bl CDBFSFindNext
L_8148A234:
mr r3, r30
bl CDBFindDataIsEnd
cmpwi r3, 0x0
beq L_8148A1E8
mr r3, r30
bl CDBFSFindClose
L_8148A24C:
bl CDBVFSync
li r31, 0x0
bl CDBFSSDIsMounted
cmpwi r3, 0x0
beq L_8148A270
bl CDBFSSDIsEjected
cmpwi r3, 0x0
bne L_8148A270
li r31, 0x1
L_8148A270:
cmpwi r31, 0x0
beq L_8148A2F4
rlwinm. r0, r29, 0, 30, 30
beq L_8148A2F4
mr r3, r30
li r4, 0x2
bl CDBFSFindFirstRoot
b L_8148A2DC
L_8148A290:
mr r3, r30
bl CDBFindDataIsDirectory
cmpwi r3, 0x0
beq L_8148A2D4
mr r3, r30
bl CDBFindDataGetName
bl CDBFSIsYearDirName
cmpwi r3, 0x0
beq L_8148A2D4
mr r3, r30
bl CDBFindDataGetName
li r4, 0x2
li r5, 0x0
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
cmpwi r3, 0x0
beq L_8148A2D4
b L_8148A2FC
L_8148A2D4:
mr r3, r30
bl CDBFSFindNext
L_8148A2DC:
mr r3, r30
bl CDBFindDataIsEnd
cmpwi r3, 0x0
beq L_8148A290
mr r3, r30
bl CDBFSFindClose
L_8148A2F4:
bl CDBVFSync
li r3, 0x0
L_8148A2FC:
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
}
#pragma section data_type ".data"

View File

@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
namespace homebutton {
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
@@ -83,10 +83,10 @@ namespace homebutton {
if (chan < WPAD_MAX_CONTROLLERS) {
sBatteryFlag[chan] = false;
OSReport("Create %d\n", chan);
if (!sAlarmCreated[chan]) {
if (!lbl_816989BC[chan]) {
OSCreateAlarm(&sAlarm[chan]);
OSCreateAlarm(&sAlarmSoundOff[chan]);
sAlarmCreated[chan] = true;
lbl_816989BC[chan] = true;
}
sThis[chan] = this;
}

View File

@@ -5,6 +5,8 @@
#include "keyboard/tiHKBManager.h"
#include "keyboard/tiLayoutGather.h"
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
@@ -526,9 +528,6 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,

View File

@@ -78,8 +78,8 @@ namespace ipl {
int finish(NCDAossConfig* config, int* result);
void printInfo();
static void* aossAlloc(u32 id, s32 size);
static void aossFree(u32 id, void* ptr, s32 align);
static void* AOSSThread_813FCC8C(u32 id, s32 size);
static void AOSSThread_813FCCE4(u32 id, void* ptr, s32 align);
private:
s32 mState; // 0x32C
@@ -122,8 +122,8 @@ namespace ipl {
return 0;
}
config.alloc = aossAlloc;
config.free = aossFree;
config.alloc = AOSSThread_813FCC8C;
config.free = AOSSThread_813FCCE4;
BOOL level = OSDisableInterrupts();
@@ -144,7 +144,7 @@ namespace ipl {
return 1;
}
void* AOSSThread::aossAlloc(u32 id, s32 size) {
void* AOSSThread::AOSSThread_813FCC8C(u32 id, s32 size) {
void* buffer;
BOOL level = OSDisableInterrupts();
buffer = MEMAllocFromAllocator(&m_allocator, size);
@@ -152,7 +152,7 @@ namespace ipl {
return buffer;
}
void AOSSThread::aossFree(u32 id, void* ptr, s32 align) {
void AOSSThread::AOSSThread_813FCCE4(u32 id, void* ptr, s32 align) {
BOOL level = OSDisableInterrupts();
MEMFreeToAllocator(&m_allocator, ptr);
OSRestoreInterrupts(level);
@@ -162,7 +162,7 @@ namespace ipl {
mState = 0xF;
AOSS_SetCallback(USBAPThread::callback);
if (AOSSi_InitLocal(aossAlloc, aossFree) == -1) {
if (AOSSi_InitLocal(AOSSThread_813FCC8C, AOSSThread_813FCCE4) == -1) {
return this;
}

View File

@@ -21,7 +21,7 @@
namespace ipl {
TVRCManager* TVRCManager::m_handle;
int sTvrcStartDelay = 0;
int lbl_8169877C = 0;
TVRCManager::TVRCManager(EGG::Heap* heap) : mbInitialized(FALSE), mpDBFile(NULL), mbResetting(FALSE), mbPrepTVRC(FALSE), mState(STATE_0) {
/* TV model for testing at EAD? */
@@ -280,17 +280,17 @@ namespace ipl {
case STATE_3: {
if (!snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd::getSystem()->pauseOnBGM();
sTvrcStartDelay = 5;
lbl_8169877C = 5;
mState = STATE_4;
}
break;
}
case STATE_4: {
if (mbResetting) {
sTvrcStartDelay = 0;
lbl_8169877C = 0;
}
if (--sTvrcStartDelay <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
if (--lbl_8169877C <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
snd_shutup(TRUE);
if (IS_ENABLED && !TVRCIsActive()) {
TVRCSendStartAsync(trans_cmd(mCurrentCommand));