Merge pull request #20 from littlebalup/master

1.35
Zarh · Mar 22, 2019 · 6fadad0 · 6fadad0
2 parents 6cadf62 + 2dd119b
commit 6fadad0
Show file tree

Hide file tree

Showing 35 changed files with 734 additions and 5 deletions.
diff --git a/MGZ/data/mamba_421D.lz.bin b/MGZ/data/mamba_421D.lz.bin
diff --git a/MGZ/data/mamba_430D.lz.bin b/MGZ/data/mamba_430D.lz.bin
diff --git a/MGZ/data/mamba_441D.lz.bin b/MGZ/data/mamba_441D.lz.bin
diff --git a/MGZ/data/mamba_446D.lz.bin b/MGZ/data/mamba_446D.lz.bin
diff --git a/MGZ/data/mamba_450D.lz.bin b/MGZ/data/mamba_450D.lz.bin
diff --git a/MGZ/data/mamba_453D.lz.bin b/MGZ/data/mamba_453D.lz.bin
diff --git a/MGZ/data/mamba_455D.lz.bin b/MGZ/data/mamba_455D.lz.bin
diff --git a/MGZ/data/mamba_465D.lz.bin b/MGZ/data/mamba_465D.lz.bin
diff --git a/MGZ/data/mamba_470D.lz.bin b/MGZ/data/mamba_470D.lz.bin
diff --git a/MGZ/data/mamba_475D.lz.bin b/MGZ/data/mamba_475D.lz.bin
diff --git a/MGZ/data/mamba_476D.lz.bin b/MGZ/data/mamba_476D.lz.bin
diff --git a/MGZ/data/mamba_478D.lz.bin b/MGZ/data/mamba_478D.lz.bin
diff --git a/MGZ/data/mamba_480D.lz.bin b/MGZ/data/mamba_480D.lz.bin
diff --git a/MGZ/data/mamba_481D.lz.bin b/MGZ/data/mamba_481D.lz.bin
diff --git a/MGZ/data/mamba_482D.lz.bin b/MGZ/data/mamba_482D.lz.bin
diff --git a/MGZ/data/mamba_483C.lz.bin b/MGZ/data/mamba_483C.lz.bin
diff --git a/MGZ/data/mamba_484C.lz.bin b/MGZ/data/mamba_484C.lz.bin
diff --git a/MGZ/data/mamba_484D.lz.bin b/MGZ/data/mamba_484D.lz.bin
diff --git a/MGZ/data/mamba_loader_484C.bin b/MGZ/data/mamba_loader_484C.bin
diff --git a/MGZ/data/mamba_loader_484D.bin b/MGZ/data/mamba_loader_484D.bin
diff --git a/MGZ/data/payload_sky_484C.bin b/MGZ/data/payload_sky_484C.bin
diff --git a/MGZ/data/payload_sky_484D.bin b/MGZ/data/payload_sky_484D.bin
diff --git a/MGZ/data/umount_484C.bin b/MGZ/data/umount_484C.bin
diff --git a/MGZ/data/umount_484D.bin b/MGZ/data/umount_484D.bin
diff --git 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__ */
diff --git 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
@@ -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
@@ -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
@@ -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++