Compare commits
1 Commits
cleanup/sd
...
agent/asm2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb7fe46fec |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.71% | 61.93% | 92.05% |
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
|
||||
units 917/1027 complete, functions 12213/12563 matched.
|
||||
units 917/1027 complete, functions 12211/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 -->
|
||||
|
||||
@@ -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 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) 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);
|
||||
|
||||
@@ -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 dma, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, 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 dma, u32* resp,
|
||||
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,
|
||||
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 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);
|
||||
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);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (outValue != NULL) {
|
||||
if (param_3 != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*outValue = *__sdCmdBuffer;
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*status = *__sdCmdBuffer;
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (dma != 0) {
|
||||
if (param_9 != 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 dma, u32* resp,
|
||||
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,
|
||||
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] = dma;
|
||||
sdCmd[7] = param_9;
|
||||
|
||||
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 callback, u32 callbackArg) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
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*)callback, (void*)callbackArg);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (callback == 0) {
|
||||
if (param_5 == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
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*)callback, (void*)callbackArg);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (callback == 0) {
|
||||
if (param_5 == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
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_outSize
|
||||
beq ISD_GetCardSize_no_param2
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_outSize:
|
||||
ISD_GetCardSize_no_param2:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
beq ISD_GetCardSize_no_param3
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
ISD_GetCardSize_no_param3:
|
||||
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* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSecto
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
}
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
}
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -9,7 +9,7 @@ extern void CDBLock();
|
||||
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
|
||||
extern void CDBUnlock();
|
||||
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
|
||||
extern void CDBRecordCreateAtOnce();
|
||||
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
|
||||
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
|
||||
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
|
||||
extern void CDBRecordOpenReadOnly();
|
||||
@@ -95,7 +95,7 @@ extern CDBErr CDBDatabaseCreateRecordAtOnce();
|
||||
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
|
||||
extern CDBErr CDBDatabaseFindByKey();
|
||||
typedef struct {
|
||||
CDBDate beginDate;
|
||||
@@ -396,101 +396,30 @@ asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
addi r11, r1, 0x40
|
||||
bl _savegpr_24
|
||||
lwz r11, 0x8(r3)
|
||||
mr r24, r3
|
||||
lwz r30, 0x48(r1)
|
||||
mr r25, r4
|
||||
cmpwi r11, 0x0
|
||||
lwz r31, 0x4c(r1)
|
||||
mr r26, r5
|
||||
mr r27, r6
|
||||
mr r28, r9
|
||||
mr r29, r10
|
||||
bne L_81487974
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148796C
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_8148796C:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_81487974:
|
||||
addis r3, r11, 0x1
|
||||
lwz r3, -0x3ff0(r3)
|
||||
rlwinm. r0, r3, 0, 30, 30
|
||||
bne L_814879EC
|
||||
cmpwi r3, 0x0
|
||||
bne L_814879BC
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879B4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879B4:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_814879BC:
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879E4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B57C@ha
|
||||
addi r3, r3, lbl_8166B57C@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879E4:
|
||||
li r3, 0x1a
|
||||
b L_81487A3C
|
||||
L_814879EC:
|
||||
lis r4, 0x8000
|
||||
mr r3, r7
|
||||
lwz r0, 0xf8(r4)
|
||||
mr r4, r8
|
||||
li r5, 0x0
|
||||
srwi r6, r0, 2
|
||||
bl __div2i
|
||||
stw r4, 0x10(r1)
|
||||
addi r3, r1, 0x10
|
||||
bl CDBClampCDBDate
|
||||
stw r31, 0x8(r1)
|
||||
mr r3, r25
|
||||
mr r4, r24
|
||||
mr r5, r26
|
||||
lwz r7, 0x10(r1)
|
||||
mr r6, r27
|
||||
mr r8, r28
|
||||
mr r9, r29
|
||||
mr r10, r30
|
||||
bl CDBRecordCreateAtOnce
|
||||
L_81487A3C:
|
||||
addi r11, r1, 0x40
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
|
||||
CDBDatabaseState* instance;
|
||||
int flags;
|
||||
CDBDate date;
|
||||
|
||||
instance = database->instance;
|
||||
if (instance == NULL) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
|
||||
flags = instance->flags;
|
||||
if ((flags & 2) == 0) {
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBReportError(lbl_8166B57C);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
date = time / (OS_BUS_CLOCK / 4);
|
||||
CDBClampCDBDate(&date);
|
||||
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
|
||||
|
||||
@@ -571,7 +571,7 @@ namespace ipl {
|
||||
mWorkerCommand = 11;
|
||||
break;
|
||||
case 12:
|
||||
mpSDWorker->check_sd_app_titles_async(
|
||||
mpSDWorker->iplNandSD_81348EA8(
|
||||
command.arguments.pointers[0], command.arguments.pointers[1],
|
||||
command.arguments.pointers[2]);
|
||||
mWorkerCommand = 12;
|
||||
|
||||
Reference in New Issue
Block a user