Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/base/build.mak
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ ifndef PSP_EBOOT_ICON1
PSP_EBOOT_ICON1 = NULL
endif

ifndef PSP_EBOOT_UNKPNG
PSP_EBOOT_UNKPNG = NULL
ifdef PSP_EBOOT_UNKPNG
PSP_EBOOT_PIC0 = $(PSP_EBOOT_UNKPNG)
else ifndef PSP_EBOOT_PIC0
PSP_EBOOT_PIC0 = NULL
endif

ifndef PSP_EBOOT_PIC1
Expand Down Expand Up @@ -143,15 +145,15 @@ kxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
$(STRIP) $(TARGET).elf -o $(TARGET)/$(PSP_EBOOT)
mkdir -p "$(TARGET)%"
$(PACK_PBP) "$(TARGET)%/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)

SCEkxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
mkdir -p "__SCE__$(TARGET)"
$(STRIP) $(TARGET).elf -o __SCE__$(TARGET)/$(PSP_EBOOT)
mkdir -p "%__SCE__$(TARGET)"
$(PACK_PBP) "%__SCE__$(TARGET)/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)

ifeq ($(NO_FIXUP_IMPORTS), 1)
Expand All @@ -176,13 +178,13 @@ ifeq ($(ENCRYPT), 1)
- $(ENC) $(TARGET).prx $(TARGET).prx
endif
$(PACK_PBP) $(PSP_EBOOT) $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_SND0) $(TARGET).prx $(PSP_EBOOT_PSAR)
else
$(PSP_EBOOT): $(TARGET).elf $(PSP_EBOOT_SFO)
$(STRIP) $(TARGET).elf -o $(TARGET)_strip.elf
$(PACK_PBP) $(PSP_EBOOT) $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) \
$(PSP_EBOOT_SND0) $(TARGET)_strip.elf $(PSP_EBOOT_PSAR)
-rm -f $(TARGET)_strip.elf
endif
Expand Down
8 changes: 8 additions & 0 deletions src/kernel/pspidstorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ int sceIdStorageIsReadOnly(void);
/** sceIdStorageFlush() - Finalizes a write */
int sceIdStorageFlush(void);

int sceIdStorageCreateLeaf(unsigned int leafid);

int sceIdStorageCreateAtomicLeaves(u16 *leaves, int n);

int sceIdStorageFormat();

int sceIdStorageUnformat();

/**@}*/

#ifdef __cplusplus
Expand Down
2 changes: 2 additions & 0 deletions src/kernel/pspsyscon.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ int sceSysconGetPolestarVersion(int* version);
*/
int sceSysconGetTimeStamp(s8 *timeStamp);

int sceSysconReceiveSetParam(int n, u8 *buf);

/**@}*/

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions src/kernel/pspsysreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ int sceSysregMeBusClockDisable(void);
*/
int sceSysregGetTachyonVersion(void);

int sceSysregKirkBusClockEnable(void);

int sceSysregAtaBusClockEnable(void);

/**@}*/

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion src/kernel/sceIdStorage_driver.S
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
IMPORT_FUNC "sceIdStorage_driver",0x2C97AB36,sceIdStorageDeleteLeaf
#endif
#ifdef F_sceIdStorage_driver_0015
IMPORT_FUNC "sceIdStorage_driver",0x99ACCB71,sceIdStorage_driver_99ACCB71
IMPORT_FUNC "sceIdStorage_driver",0x99ACCB71,sceIdStorageCreateAtomicLeaves
#endif
#ifdef F_sceIdStorage_driver_0016
IMPORT_FUNC "sceIdStorage_driver",0x37833CB8,sceIdStorage_driver_37833CB8
Expand Down
2 changes: 1 addition & 1 deletion src/nand/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CPPFLAGS = -I$(top_srcdir)/src/base -I$(top_srcdir)/src/kernel
CFLAGS = @PSPSDK_CFLAGS@
CCASFLAGS = $(CFLAGS)

