diff --git a/MGZ/data/mamba_421D.lz.bin b/MGZ/data/mamba_421D.lz.bin index e4da77a9..7c4479dd 100644 Binary files a/MGZ/data/mamba_421D.lz.bin and b/MGZ/data/mamba_421D.lz.bin differ diff --git a/MGZ/data/mamba_430D.lz.bin b/MGZ/data/mamba_430D.lz.bin index 00b94b54..67fa2b39 100644 Binary files a/MGZ/data/mamba_430D.lz.bin and b/MGZ/data/mamba_430D.lz.bin differ diff --git a/MGZ/data/mamba_441D.lz.bin b/MGZ/data/mamba_441D.lz.bin index a4236d84..f5dc477d 100644 Binary files a/MGZ/data/mamba_441D.lz.bin and b/MGZ/data/mamba_441D.lz.bin differ diff --git a/MGZ/data/mamba_446D.lz.bin b/MGZ/data/mamba_446D.lz.bin index f8c4fd49..90596203 100644 Binary files a/MGZ/data/mamba_446D.lz.bin and b/MGZ/data/mamba_446D.lz.bin differ diff --git a/MGZ/data/mamba_450D.lz.bin b/MGZ/data/mamba_450D.lz.bin index 6b4bd80c..67ba8547 100644 Binary files a/MGZ/data/mamba_450D.lz.bin and b/MGZ/data/mamba_450D.lz.bin differ diff --git a/MGZ/data/mamba_453D.lz.bin b/MGZ/data/mamba_453D.lz.bin index d8d072b7..f9134a6b 100644 Binary files a/MGZ/data/mamba_453D.lz.bin and b/MGZ/data/mamba_453D.lz.bin differ diff --git a/MGZ/data/mamba_455D.lz.bin b/MGZ/data/mamba_455D.lz.bin index 50099f50..531c9740 100644 Binary files a/MGZ/data/mamba_455D.lz.bin and b/MGZ/data/mamba_455D.lz.bin differ diff --git a/MGZ/data/mamba_465D.lz.bin b/MGZ/data/mamba_465D.lz.bin index 468f1dc1..7716b77b 100644 Binary files a/MGZ/data/mamba_465D.lz.bin and b/MGZ/data/mamba_465D.lz.bin differ diff --git a/MGZ/data/mamba_470D.lz.bin b/MGZ/data/mamba_470D.lz.bin index f2e7425f..bf4dcad9 100644 Binary files a/MGZ/data/mamba_470D.lz.bin and b/MGZ/data/mamba_470D.lz.bin differ diff --git a/MGZ/data/mamba_475D.lz.bin b/MGZ/data/mamba_475D.lz.bin index 1c558a7c..95e03ccc 100644 Binary files a/MGZ/data/mamba_475D.lz.bin and b/MGZ/data/mamba_475D.lz.bin differ diff --git a/MGZ/data/mamba_476D.lz.bin b/MGZ/data/mamba_476D.lz.bin index 4271a693..6771155c 100644 Binary files a/MGZ/data/mamba_476D.lz.bin and b/MGZ/data/mamba_476D.lz.bin differ diff --git a/MGZ/data/mamba_478D.lz.bin b/MGZ/data/mamba_478D.lz.bin index 941132a9..dd921e95 100644 Binary files a/MGZ/data/mamba_478D.lz.bin and b/MGZ/data/mamba_478D.lz.bin differ diff --git a/MGZ/data/mamba_480D.lz.bin b/MGZ/data/mamba_480D.lz.bin index 8911e13d..f83c45a8 100644 Binary files a/MGZ/data/mamba_480D.lz.bin and b/MGZ/data/mamba_480D.lz.bin differ diff --git a/MGZ/data/mamba_481D.lz.bin b/MGZ/data/mamba_481D.lz.bin index 7f0d91f6..8a57941f 100644 Binary files a/MGZ/data/mamba_481D.lz.bin and b/MGZ/data/mamba_481D.lz.bin differ diff --git a/MGZ/data/mamba_482D.lz.bin b/MGZ/data/mamba_482D.lz.bin index 16d87e45..4f03c6ea 100644 Binary files a/MGZ/data/mamba_482D.lz.bin and b/MGZ/data/mamba_482D.lz.bin differ diff --git a/MGZ/data/mamba_483C.lz.bin b/MGZ/data/mamba_483C.lz.bin index 684d7731..ed4edca8 100644 Binary files a/MGZ/data/mamba_483C.lz.bin and b/MGZ/data/mamba_483C.lz.bin differ diff --git a/MGZ/data/mamba_484C.lz.bin b/MGZ/data/mamba_484C.lz.bin new file mode 100644 index 00000000..e8e82e14 Binary files /dev/null and b/MGZ/data/mamba_484C.lz.bin differ diff --git a/MGZ/data/mamba_484D.lz.bin b/MGZ/data/mamba_484D.lz.bin new file mode 100644 index 00000000..c2276e7f Binary files /dev/null and b/MGZ/data/mamba_484D.lz.bin differ diff --git a/MGZ/data/mamba_loader_484C.bin b/MGZ/data/mamba_loader_484C.bin new file mode 100644 index 00000000..c8d64605 Binary files /dev/null and b/MGZ/data/mamba_loader_484C.bin differ diff --git a/MGZ/data/mamba_loader_484D.bin b/MGZ/data/mamba_loader_484D.bin new file mode 100644 index 00000000..64ce6608 Binary files /dev/null and b/MGZ/data/mamba_loader_484D.bin differ diff --git a/MGZ/data/payload_sky_484C.bin b/MGZ/data/payload_sky_484C.bin new file mode 100644 index 00000000..55ea8a9c Binary files /dev/null and b/MGZ/data/payload_sky_484C.bin differ diff --git a/MGZ/data/payload_sky_484D.bin b/MGZ/data/payload_sky_484D.bin new file mode 100644 index 00000000..e27b2f4d Binary files /dev/null and b/MGZ/data/payload_sky_484D.bin differ diff --git a/MGZ/data/umount_484C.bin b/MGZ/data/umount_484C.bin new file mode 100644 index 00000000..6e3f2218 Binary files /dev/null and b/MGZ/data/umount_484C.bin differ diff --git a/MGZ/data/umount_484D.bin b/MGZ/data/umount_484D.bin new file mode 100644 index 00000000..1715ece5 Binary files /dev/null and b/MGZ/data/umount_484D.bin differ diff --git a/MGZ/source/common.h b/MGZ/source/common.h index ad7cf4c9..7fc97d91 100644 --- a/MGZ/source/common.h +++ b/MGZ/source/common.h @@ -619,4 +619,40 @@ #define OFFSET_1_IDPS_483C 0x80000000003E2E30ULL #define OFFSET_2_IDPS_483C 0x8000000000474AF4ULL -#endif /* __COMMON_H__ */ +#define SYSCALL_TABLE_484C 0x8000000000363BE0ULL +#define HV_START_OFFSET_484C 0x370F28 +#define OFFSET_FIX_484C 0x05658C +#define OFFSET_2_FIX_484C 0x05A6E4 +#define OFFSET_FIX_2B17_484C 0x2275F4 +#define OFFSET_FIX_LIC_484C 0x056230 +#define OFFSET_FIX_3C_484C 0x267150 +#define OPEN_HOOK_484C 0x8000000000297638ULL +#define BASE_ADDR_484C 0x80000000002D8AF0ULL +#define LV2MOUNTADDR_484C 0x8000000000479FC0ULL +#define LV2MOUNTADDR_ESIZE_484C 0x118 +#define LV2MOUNTADDR_CSIZE_484C 0x108 +#define FW_DATE_OFFSET_484C 0x80000000002FCB68ULL +#define FW_DATE_1_484C 0x323031392F30312FULL +#define FW_DATE_2_484C 0x30382031343A3238ULL +#define OFFSET_1_IDPS_484C 0x80000000003E2E30ULL +#define OFFSET_2_IDPS_484C 0x8000000000474AF4ULL + +#define SYSCALL_TABLE_484D 0x800000000038A4E8ULL +#define HV_START_OFFSET_484D 0x370F28 +#define OFFSET_FIX_484D 0x059F5C +#define OFFSET_2_FIX_484D 0x05E0B4 +#define OFFSET_FIX_2B17_484D 0x22DAD0 +#define OFFSET_FIX_LIC_484D 0x059C00 +#define OFFSET_FIX_3C_484D 0x26D86C +#define OPEN_HOOK_484D 0x80000000002B25D0ULL +#define BASE_ADDR_484D 0x80000000002FA690ULL +#define LV2MOUNTADDR_484D 0x80000000004A3678ULL +#define LV2MOUNTADDR_ESIZE_484D 0x118 +#define LV2MOUNTADDR_CSIZE_484D 0x108 +#define FW_DATE_OFFSET_484D 0x800000000031F028ULL +#define FW_DATE_1_484D 0x323031392F30312FULL +#define FW_DATE_2_484D 0x30382031343A3237ULL +#define OFFSET_1_IDPS_484D 0x8000000000409A30ULL +#define OFFSET_2_IDPS_484D 0x800000000049CAF4ULL + +#endif /* __COMMON_H__ */ \ No newline at end of file diff --git a/MGZ/source/main.c b/MGZ/source/main.c index ba26b51f..3d8e2767 100644 --- a/MGZ/source/main.c +++ b/MGZ/source/main.c @@ -246,6 +246,16 @@ #include "mamba_483C_lz_bin.h" #include "mamba_loader_483C_bin.h" +#include "payload_sky_484C_bin.h" +#include "umount_484C_bin.h" +#include "mamba_484C_lz_bin.h" +#include "mamba_loader_484C_bin.h" + +#include "payload_sky_484D_bin.h" +#include "umount_484D_bin.h" +#include "mamba_484D_lz_bin.h" +#include "mamba_loader_484D_bin.h" + #include "ps2gxemu_stage1_421_bin.h" #include "ps2gxemu_stage1_430_bin.h" #include "ps2gxemu_stage1_440_bin.h" @@ -9295,6 +9305,66 @@ int init_fw() MAMBA_LOADER_SIZE = mamba_loader_483C_bin_size; MAMBA_LOADER = (u64 *) mamba_loader_483C_bin; + } else + if(( lv2peek(FW_DATE_OFFSET_484C )==FW_DATE_1_484C) && + ( lv2peek(FW_DATE_OFFSET_484C + 8)==FW_DATE_2_484C) ) + { + firmware = 0x484C; + + OFFSET_2_FIX = OFFSET_2_FIX_484C; + LV2MOUNTADDR_ESIZE = LV2MOUNTADDR_ESIZE_484C; + LV2MOUNTADDR_CSIZE = LV2MOUNTADDR_CSIZE_484C; + OFFSET_FIX = OFFSET_FIX_484C; + HV_START_OFFSET = HV_START_OFFSET_484C; + OFFSET_FIX_2B17 = OFFSET_FIX_2B17_484C; + OFFSET_FIX_LIC = OFFSET_FIX_LIC_484C; + OFFSET_FIX_3C = OFFSET_FIX_3C_484C; + SYSCALL_TABLE = SYSCALL_TABLE_484C; + LV2MOUNTADDR = LV2MOUNTADDR_484C; + OPEN_HOOK = OPEN_HOOK_484C; + BASE_ADDR = BASE_ADDR_484C; + OFFSET_1_IDPS = OFFSET_1_IDPS_484C; + OFFSET_2_IDPS = OFFSET_2_IDPS_484C; + + PAYLOAD_SKY = (u64) payload_sky_484C_bin; + PAYLOAD_SKY_SIZE = payload_sky_484C_bin_size; + UMOUNT = (u64) umount_484C_bin; + UMOUNT_SIZE = umount_484C_bin_size; + MAMBA = (u64) mamba_484C_lz_bin; + MAMBA_SIZE = mamba_484C_lz_bin_size; + MAMBA_LOADER_SIZE = mamba_loader_484C_bin_size; + MAMBA_LOADER = (u64 *) mamba_loader_484C_bin; + + } else + if(( lv2peek(FW_DATE_OFFSET_484D )==FW_DATE_1_484D) && + ( lv2peek(FW_DATE_OFFSET_484D + 8)==FW_DATE_2_484D) ) + { + firmware = 0x484D; + + OFFSET_2_FIX = OFFSET_2_FIX_484D; + LV2MOUNTADDR_ESIZE = LV2MOUNTADDR_ESIZE_484D; + LV2MOUNTADDR_CSIZE = LV2MOUNTADDR_CSIZE_484D; + OFFSET_FIX = OFFSET_FIX_484D; + HV_START_OFFSET = HV_START_OFFSET_484D; + OFFSET_FIX_2B17 = OFFSET_FIX_2B17_484D; + OFFSET_FIX_LIC = OFFSET_FIX_LIC_484D; + OFFSET_FIX_3C = OFFSET_FIX_3C_484D; + SYSCALL_TABLE = SYSCALL_TABLE_484D; + LV2MOUNTADDR = LV2MOUNTADDR_484D; + OPEN_HOOK = OPEN_HOOK_484D; + BASE_ADDR = BASE_ADDR_484D; + OFFSET_1_IDPS = OFFSET_1_IDPS_484D; + OFFSET_2_IDPS = OFFSET_2_IDPS_484D; + + PAYLOAD_SKY = (u64) payload_sky_484D_bin; + PAYLOAD_SKY_SIZE = payload_sky_484D_bin_size; + UMOUNT = (u64) umount_484D_bin; + UMOUNT_SIZE = umount_484D_bin_size; + MAMBA = (u64) mamba_484D_lz_bin; + MAMBA_SIZE = mamba_484D_lz_bin_size; + MAMBA_LOADER_SIZE = mamba_loader_484D_bin_size; + MAMBA_LOADER = (u64 *) mamba_loader_484D_bin; + } else {return NOK;} NEW_POKE_SYSCALL_ADDR = lv2peek( lv2peek(SYSCALL_TABLE + NEW_POKE_SYSCALL*8) ) + 0ULL; diff --git a/Makefile b/Makefile index 3789c37b..4080b13f 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ PKGFILES1 := $(CURDIR)/pkgfiles PKGFILES2 := $(CURDIR)/pkgfiles2 SFOXML := sfo.xml -VERSION := 1.34 +VERSION := 1.35 ifeq ($(FILEMANAGER), 1) PKGFILES := $(PKGFILES2) diff --git a/payloads/MAMBA/Makefile b/payloads/MAMBA/Makefile index f3a8bf77..a2fc5a41 100644 --- a/payloads/MAMBA/Makefile +++ b/payloads/MAMBA/Makefile @@ -1,5 +1,6 @@ PAYLOADS = 421C 421D 430C 430D 431C 440C 441C 441D 446C 446D 450C 450D 453C 453D 455C 455D 460C \ - 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C + 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C \ + 484C 484D PS3DEV= ps3dev include $(PSL1GHT)/ppu_rules diff --git a/payloads/MAMBA/Makefile_loader b/payloads/MAMBA/Makefile_loader index d841df2a..2f39b2e2 100644 --- a/payloads/MAMBA/Makefile_loader +++ b/payloads/MAMBA/Makefile_loader @@ -1,5 +1,6 @@ PAYLOADS = 421C 421D 430C 430D 431C 440C 441C 441D 446C 446D 450C 450D 453C 453D 455C 455D 460C \ - 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C + 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C \ + 484C 484D CC := ppu-gcc CXX := ppu-g++ diff --git a/payloads/MAMBA/lv2/include/lv2/symbols.h b/payloads/MAMBA/lv2/include/lv2/symbols.h index 34f1f652..05d8534d 100644 --- a/payloads/MAMBA/lv2/include/lv2/symbols.h +++ b/payloads/MAMBA/lv2/include/lv2/symbols.h @@ -7575,5 +7575,451 @@ #define aio_copy_root_offset 0xD658 #endif +#ifdef FIRMWARE_484C + + #define FIRMWARE_VERSION 0x484 + + #ifdef PS3M_API + #define PS3MAPI_FW_VERSION 0x484 + #define PS3MAPI_FW_TYPE "CEX MAMBA" + #define PS3MAPI_IDPS_1 0x80000000003E2E30ULL + #define PS3MAPI_IDPS_2 0x8000000000474AF4ULL + #define PS3MAPI_PSID 0x8000000000474B0CULL + #endif + + /* lv2 */ + #define TOC 0x34FBB0 + #define open_shared_kernel_object_symbol 0x12410 + #define close_kernel_object_handle_symbol 0x11A30 + #define open_kernel_object_symbol 0x12600 + #define alloc_symbol 0x64824 + #define dealloc_symbol 0x64C60 + #define copy_to_user_symbol 0xF86C + #define copy_from_user_symbol 0xFA88 + #define copy_to_process_symbol 0xF924 + #define copy_from_process_symbol 0xF734 + #define page_allocate_symbol 0x60394 + #define page_free_symbol 0x5FDF8 + #define page_export_to_proc_symbol 0x60530 + #define page_unexport_from_proc_symbol 0x5FCEC + #define kernel_ea_to_lpar_addr_symbol 0x7014C + #define map_process_memory_symbol 0x7726C + #define memcpy_symbol 0x7E92C + #define memset_symbol 0x4D66C + #define memcmp_symbol 0x4C97C + #define printf_symbol 0x2706AC + #define printfnull_symbol 0x275120 + #define sprintf_symbol 0x4EA94 + #define snprintf_symbol 0x4EA00 + #define strcpy_symbol 0x4D818 + #define strncpy_symbol 0x4D8E0 + #define strlen_symbol 0x4D840 + #define strcat_symbol 0x4D748 + #define strcmp_symbol 0x4D7C4 + #define strncmp_symbol 0x4D86C + #define strchr_symbol 0x4D780 + #define spin_lock_irqsave_ex_symbol 0x26D798 + #define spin_unlock_irqrestore_ex_symbol 0x26D76C + #define load_process_symbol 0x5004 + #define ppu_thread_create_symbol 0x13EC8 + #define ppu_thread_exit_symbol 0x13F80 + #define ppu_thread_join_symbol 0x13FD4 + #define ppu_thread_delay_symbol 0x287A4 + #define create_user_thread2_symbol 0x25080 + #define start_thread_symbol 0x23D4C + #define run_thread_symbol 0x2357C + #define register_thread_symbol 0x26794C + #define allocate_user_stack_symbol 0x268134 + #define mutex_create_symbol 0x1363C + #define mutex_destroy_symbol 0x135D4 + #define mutex_lock_symbol 0x135CC + #define mutex_unlock_symbol 0x135C4 + #define event_port_create_symbol 0x13078 + #define event_port_destroy_symbol 0x134E0 + #define event_port_connect_symbol 0x13558 + #define event_port_disconnect_symbol 0x13484 + #define event_port_send_symbol 0x13070 + #define event_queue_create_symbol 0x13380 + #define event_queue_destroy_symbol 0x13308 + #define event_queue_receive_symbol 0x1314C + #define cellFsOpen_symbol 0x297900 + #define cellFsClose_symbol 0x297768 + #define cellFsRead_symbol 0x2978A4 + #define cellFsWrite_symbol 0x297810 + #define cellFsLseek_symbol 0x296E98 + #define cellFsStat_symbol 0x29711C + #define cellFsUnlink_internal_symbol 0x19C64C + #define cellFsUtilMount_symbol 0x296C78 + #define cellFsUtilUmount_symbol 0x296C4C + #define pathdup_from_user_symbol 0x29C8E4 + #define open_path_symbol 0x297638 + #define open_fs_object_symbol 0x18A970 + #define close_fs_object_symbol 0x1898AC + #define storage_get_device_info_symbol 0x279B00 + #define storage_open_symbol 0x279510 + #define storage_close_symbol 0x279300 + #define storage_read_symbol 0x278870 + #define storage_send_device_command_symbol 0x2783FC + #define storage_map_io_memory_symbol 0x2799BC + #define storage_unmap_io_memory_symbol 0x279888 + #define storage_internal_get_device_object_symbol 0x277EB4 + #define decrypt_func_symbol 0x34970 + #define lv1_call_99_wrapper_symbol 0x4EEA8 + #define modules_verification_symbol 0x58AB8 + #define prx_load_module_symbol 0x88C04 + #define prx_start_module_symbol 0x878D0 + #define prx_stop_module_symbol 0x88CA8 + #define prx_unload_module_symbol 0x87604 + #define prx_get_module_info_symbol 0x8708C + #define prx_get_module_list_symbol 0x8710C + #define extend_kstack_symbol 0x700A4 + #define get_pseudo_random_number_symbol 0x228180 + #define syscall_table_symbol 0x363BE0 + #define syscall_call_offset 0x275C04 + #define read_bdvd0_symbol 0x1A461C + #define read_bdvd1_symbol 0x1A6248 + #define read_bdvd2_symbol 0x1B3400 + #define device_event_port_send_call 0x28206C + #define process_map_caller_call 0x4D24 + #define fsloop_open_call 0x297A98 + #define fsloop_close_call 0x297AE8 + #define fsloop_read_call 0x297B28 + #define io_rtoc_entry_1 0x25B8 + #define io_sub_rtoc_entry_1 -0x7EA0 + #define decrypt_rtoc_entry_2 -0x66A0 + #define storage_rtoc_entry_1 0x1DD8 + #define device_event_rtoc_entry_1 0x2048 + #define process_rtoc_entry_1 -0x7800 + #define patch_func2 0x59D84 + #define patch_func2_offset 0x2C + #define user_thread_prio_patch 0x203FC + #define user_thread_prio_patch2 0x20408 + #define shutdown_patch_offset 0xAAB8 + #define shutdown_copy_params_call 0xAACC + + /* hash */ + #define EXPLORE_PLUGIN_HASH 0xACF4AF2B000EC481 + #define EXPLORE_CATEGORY_GAME_HASH 0x9CB378E600056AE5 + #define GAME_EXT_PLUGIN_HASH 0xE274AF7B0001E594 + #define LIBFS_EXTERNAL_HASH 0x5BC7BCE800006477 + #define PSP_EMULATOR_HASH 0x7BE641F500023794 + #define PEMUCORELIB_HASH 0xF349A563000C0D66 + #define EMULATOR_API_HASH 0xA9F5B37A0001BB45 + #define EMULATOR_DRM_HASH 0xA324DC4A00005399 + #define EMULATOR_DRM_DATA_HASH 0x75C390860001B75F + #define LIBSYSUTIL_SAVEDATA_PSP_HASH 0x57BBC3B800003212 + + /* lv1 */ + #define vsh_pos_in_ram 0x910000 + + /* vsh */ + #define ps2tonet_patch 0xC4E34 + #define ps2tonet_size_patch 0xC4E28 + #define vmode_patch_offset 0x4431DC + #define psp_drm_patch1 0x242FC0 + #define psp_drm_patch2 0x243A60 + #define psp_drm_patch3 0x24369C + #define psp_drm_patch4 0x243EA8 + #define psp_drm_patchA 0x2430DC + #define psp_drm_patchB 0x24397C + #define psp_drm_patchC 0x242B14 + #define psp_drm_patchD 0x2430C4 + #define psp_drm_patchE 0x2430C8 + #define psp_drm_patchF 0x243A94 + #define psp_extra_drm_patch 0x245AF0 + + /* explore_plugin */ + #define ps2_nonbw_offset 0xDD9B4 + + /* explore_category_game */ + #define ps2_nonbw_offset2 0x68324 + + /* game_ext_plugin */ + #define ps2_nonbw_offset3 0x17000 + + /* psp_emulator */ + #define psp_set_psp_mode_offset 0x1C18 + + /* emulator_api */ + #define psp_read 0x102D8 + #define psp_read_header 0x1125C + #define psp_drm_patch5 0x11080 + #define psp_drm_patch6 0x110B0 + #define psp_drm_patch7 0x110C8 + #define psp_drm_patch8 0x110CC + #define psp_drm_patch9 0x1120C + #define psp_drm_patch11 0x11210 + #define psp_drm_patch12 0x11220 + #define psp_product_id_patch1 0x11320 + #define psp_product_id_patch3 0x115F8 + + /* pemucorelib */ + #define psp_eboot_dec_patch 0x5E6BC + #define psp_prx_patch 0x577D8 + #define psp_savedata_bind_patch1 0x7A4BC + #define psp_savedata_bind_patch2 0x7A514 + #define psp_savedata_bind_patch3 0x7A030 + #define psp_extra_savedata_patch 0x87540 + #define psp_prometheus_patch 0x12EA28 + #define prx_patch_call_lr 0x5892C + + /* emulator_drm */ + #define psp_drm_tag_overwrite 0x4C68 + #define psp_drm_key_overwrite (0x27600 - 0xBE80) + + /* libsysutil_savedata_psp */ + #define psp_savedata_patch1 0x46CC + #define psp_savedata_patch2 0x46A4 + #define psp_savedata_patch3 0x4504 + #define psp_savedata_patch4 0x453C + #define psp_savedata_patch5 0x4550 + #define psp_savedata_patch6 0x46B8 + + /* libfs */ + #define aio_copy_root_offset 0xD658 + + /* rebug */ + #define EXPLORE_PLUGIN_REBUG_HASH 0xACF4AF2B000ECC91 + #define EXPLORE_CATEGORY_GAME_REBUG_HASH 0x9CB3396E00056CE9 + #define GAME_EXT_PLUGIN_REBUG_HASH 0xE274AF7B0001E5D3 + #define dex_ps2_nonbw_offset 0xDDDC4 + #define dex_ps2_nonbw_offset2 0x68264 + #define dex_ps2_nonbw_offset3 0x172F0 + #define dex_ps2tonet_patch 0xCA380 + #define dex_ps2tonet_size_patch 0xCA374 + #define dex_vmode_patch_offset 0x44ADD0 + #define dex_psp_drm_patch1 0x24A7E8 + #define dex_psp_drm_patch2 0x24B288 + #define dex_psp_drm_patch3 0x24AEC4 + #define dex_psp_drm_patch4 0x24B6D0 + #define dex_psp_drm_patchA 0x24A904 + #define dex_psp_drm_patchB 0x24B1A4 + #define dex_psp_drm_patchC 0x24A33C + #define dex_psp_drm_patchD 0x24A8EC + #define dex_psp_drm_patchE 0x24A8F0 + #define dex_psp_drm_patchF 0x24B2BC + #define dex_psp_extra_drm_patch 0x24D318 +#endif + +#ifdef FIRMWARE_484D + + #define FIRMWARE_VERSION 0x484 + + #ifdef PS3M_API + #define PS3MAPI_FW_VERSION 0x484 + #define PS3MAPI_FW_TYPE "DEX MAMBA" + #define PS3MAPI_IDPS_1 0x8000000000409A30ULL + #define PS3MAPI_IDPS_2 0x800000000049CAF4ULL + #define PS3MAPI_PSID 0x800000000049CB0CULL + #endif + + /* lv2 */ + #define TOC 0x3759C0 + #define open_shared_kernel_object_symbol 0x12A58 + #define close_kernel_object_handle_symbol 0x12078 + #define open_kernel_object_symbol 0x12C48 + #define alloc_symbol 0x681F4 + #define dealloc_symbol 0x68630 + #define copy_to_user_symbol 0xFEB4 + #define copy_from_user_symbol 0x100D0 + #define copy_to_process_symbol 0xFF6C + #define copy_from_process_symbol 0xFD7C + #define page_allocate_symbol 0x63D64 + #define page_free_symbol 0x637C8 + #define page_export_to_proc_symbol 0x63F00 + #define page_unexport_from_proc_symbol 0x636BC + #define kernel_ea_to_lpar_addr_symbol 0x73C9C + #define map_process_memory_symbol 0x7B348 + #define memcpy_symbol 0x82A08 + #define memset_symbol 0x51014 + #define memcmp_symbol 0x50324 + #define printf_symbol 0x278978 + #define printfnull_symbol 0x27D400 + #define sprintf_symbol 0x5243C + #define snprintf_symbol 0x523A8 + #define strcpy_symbol 0x511C0 + #define strncpy_symbol 0x51288 + #define strlen_symbol 0x511E8 + #define strcat_symbol 0x510F0 + #define strcmp_symbol 0x5116C + #define strncmp_symbol 0x51214 + #define strchr_symbol 0x51128 + #define spin_lock_irqsave_ex_symbol 0x275670 + #define spin_unlock_irqrestore_ex_symbol 0x275644 + #define load_process_symbol 0x5004 + #define ppu_thread_create_symbol 0x145FC + #define ppu_thread_exit_symbol 0x146B4 + #define ppu_thread_join_symbol 0x14708 + #define ppu_thread_delay_symbol 0x2A6E8 + #define create_user_thread2_symbol 0x26D30 + #define start_thread_symbol 0x25868 + #define run_thread_symbol 0x2502C + #define register_thread_symbol 0x26E270 + #define allocate_user_stack_symbol 0x26EA58 + #define mutex_create_symbol 0x13C8C + #define mutex_destroy_symbol 0x13C24 + #define mutex_lock_symbol 0x13C1C + #define mutex_unlock_symbol 0x13C14 + #define event_port_create_symbol 0x136C8 + #define event_port_destroy_symbol 0x13B30 + #define event_port_connect_symbol 0x13BA8 + #define event_port_disconnect_symbol 0x13AD4 + #define event_port_send_symbol 0x136C0 + #define event_queue_create_symbol 0x139D0 + #define event_queue_destroy_symbol 0x13958 + #define event_queue_receive_symbol 0x1379C + #define cellFsOpen_symbol 0x2B2898 + #define cellFsClose_symbol 0x2B2700 + #define cellFsRead_symbol 0x2B283C + #define cellFsWrite_symbol 0x2B27A8 + #define cellFsLseek_symbol 0x2B1FFC + #define cellFsStat_symbol 0x2B20B4 + #define cellFsUnlink_internal_symbol 0x1A29D8 + #define cellFsUtilMount_symbol 0x2B1D70 + #define cellFsUtilUmount_symbol 0x2B1D44 + #define pathdup_from_user_symbol 0x2B7B5C + #define open_path_symbol 0x2B25D0 + #define open_fs_object_symbol 0x190CFC + #define close_fs_object_symbol 0x18FC38 + #define storage_get_device_info_symbol 0x28CA00 + #define storage_open_symbol 0x28CC28 + #define storage_close_symbol 0x28B414 + #define storage_read_symbol 0x28A390 + #define storage_send_device_command_symbol 0x289EB0 + #define storage_map_io_memory_symbol 0x28C8AC + #define storage_unmap_io_memory_symbol 0x28C768 + #define storage_internal_get_device_object_symbol 0x289968 + #define decrypt_func_symbol 0x38290 + #define lv1_call_99_wrapper_symbol 0x52850 + #define modules_verification_symbol 0x5C488 + #define prx_load_module_symbol 0x8D308 + #define prx_start_module_symbol 0x8BFD4 + #define prx_stop_module_symbol 0x8D3AC + #define prx_unload_module_symbol 0x8BD08 + #define prx_get_module_info_symbol 0x8B700 + #define prx_get_module_list_symbol 0x8B780 + #define extend_kstack_symbol 0x73BF4 + #define get_pseudo_random_number_symbol 0x22E65C + #define syscall_table_symbol 0x38A4E8 + #define syscall_call_offset 0x27DEE4 + #define read_bdvd0_symbol 0x1AAACC + #define read_bdvd1_symbol 0x1AC6F8 + #define read_bdvd2_symbol 0x1B98B0 + #define device_event_port_send_call 0x296BFC + #define process_map_caller_call 0x4D24 + #define fsloop_open_call 0x2B2A30 + #define fsloop_close_call 0x2B2A80 + #define fsloop_read_call 0x2B2AC0 + #define io_rtoc_entry_1 0x2EC0 + #define io_sub_rtoc_entry_1 -0x7EA0 + #define decrypt_rtoc_entry_2 -0x65C0 + #define storage_rtoc_entry_1 0x22B0 + #define device_event_rtoc_entry_1 0x2638 + #define process_rtoc_entry_1 -0x77A0 + #define patch_func2 0x5D754 + #define patch_func2_offset 0x2C + #define user_thread_prio_patch 0x21EAC + #define user_thread_prio_patch2 0x21EB8 + #define shutdown_patch_offset 0xAB38 + #define shutdown_copy_params_call 0xAB4C + + /* hash */ + #define EXPLORE_PLUGIN_HASH 0xACF4AF2B000ECC91 + #define EXPLORE_CATEGORY_GAME_HASH 0x9CB3396E00056CE9 + #define GAME_EXT_PLUGIN_HASH 0xE274AF7B0001E5D3 + #define LIBFS_EXTERNAL_HASH 0x5BC7BCE800006477 + #define PSP_EMULATOR_HASH 0x7BE641F500023794 + #define PEMUCORELIB_HASH 0xF349A563000C0D66 + #define EMULATOR_API_HASH 0xA9F5B37A0001BB45 + #define EMULATOR_DRM_HASH 0xA324DC4A00005399 + #define EMULATOR_DRM_DATA_HASH 0x75C390860001B75F + #define LIBSYSUTIL_SAVEDATA_PSP_HASH 0x57BBC3B800003212 + + /* lv1 */ + #define vsh_pos_in_ram 0x510000 + + /* vsh */ + #define ps2tonet_patch 0xCA380 + #define ps2tonet_size_patch 0xCA374 + #define vmode_patch_offset 0x44ADD0 + #define psp_drm_patch1 0x24A7E8 + #define psp_drm_patch2 0x24B288 + #define psp_drm_patch3 0x24AEC4 + #define psp_drm_patch4 0x24B6D0 + #define psp_drm_patchA 0x24A904 + #define psp_drm_patchB 0x24B1A4 + #define psp_drm_patchC 0x24A33C + #define psp_drm_patchD 0x24A8EC + #define psp_drm_patchE 0x24A8F0 + #define psp_drm_patchF 0x24B2BC + #define psp_extra_drm_patch 0x24D318 + + /* explore_plugin */ + #define ps2_nonbw_offset 0xDDDC4 + + /* explore_category_game */ + #define ps2_nonbw_offset2 0x68264 + + /* game_ext_plugin */ + #define ps2_nonbw_offset3 0x172F0 + + /* psp_emulator */ + #define psp_set_psp_mode_offset 0x1C18 + + /* emulator_api */ + #define psp_read 0x102D8 + #define psp_read_header 0x1125C + #define psp_drm_patch5 0x11080 + #define psp_drm_patch6 0x110B0 + #define psp_drm_patch7 0x110C8 + #define psp_drm_patch8 0x110CC + #define psp_drm_patch9 0x1120C + #define psp_drm_patch11 0x11210 + #define psp_drm_patch12 0x11220 + #define psp_product_id_patch1 0x11320 + #define psp_product_id_patch3 0x115F8 + + /* pemucorelib */ + #define psp_eboot_dec_patch 0x5E6BC + #define psp_prx_patch 0x577D8 + #define psp_savedata_bind_patch1 0x7A4BC + #define psp_savedata_bind_patch2 0x7A514 + #define psp_savedata_bind_patch3 0x7A030 + #define psp_extra_savedata_patch 0x87540 + #define psp_prometheus_patch 0x12EA28 + #define prx_patch_call_lr 0x5892C + + /* emulator_drm */ + #define psp_drm_tag_overwrite 0x4C68 + #define psp_drm_key_overwrite (0x27600 - 0xBE80) + + /* libsysutil_savedata_psp */ + #define psp_savedata_patch1 0x46CC + #define psp_savedata_patch2 0x46A4 + #define psp_savedata_patch3 0x4504 + #define psp_savedata_patch4 0x453C + #define psp_savedata_patch5 0x4550 + #define psp_savedata_patch6 0x46B8 + + /* libfs */ + #define aio_copy_root_offset 0xD658 + + /* CEX */ + #define cex_ps2tonet_patch 0xC4E34 + #define cex_ps2tonet_size_patch 0xC4E28 + #define cex_vmode_patch_offset 0x4431DC + #define cex_psp_drm_patch1 0x242FC0 + #define cex_psp_drm_patch2 0x243A60 + #define cex_psp_drm_patch3 0x24369C + #define cex_psp_drm_patch4 0x243EA8 + #define cex_psp_drm_patchA 0x2430DC + #define cex_psp_drm_patchB 0x24397C + #define cex_psp_drm_patchC 0x242B14 + #define cex_psp_drm_patchD 0x2430C4 + #define cex_psp_drm_patchE 0x2430C8 + #define cex_psp_drm_patchF 0x243A94 + #define cex_psp_extra_drm_patch 0x245AF0 +#endif + #endif /* __FIRMWARE_SYMBOLS_H_S__ */ diff --git a/payloads/MAMBA/stage2/modulespatch.c b/payloads/MAMBA/stage2/modulespatch.c index 92195c6a..426b9853 100644 --- a/payloads/MAMBA/stage2/modulespatch.c +++ b/payloads/MAMBA/stage2/modulespatch.c @@ -391,8 +391,18 @@ PatchTableEntry patch_table_rebug[] = #ifdef DO_PATCH_PS2 #ifdef EXPLORE_PLUGIN_REBUG_HASH { EXPLORE_PLUGIN_REBUG_HASH, rebug_explore_plugin_patches }, +#else + { EXPLORE_PLUGIN_HASH, explore_plugin_patches }, +#endif +#ifdef EXPLORE_CATEGORY_GAME_REBUG_HASH { EXPLORE_CATEGORY_GAME_REBUG_HASH, rebug_explore_category_game_patches }, +#else + { EXPLORE_CATEGORY_GAME_HASH, explore_category_game_patches }, +#endif +#ifdef GAME_EXT_PLUGIN_REBUG_HASH { GAME_EXT_PLUGIN_REBUG_HASH, rebug_game_ext_plugin_patches }, +#else + { GAME_EXT_PLUGIN_HASH, game_ext_plugin_patches }, #endif #endif }; diff --git a/payloads/SKY/Makefile b/payloads/SKY/Makefile index 121044d6..2629e6d4 100644 --- a/payloads/SKY/Makefile +++ b/payloads/SKY/Makefile @@ -2,7 +2,8 @@ PPU_CC = ppu-gcc PPU_OBJCOPY = ppu-objcopy PAYLOADS := 421C 421D 430C 430D 431C 440C 441C 441D 446C 446D 450C 450D 453C 453D 455C 455D 460C \ - 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C + 465C 465D 470C 470D 475C 475D 476C 476D 478C 478D 480C 480D 481C 481D 482C 482D 483C \ + 484C 484D define do_payload $(PPU_CC) -c payload_sky.S -o payload_sky_$@.o -DCFW_$@ diff --git a/payloads/SKY/firmware_symbols.h b/payloads/SKY/firmware_symbols.h index c2f362a7..1369f43b 100644 --- a/payloads/SKY/firmware_symbols.h +++ b/payloads/SKY/firmware_symbols.h @@ -244,3 +244,17 @@ #define memcpy 0x7E92C #define memset 0x4D66C #endif + +#ifdef CFW_484C +#define alloc 0x64824 +#define memory_patch_func 0x297660 +#define memcpy 0x7E92C +#define memset 0x4D66C +#endif + +#ifdef CFW_484D +#define alloc 0x681F4 +#define memory_patch_func 0x2B25F8 +#define memcpy 0x82A08 +#define memset 0x51014 +#endif diff --git a/pkgfiles/USRDIR/sys/data/keys b/pkgfiles/USRDIR/sys/data/keys index a649c5ce..626dbda4 100644 --- a/pkgfiles/USRDIR/sys/data/keys +++ b/pkgfiles/USRDIR/sys/data/keys @@ -4948,3 +4948,153 @@ riv=FD40664E2EBBA01BF359B0DCDF543DA4 pub=36C1ACE6DD5CCC0006FDF3424750FAC515FC5CFA2C93EC53C6EC2BC421708D154E91F2E7EA54A893 priv=0010818ED8A666051C6198662C3D6DDE2CA4901DDC ctype=09 + +[spp] +type=SPP +revision=00 +version=0004008400000000 +erk=D2961BBFFEDAEE269B061454D6ACF262CD71BC6F5320180F0A04A07583CCF7C5 +riv=6D308B59BC9054B12C833359D31BAE77 +pub=0CDD0D1541A6B0DFD12E951578536CA60C93853B88FCE17592DC8D134B08A94AF8BB08667E2D70A5 +priv=0001608EF3BACAFFB8C3A5958A24F758325B62B08C +ctype=07 + + +[metldr] +type=SELF +revision=00 +self_type=LDR +version=0004008400000000 +erk=C0CEFE84C227F75BD07A7EB846509F93B238E770DACB9FF4A388F812482BE21B +riv=47EE7454E4774CC9B8960C7B59F4C14D +pub=C2D4AAF319355019AF99D44E2B58CA29252C89123D11D6218F40B138CAB29B7101F3AEB72A975019 +priv=00C5B2BFA1A413DD16F26D31C0F2ED4720DCFB0670 +ctype=20 + + +[rvk] +type=RVK +revision=02 +version=0004008400000000 +erk=695984B7EE2EC2F77FCC3120150DCE7E4480D84480DDD8C5940AEB6F79E63D17 +riv=A8BA3E4E63B2BB06FC0CE57E3BB8FC46 +pub=7F1950C6E497E922400586EE338B41E01C906C5A6DFD75FEB5249CFA4BEC534F5CA679670A452B2A +priv=00245E673B039D656DA206BDAE4EAEFCBF2A8D5EAF +ctype=12 + + +[isoldr] +type=SELF +revision=01 +version=0004008400000000 +self_type=ISO +erk=63565DBE98C3B1A52AADC907C47130FE57A10734E84F22592670F86ED2B0A086 +riv=953F6A99891B4739358F5363A00C08B9 +pub=26BE7B02E7D65C6C21BF4063CDB8C0092FE1679D62FA1A8CCC284A1D21885473A959992537A06612 +priv=00294411363290975BA551336D3965D88AF029A17B +ctype=15 + + +[isoldr] +type=SELF +revision=0100 +version=0004008400000000 +self_type=ISO +erk=B96EA32CB96EA32DB96EA32CB96EA32CB96EA32CB96EA32DB96EA32CB96EA32C +riv=B96EA32CB96EA32DB96EA32DB96EA32C +pub=2D7066E68C6AC3373B1346FD76FE7D18A207C811500E65D85DB57BC4A27AD78F59FD53F38F50E151 +priv=00294411363290975BA551336D3965D88AF029A17B +ctype=02 + + +[lv0ldr] +type=SELF +version=0004008400000000 +self_type=LV0 +erk=CA7A24EC38BDB45B98CCD7D363EA2AF0C326E65081E0630CB9AB2D215865878A +riv=F9205F46F6021697E670F13DFA726212 +pub=A8FD6DB24532D094EFA08CB41C9A72287D905C6B27B42BE4AB925AAF4AFFF34D41EEB54DD128700D +priv=001AD976FCDE86F5B8FF3E63EF3A7F94E861975BA3 +ctype=33 + + +[lv1ldr] +type=SELF +revision=0000 +version=0004008400000000 +self_type=LV1 +erk=10CEA04973FCCC12EC19924510822D8D4C41F657FD3D7E73F415A8D687421BCD +riv=ED8699562C6AC65204FA166257E7FCF4 +pub=085D38DBF9B757329EB862107929909D32FA1DAE60641BF4AC25319D7650597EE977F8E810FEEA96 +priv=004312C65347ACBE95CC306442FEFD0AF4C2935EB3 +ctype=14 + + +[lv2ldr] +type=SELF +revision=0000 +version=0004008400000000 +self_type=LV2 +erk=0CAF212B6FA53C0DA7E2C575ADF61DBE68F34A33433B1B891ABF5C4251406A03 +riv=9B79374722AD888EB6A35A2DF25A8B3E +pub=1034A6F98AF6625CC3E3604B59B971CA617DF337538D2179EBB22F3BDC9D0C6DA56BA7DDFD205A50 +priv=009D4CBA2BFB1A8330D3E20E59D281D476D231C73A +ctype=14 + + +[appldr] +type=SELF +revision=001D +version=0004008400000000 +self_type=APP +erk=D202174EB65A62048F3674B59EF6FE72E1872962F3E1CD658DE8D7AF71DA1F3E +riv=ACB9945914EBB7B9A31ECE320AE09F2D +pub=430322887503CF52928FAAA410FD623C7321281C8825D95F5B47EF078EFCFC44454C3AB4F00BB879 +priv=0010818ED8A666051C6198662C3D6DDE2CA4901DDC +ctype=1A + + +[appldr] +type=SELF +revision=001C np +version=0004008400000000 +self_type=NPDRM +erk=8103EA9DB790578219C4CEDF0592B43064A7D98B601B6C7BC45108C4047AA80F +riv=246F4B8328BE6A2D394EDE20479247C5 +pub=503172C9551308A87621ECEE90362D14889BFED2CF32B0B3E32A4F9FE527A41464B735E1ADBC6762 +priv=009EF86907782A318D4CC3617EBACE2480E73A46F6 +ctype=30 + + +[spkg] +type=PKG +revision=00 +version=0004008400000000 +erk=F8F99006F1C007D5D0B1909E9566E0E70B569399FC3394A811809FDB5CAE92CD +riv=59D28DB4ADDFB40B7D768BC9667C67B1 +pub=5432BDDD1F97418147AFF016EAA6100834F2CAA8C498B88965689EE44DF349B066CD43CBF4F2C5D0 +priv=00542D46E7B3DAAC8AEB81E533873AABD6D74BB710 +ctype=17 + + +[pkg] +type=PKG +revision=00 +version=0004008400000000 +erk=F8F99006F1C007D5D0B1909E9566E0E70B569399FC3394A811809FDB5CAE92CD +riv=59D28DB4ADDFB40B7D768BC9667C67B1 +pub=5432BDDD1F97418147AFF016EAA6100834F2CAA8C498B88965689EE44DF349B066CD43CBF4F2C5D0 +priv=00542D46E7B3DAAC8AEB81E533873AABD6D74BB710 +ctype=17 + + +[appldr] +type=SELF +revision=001C +version=0004008400000000 +self_type=APP +erk=CFF025375BA0079226BE01F4A31F346D79F62CFB643CA910E16CF60BD9092752 +riv=FD40664E2EBBA01BF359B0DCDF543DA4 +pub=36C1ACE6DD5CCC0006FDF3424750FAC515FC5CFA2C93EC53C6EC2BC421708D154E91F2E7EA54A893 +priv=0010818ED8A666051C6198662C3D6DDE2CA4901DDC +ctype=09 diff --git a/pkgfiles2/USRDIR/GUI/common b/pkgfiles2/USRDIR/GUI/common new file mode 100644 index 00000000..c2ad1623 Binary files /dev/null and b/pkgfiles2/USRDIR/GUI/common differ