Updated for 3.65/3.67

IDBurner · Mar 14, 2018 · e2bd41b · e2bd41b
1 parent 4fde79a
commit e2bd41b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/main.c b/main.c
@@ -114,7 +114,7 @@ int check_safe_mode(void) {
 }
 
 int check_enso(void) {
-	return exists("ur0:tai/boot_config.txt");
+	return exists("ur0:tai/boot_config.txt") || exists("vs0:tai/boot_config.txt");
 }
 
 int copy_file(const char *dst, const char *src) {

diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(usbmc
   SceIofilemgrForDriver_stub
   SceSysclibForDriver_stub
   SceSysmemForDriver_stub
-  SceModulemgrForKernel_stub
   SceModulemgrForDriver_stub
   SceThreadmgrForDriver_stub
   taihenForKernel_stub

diff --git a/plugin/main.c b/plugin/main.c
@@ -45,6 +45,7 @@
 const char check_patch[] = { 0x01, 0x20, 0x01, 0x20 };
 
 // External functions
+int module_get_export_func(SceUID pid, const char *modname, uint32_t libnid, uint32_t funcnid, uintptr_t *func);
 int module_get_offset(SceUID pid, SceUID modid, int segidx, size_t offset, uintptr_t *addr);
 
 // Structs
@@ -127,18 +128,50 @@ int importFindMountPointFunction() {
     return -1;
 
   // Get important function
-  module_get_offset(KERNEL_PID, info.modid, 0, 0x138C1, (uintptr_t *)&sceIoFindMountPoint);
+  switch (info.module_nid) {
+    case 0x9642948C: // 3.60 retail
+      module_get_offset(KERNEL_PID, info.modid, 0, 0x138C1, (uintptr_t *)&sceIoFindMountPoint);
+      break;
+
+    case 0xA96ACE9D: // 3.65 retail
+    case 0x3347A95F: // 3.67 retail
+      module_get_offset(KERNEL_PID, info.modid, 0, 0x182F5, (uintptr_t *)&sceIoFindMountPoint);
+      break;
+
+    default:
+      return 0;
+  }
 
   return 0;
 }
 
 SceUID loadSceUsbMassModule() {
+  int (* _ksceKernelMountBootfs)(const char *bootImagePath);
+  int (* _ksceKernelUmountBootfs)(void);
+  int ret;
+
+  ret = module_get_export_func(KERNEL_PID, "SceKernelModulemgr", 0xC445FA63, 0x01360661, (uintptr_t *)&_ksceKernelMountBootfs);
+  if (ret < 0)
+    ret = module_get_export_func(KERNEL_PID, "SceKernelModulemgr", 0x92C9FFC2, 0x185FF1BC, (uintptr_t *)&_ksceKernelMountBootfs);
+  if (ret < 0)
+    return SCE_KERNEL_START_NO_RESIDENT;
+
+  ret = module_get_export_func(KERNEL_PID, "SceKernelModulemgr", 0xC445FA63, 0x9C838A6B, (uintptr_t *)&_ksceKernelUmountBootfs);
+  if (ret < 0)
+    ret = module_get_export_func(KERNEL_PID, "SceKernelModulemgr", 0x92C9FFC2, 0xBD61AD4D, (uintptr_t *)&_ksceKernelUmountBootfs);
+  if (ret < 0)
+    return SCE_KERNEL_START_NO_RESIDENT;
+
   SceUID moduleId;
-  if (ksceKernelMountBootfs("os0:kd/bootimage.skprx") >= 0) { // Try loading from bootimage
+
+  // First Try loading bootimage
+  if (_ksceKernelMountBootfs("os0:kd/bootimage.skprx") >= 0) {
     moduleId = ksceKernelLoadModule("os0:kd/umass.skprx", 0x800, NULL);
-    ksceKernelUmountBootfs();
-  } else // Try loading from VitaShell
+    _ksceKernelUmountBootfs();
+  } else {
+    // try loading from VitaShell
     moduleId = ksceKernelLoadModule("ux0:VitaShell/module/umass.skprx", 0, NULL);
+  }
 
   return moduleId;
 }
@@ -220,4 +253,4 @@ int module_stop(SceSize args, void *argp) {
   if (safeModeHookId >= 0)
     taiHookReleaseForKernel(safeModeHookId, ksceSysrootIsSafeModeRef);
   return SCE_KERNEL_STOP_SUCCESS;
-}
+}