NAND_DRIVER_OBJS = sceNand_driver_0000.o sceNand_driver_0001.o sceNand_driver_0002.o sceNand_driver_0003.o sceNand_driver_0004.o sceNand_driver_0005.o sceNand_driver_0006.o sceNand_driver_0007.o sceNand_driver_0008.o sceNand_driver_0009.o sceNand_driver_0010.o sceNand_driver_0011.o sceNand_driver_0012.o sceNand_driver_0013.o sceNand_driver_0014.o sceNand_driver_0015.o sceNand_driver_0016.o sceNand_driver_0017.o sceNand_driver_0018.o sceNand_driver_0019.o sceNand_driver_0020.o sceNand_driver_0021.o sceNand_driver_0022.o sceNand_driver_0023.o sceNand_driver_0024.o sceNand_driver_0025.o sceNand_driver_0026.o sceNand_driver_0027.o sceNand_driver_0028.o sceNand_driver_0029.o sceNand_driver_0030.o sceNand_driver_0031.o sceNand_driver_0032.o sceNand_driver_0033.o sceNand_driver_0034.o sceNand_driver_0035.o sceNand_driver_0036.o sceNand_driver_0037.o sceNand_driver_0038.o sceNand_driver_0039.o
NAND_DRIVER_OBJS = sceNand_driver_0000.o sceNand_driver_0001.o sceNand_driver_0002.o sceNand_driver_0003.o sceNand_driver_0004.o sceNand_driver_0005.o sceNand_driver_0006.o sceNand_driver_0007.o sceNand_driver_0008.o sceNand_driver_0009.o sceNand_driver_0010.o sceNand_driver_0011.o sceNand_driver_0012.o sceNand_driver_0013.o sceNand_driver_0014.o sceNand_driver_0015.o sceNand_driver_0016.o sceNand_driver_0017.o sceNand_driver_0018.o sceNand_driver_0019.o sceNand_driver_0020.o sceNand_driver_0021.o sceNand_driver_0022.o sceNand_driver_0023.o sceNand_driver_0024.o sceNand_driver_0025.o sceNand_driver_0026.o sceNand_driver_0027.o sceNand_driver_0028.o sceNand_driver_0029.o sceNand_driver_0030.o sceNand_driver_0031.o sceNand_driver_0032.o sceNand_driver_0033.o sceNand_driver_0034.o sceNand_driver_0035.o sceNand_driver_0036.o sceNand_driver_0037.o sceNand_driver_0038.o sceNand_driver_0039.o sceNand_driver_0040.o

libpspnandincludedir = @PSPSDK_INCLUDEDIR@
libpspnandinclude_HEADERS = pspnand_driver.h
Expand Down
17 changes: 12 additions & 5 deletions src/nand/pspnand_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,22 @@ int sceNandReadId(void *buf, SceSize size);

int sceNandReadPages(u32 ppn, void *buf, void *buf2, u32 count);

int sceNandReadPagesRawAll(u32 ppn, void* buf, void* spare, u32 count);

/*
// sceNandWritePages
// sceNandReadAccess
// sceNandWriteAccess
// sceNandEraseBlock
// sceNandReadExtraOnly
// sceNandCalcEcc
// sceNandVerifyEcc
// sceNandCollectEcc
*/

int sceNandEraseBlock(u32 ppn);

int sceNandWriteAccess(u32 ppn, void *buf, void *spare, int, unsigned int);

int sceNandReadExtraOnly(u32 ppn, void *buf, int);

int sceNandGetPageSize(void);

int sceNandGetPagesPerBlock(void);
Expand All @@ -52,16 +57,18 @@ int sceNandGetTotalBlocks(void);

/*
// sceNandWriteBlock
// sceNandWriteBlockWithVerify
*/

int sceNandWriteBlockWithVerify(u32 ppn, void *buf, void *spare);

int sceNandReadBlockWithRetry(u32 ppn, void *buf, void *buf2);

/*
// sceNandVerifyBlockWithRetry
// sceNandEraseBlockWithRetry
*/

int sceNandEraseBlockWithRetry(u32 ppn);

int sceNandIsBadBlock(u32 ppn);

