misc cleanup

This commit is contained in:
Henrik Rydgard 2012-11-18 23:14:50 +01:00
parent f326c36220
commit fa05713456
2 changed files with 20 additions and 26 deletions

View file

@ -82,30 +82,28 @@ enum SceUtilitySavedataType
#define SCE_UTILITY_STATUS_SHUTDOWN 4
/** title, savedataTitle, detail: parts of the unencrypted SFO
data, it contains what the VSH and standard load screen shows */
typedef struct PspUtilitySavedataSFOParam
// title, savedataTitle, detail: parts of the unencrypted SFO
// data, it contains what the VSH and standard load screen shows
struct PspUtilitySavedataSFOParam
{
char title[0x80];
char savedataTitle[0x80];
char detail[0x400];
unsigned char parentalLevel;
unsigned char unknown[3];
} PspUtilitySavedataSFOParam;
};
typedef struct PspUtilitySavedataFileData {
struct PspUtilitySavedataFileData {
void *buf;
SceSize bufSize;
SceSize size; /* ??? - why are there two sizes? */
SceSize bufSize; // Size of the buffer pointed to by buf
SceSize size; // Actual file size to write / was read
int unknown;
} PspUtilitySavedataFileData;
};
/** Structure to hold the parameters for the ::sceUtilitySavedataInitStart function.
*/
typedef struct SceUtilitySavedataParam
// Structure to hold the parameters for the sceUtilitySavedataInitStart function.
struct SceUtilitySavedataParam
{
/** Size of the structure */
SceSize size;
SceSize size; // Size of the structure
int language;
@ -115,12 +113,10 @@ typedef struct SceUtilitySavedataParam
int result;
int unknown2[4];
/** mode: 0 to load, 1 to save */
int mode;
int mode; // 0 to load, 1 to save
int bind;
/** unknown13 use 0x10 */
int overwriteMode;
int overwriteMode; // use 0x10 ?
/** gameName: name used from the game for saves, equal for all saves */
char gameName[16];
@ -133,7 +129,7 @@ typedef struct SceUtilitySavedataParam
void *dataBuf;
/** size of allocated space to dataBuf */
SceSize dataBufSize;
SceSize dataSize;
SceSize dataSize; // Size of the actual save data
PspUtilitySavedataSFOParam sfoParam;
@ -143,8 +139,7 @@ typedef struct SceUtilitySavedataParam
PspUtilitySavedataFileData snd0FileData;
unsigned char unknown17[4];
} SceUtilitySavedataParam;
};
static u32 utilityDialogState = SCE_UTILITY_STATUS_SHUTDOWN;
@ -154,6 +149,7 @@ static u32 utilityDialogState = SCE_UTILITY_STATUS_SHUTDOWN;
void __UtilityInit()
{
utilityDialogState = SCE_UTILITY_STATUS_SHUTDOWN;
// Creates a directory for save on the sdcard or MemStick directory
}
@ -295,7 +291,7 @@ u32 messageDialogAddr;
void sceUtilityMsgDialogInitStart()
{
u32 structAddr = PARAM(0);
DEBUG_LOG(HLE,"FAKE sceUtilityMsgDialogInitStart(%i)", structAddr);
DEBUG_LOG(HLE,"sceUtilityMsgDialogInitStart(%i)", structAddr);
messageDialogAddr = structAddr;
pspMessageDialog messageDialog;
Memory::ReadStruct(messageDialogAddr, &messageDialog);

View file

@ -234,14 +234,12 @@ struct GPUgstate
float tgenMatrix[12];
float boneMatrix[8*12];
};
// Real data in the context ends here
// The rest is cached simplified/converted data for fast access.
// Does not need to be saved when saving/restoring context.
struct GPUStateCache
{
// Real data in the context ends here
// The rest is cached simplified/converted data for fast access.
// What we have here still fits into 512 words, but just barely so we should
// in the future just recompute the below on an sceGeRestoreContext().
u32 vertexAddr;
u32 indexAddr;