/*
Expand Down
3 changes: 3 additions & 0 deletions src/nand/sceNand_driver.S
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,6 @@
#ifdef F_sceNand_driver_0039
IMPORT_FUNC "sceNand_driver",0x9B2AC433,sceNandTestBlock
#endif
#ifdef F_sceNand_driver_0040
IMPORT_FUNC "sceNand_driver",0xC478C1DE,sceNandReadPagesRawAll
#endif
2 changes: 1 addition & 1 deletion src/power/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CPPFLAGS = -I$(top_srcdir)/src/base -I$(top_srcdir)/src/kernel
CFLAGS = @PSPSDK_CFLAGS@
CCASFLAGS = $(CFLAGS)

POWER_OBJS = scePower_0000.o scePower_0001.o scePower_0002.o scePower_0003.o scePower_0004.o scePower_0005.o scePower_0006.o scePower_0007.o scePower_0008.o scePower_0009.o scePower_0010.o scePower_0011.o scePower_0012.o scePower_0013.o scePower_0014.o scePower_0015.o scePower_0016.o scePower_0017.o scePower_0018.o scePower_0019.o scePower_0020.o scePower_0021.o scePower_0022.o scePower_0023.o scePower_0024.o scePower_0025.o scePower_0026.o scePower_0027.o scePower_0028.o scePower_0029.o scePower_0030.o scePower_0031.o scePower_0032.o scePower_0033.o scePower_0034.o scePower_0035.o scePower_0036.o scePower_0037.o scePower_0038.o scePower_0039.o scePower_0040.o scePower_0041.o scePower_0042.o scePower_0043.o scePower_0044.o scePower_0045.o scePower_0046.o
POWER_OBJS = scePower_0000.o scePower_0001.o scePower_0002.o scePower_0003.o scePower_0004.o scePower_0005.o scePower_0006.o scePower_0007.o scePower_0008.o scePower_0009.o scePower_0010.o scePower_0011.o scePower_0012.o scePower_0013.o scePower_0014.o scePower_0015.o scePower_0016.o scePower_0017.o scePower_0018.o scePower_0019.o scePower_0020.o scePower_0021.o scePower_0022.o scePower_0023.o scePower_0024.o scePower_0025.o scePower_0026.o scePower_0027.o scePower_0028.o scePower_0029.o scePower_0030.o scePower_0031.o scePower_0032.o scePower_0033.o scePower_0034.o scePower_0035.o scePower_0036.o scePower_0037.o scePower_0038.o scePower_0039.o scePower_0040.o scePower_0041.o scePower_0042.o scePower_0043.o scePower_0044.o scePower_0045.o scePower_0046.o scePower_0047.o

POWERDRIVER_OBJS= scePower_driver_0000.o scePower_driver_0001.o scePower_driver_0002.o scePower_driver_0003.o scePower_driver_0004.o scePower_driver_0005.o scePower_driver_0006.o scePower_driver_0007.o scePower_driver_0008.o scePower_driver_0009.o scePower_driver_0010.o scePower_driver_0011.o scePower_driver_0012.o scePower_driver_0013.o scePower_driver_0014.o scePower_driver_0015.o scePower_driver_0016.o scePower_driver_0017.o scePower_driver_0018.o scePower_driver_0019.o scePower_driver_0020.o scePower_driver_0021.o scePower_driver_0022.o scePower_driver_0023.o scePower_driver_0024.o scePower_driver_0025.o scePower_driver_0026.o scePower_driver_0027.o scePower_driver_0028.o scePower_driver_0029.o scePower_driver_0030.o scePower_driver_0031.o scePower_driver_0032.o scePower_driver_0033.o scePower_driver_0034.o scePower_driver_0035.o scePower_driver_0036.o scePower_driver_0037.o scePower_driver_0038.o scePower_driver_0039.o scePower_driver_0040.o scePower_driver_0041.o scePower_driver_0042.o scePower_driver_0043.o scePower_driver_0044.o scePower_driver_0045.o scePower_driver_0046.o scePower_driver_0047.o scePower_driver_0048.o scePower_driver_0049.o scePower_driver_0050.o scePower_driver_0051.o scePower_driver_0052.o scePower_driver_0053.o scePower_driver_0054.o scePower_driver_0055.o scePower_driver_0056.o scePower_driver_0057.o scePower_driver_0058.o scePower_driver_0059.o scePower_driver_0060.o scePower_driver_0061.o scePower_driver_0062.o scePower_driver_0063.o scePower_driver_0064.o

Expand Down
3 changes: 3 additions & 0 deletions src/power/scePower.S
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,6 @@
#ifdef F_scePower_0046
IMPORT_FUNC "scePower",0x737486F2,scePowerSetClockFrequency
#endif
#ifdef F_scePower_0047
IMPORT_FUNC "scePower",0x0442D852,scePowerRequestColdReset
#endif