From 066e9c3128ba24c559123274073ab52f329a08a0 Mon Sep 17 00:00:00 2001
From: TheFloW <theofficialflow1996@gmail.com>
Date: Tue, 19 Jun 2018 23:53:09 +0200
Subject: [PATCH] Fixed gamecard mount detection

---
 CMakeLists.txt                             |   2 +-
 README.md                                  |   4 ++
 main.h                                     |   2 +-
 main_context.c                             |   6 ++-
 modules/kernel/exports.yml                 |   1 -
 modules/kernel/main.c                      |  58 ++++++---------------
 modules/kernel/vitashell_kernel.h          |   3 +-
 modules/user/exports.yml                   |   1 -
 modules/user/main.c                        |   8 +--
 modules/user/vitashell_user.h              |   3 +-
 pkg/sce_sys/livearea/contents/template.xml |   2 +-
 resources/kernel.skprx                     | Bin 3395 -> 3387 bytes
 resources/user.suprx                       | Bin 1677 -> 1648 bytes
 usb.c                                      |  10 +++-
 14 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42eba78c..2de5f81f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ project(VitaShell)
 include("${VITASDK}/share/vita.cmake" REQUIRED)
 set(VITA_APP_NAME "VitaShell")
 set(VITA_TITLEID  "VITASHELL")
-set(VITA_VERSION  "01.92")
+set(VITA_VERSION  "01.93")
 
 # Flags and includes
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-format-truncation -fno-lto")
diff --git a/README.md b/README.md
index 5db9d118..ea12eb68 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,10 @@ Credits
 Changelog
 ---------
 
+### Changelog 1.93
+- Added xmc0: to partition list and added ability to mount xmc0:.
+- Fixed ux0: mounting bug where it wasn't detected that the gamesd has already been mounted.
+
 ### Changelog 1.92
 - Added ability to mount gamesd ux0:
 - Fixed bug where the VitaShell kernel module was loaded but not started, thus it'd run out of memory after some launches.
diff --git a/main.h b/main.h
index a39bf484..c8af8928 100644
--- a/main.h
+++ b/main.h
@@ -53,7 +53,7 @@
 
 // VitaShell version major.minor
 #define VITASHELL_VERSION_MAJOR 0x01
-#define VITASHELL_VERSION_MINOR 0x92
+#define VITASHELL_VERSION_MINOR 0x93
 
 #define VITASHELL_VERSION ((VITASHELL_VERSION_MAJOR << 0x18) | (VITASHELL_VERSION_MINOR << 0x10))
 
diff --git a/main_context.c b/main_context.c
index 1ee632bf..3237f222 100644
--- a/main_context.c
+++ b/main_context.c
@@ -332,7 +332,8 @@ void setContextMenuHomeVisibilities() {
     menu_home_entries[MENU_HOME_ENTRY_MOUNT_USB_UX0].visibility = CTX_INVISIBLE;
   }
 
-  if ((kernel_modid >= 0 || kernel_modid == 0x8002D013) && user_modid >= 0 && shellUserIsUx0Redirected() == 1) {
+  if ((kernel_modid >= 0 || kernel_modid == 0x8002D013) && user_modid >= 0 &&
+      shellUserIsUx0Redirected("sdstor0:uma-pp-act-a", "sdstor0:uma-lp-act-entire") == 1) {
     menu_home_entries[MENU_HOME_ENTRY_MOUNT_UMA0].visibility = CTX_INVISIBLE;
     menu_home_entries[MENU_HOME_ENTRY_MOUNT_USB_UX0].visibility = CTX_INVISIBLE;
   } else {
@@ -343,7 +344,8 @@ void setContextMenuHomeVisibilities() {
     menu_home_entries[MENU_HOME_ENTRY_MOUNT_GAMECARD_UX0].visibility = CTX_INVISIBLE;
     menu_home_entries[MENU_HOME_ENTRY_UMOUNT_GAMECARD_UX0].visibility = CTX_INVISIBLE;
   } else {
-    if ((kernel_modid >= 0 || kernel_modid == 0x8002D013) && user_modid >= 0 && shellUserIsUx0Redirected() == 1) {
+    if ((kernel_modid >= 0 || kernel_modid == 0x8002D013) && user_modid >= 0 &&
+        shellUserIsUx0Redirected("sdstor0:gcd-lp-ign-entire", "sdstor0:gcd-lp-ign-entire") == 1) {
       menu_home_entries[MENU_HOME_ENTRY_MOUNT_GAMECARD_UX0].visibility = CTX_INVISIBLE;
     } else {
       menu_home_entries[MENU_HOME_ENTRY_UMOUNT_GAMECARD_UX0].visibility = CTX_INVISIBLE;
diff --git a/modules/kernel/exports.yml b/modules/kernel/exports.yml
index 1336daaa..b9f754d2 100644
--- a/modules/kernel/exports.yml
+++ b/modules/kernel/exports.yml
@@ -12,6 +12,5 @@ VitaShellKernel2:
       functions:
         - shellKernelIsUx0Redirected
         - shellKernelRedirectUx0
-        - shellKernelUnredirectUx0
         - shellKernelMountById
         - shellKernelGetRifVitaKey
\ No newline at end of file
diff --git a/modules/kernel/main.c b/modules/kernel/main.c
index 88524d98..fdfef8d5 100644
--- a/modules/kernel/main.c
+++ b/modules/kernel/main.c
@@ -65,8 +65,6 @@ static SceIoDevice ux0_dev = { "ux0:", "exfatux0", ux0_blkdev, ux0_blkdev2, MOUN
 
 static SceIoMountPoint *(* sceIoFindMountPoint)(int id) = NULL;
 
-static SceIoDevice *ori_dev = NULL, *ori_dev2 = NULL;
-
 static SceUID hookid = -1;
 
 static tai_hook_ref_t ksceSysrootIsSafeModeRef;
@@ -81,17 +79,22 @@ static int ksceSblAimgrIsDolcePatched() {
   return 1;
 }
 
-int shellKernelIsUx0Redirected() {
+int shellKernelIsUx0Redirected(const char *blkdev, const char *blkdev2) {
+  char k_blkdev[64], k_blkdev2[64];
+
   uint32_t state;
   ENTER_SYSCALL(state);
 
   SceIoMountPoint *mount = sceIoFindMountPoint(MOUNT_POINT_ID);
   if (!mount) {
     EXIT_SYSCALL(state);
-    return -1;
+    return 0;
   }
 
-  if (mount->dev == &ux0_dev && mount->dev2 == &ux0_dev) {
+  ksceKernelStrncpyUserToKernel(k_blkdev, blkdev, sizeof(k_blkdev)-1);
+  ksceKernelStrncpyUserToKernel(k_blkdev2, blkdev2, sizeof(k_blkdev2)-1);
+
+  if (mount && mount->dev && strcmp(mount->dev->blkdev, k_blkdev) == 0 && strcmp(mount->dev->blkdev2, k_blkdev2) == 0) {
     EXIT_SYSCALL(state);
     return 1;
   }
@@ -110,11 +113,6 @@ int shellKernelRedirectUx0(const char *blkdev, const char *blkdev2) {
     return -1;
   }
 
-  if (mount->dev != &ux0_dev && mount->dev2 != &ux0_dev) {
-    ori_dev = mount->dev;
-    ori_dev2 = mount->dev2;
-  }
-
   ksceKernelStrncpyUserToKernel(ux0_blkdev, blkdev, sizeof(ux0_blkdev)-1);
   ksceKernelStrncpyUserToKernel(ux0_blkdev2, blkdev2, sizeof(ux0_blkdev2)-1);
 
@@ -125,28 +123,6 @@ int shellKernelRedirectUx0(const char *blkdev, const char *blkdev2) {
   return 0;
 }
 
-int shellKernelUnredirectUx0() {
-  uint32_t state;
-  ENTER_SYSCALL(state);
-
-  SceIoMountPoint *mount = sceIoFindMountPoint(MOUNT_POINT_ID);
-  if (!mount) {
-    EXIT_SYSCALL(state);
-    return -1;
-  }
-
-  if (ori_dev && ori_dev2) {
-    mount->dev = ori_dev;
-    mount->dev2 = ori_dev2;
-
-    ori_dev = NULL;
-    ori_dev2 = NULL;
-  }
-
-  EXIT_SYSCALL(state);
-  return 0;
-}
-
 int _shellKernelMountById(ShellMountIdArgs *args) {
   int res;
 
@@ -165,12 +141,12 @@ int _shellKernelMountById(ShellMountIdArgs *args) {
       module_get_offset(KERNEL_PID, tai_info.modid, 0, 0x2DE1, (uintptr_t *)&sceAppMgrFindProcessInfoByPid);
       module_get_offset(KERNEL_PID, tai_info.modid, 0, 0x19B51, (uintptr_t *)&sceAppMgrMountById);
       break;
-      
+
     case 0x1C9879D6: // 3.65 retail
       module_get_offset(KERNEL_PID, tai_info.modid, 0, 0x2DE1, (uintptr_t *)&sceAppMgrFindProcessInfoByPid);
       module_get_offset(KERNEL_PID, tai_info.modid, 0, 0x19E61, (uintptr_t *)&sceAppMgrMountById);
       break;
-      
+
     case 0x54E2E984: // 3.67 retail
     case 0xC3C538DE: // 3.68 retail
       module_get_offset(KERNEL_PID, tai_info.modid, 0, 0x2DE1, (uintptr_t *)&sceAppMgrFindProcessInfoByPid);
@@ -192,7 +168,7 @@ int _shellKernelMountById(ShellMountIdArgs *args) {
     return res;
 
   uint32_t appmgr_data_addr = (uint32_t)mod_info.segments[1].vaddr;
-  
+
   SceUID process_id = ksceKernelGetProcessId();
 
   void *info = sceAppMgrFindProcessInfoByPid((void *)(appmgr_data_addr + 0x500), process_id);
@@ -215,7 +191,7 @@ int _shellKernelMountById(ShellMountIdArgs *args) {
     ksceKernelStrncpyUserToKernel(desired_mount_point, (uintptr_t)args->desired_mount_point, 15);
   if (args->klicensee)
     ksceKernelMemcpyUserToKernel(klicensee, (uintptr_t)args->klicensee, 0x10);
-  
+
   res = sceAppMgrMountById(process_id, info + 0x580, args->id, args->process_titleid ? process_titleid : NULL, args->path ? path : NULL,
                            args->desired_mount_point ? desired_mount_point : NULL, args->klicensee ? klicensee : NULL, mount_point);
 
@@ -241,13 +217,13 @@ int shellKernelMountById(ShellMountIdArgs *args) {
 int shellKernelGetRifVitaKey(const void *license_buf, void *klicensee) {
   char k_license_buf[0x200];
   char k_klicensee[0x10];
-  
+
   memset(k_klicensee, 0, sizeof(k_klicensee));
 
   if (license_buf)
     ksceKernelMemcpyUserToKernel(k_license_buf, license_buf, sizeof(k_license_buf));
-  
-  int res = ksceNpDrmGetRifVitaKey(k_license_buf, k_klicensee, NULL, NULL, NULL, NULL); 
+
+  int res = ksceNpDrmGetRifVitaKey(k_license_buf, k_klicensee, NULL, NULL, NULL, NULL);
 
   if (klicensee)
     ksceKernelMemcpyKernelToUser(klicensee, k_klicensee, sizeof(k_klicensee));
@@ -269,13 +245,13 @@ int module_start(SceSize args, void *argp) {
     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
     case 0x90DA33DE: // 3.68 retail
       module_get_offset(KERNEL_PID, info.modid, 0, 0x182F5, (uintptr_t *)&sceIoFindMountPoint);
       break;
-      
+
     default:
       return SCE_KERNEL_START_SUCCESS;
   }
diff --git a/modules/kernel/vitashell_kernel.h b/modules/kernel/vitashell_kernel.h
index 5bcf4d58..56654ce7 100644
--- a/modules/kernel/vitashell_kernel.h
+++ b/modules/kernel/vitashell_kernel.h
@@ -28,9 +28,8 @@ typedef struct {
   char *mount_point;
 } ShellMountIdArgs;
 
-int shellKernelIsUx0Redirected();
+int shellKernelIsUx0Redirected(const char *blkdev, const char *blkdev2);
 int shellKernelRedirectUx0(const char *blkdev, const char *blkdev2);
-int shellKernelUnredirectUx0();
 int shellKernelMountById(ShellMountIdArgs *args);
 int shellKernelGetRifVitaKey(const void *license_buf, void *klicensee);
 
diff --git a/modules/user/exports.yml b/modules/user/exports.yml
index eb331918..c13f82cf 100644
--- a/modules/user/exports.yml
+++ b/modules/user/exports.yml
@@ -12,6 +12,5 @@ VitaShellUser:
       functions:
         - shellUserIsUx0Redirected
         - shellUserRedirectUx0
-        - shellUserUnredirectUx0
         - shellUserMountById
         - shellUserGetRifVitaKey
\ No newline at end of file
diff --git a/modules/user/main.c b/modules/user/main.c
index 743bc3ac..656620f6 100644
--- a/modules/user/main.c
+++ b/modules/user/main.c
@@ -26,18 +26,14 @@
 
 #include "vitashell_user.h"
 
-int shellUserIsUx0Redirected() {
-  return shellKernelIsUx0Redirected();
+int shellUserIsUx0Redirected(const char *blkdev, const char *blkdev2) {
+  return shellKernelIsUx0Redirected(blkdev, blkdev2);
 }
 
 int shellUserRedirectUx0(const char *blkdev, const char *blkdev2) {
   return shellKernelRedirectUx0(blkdev, blkdev2);
 }
 
-int shellUserUnredirectUx0() {
-  return shellKernelUnredirectUx0();
-}
-
 int shellUserMountById(ShellMountIdArgs *args) {
   return shellKernelMountById(args);
 }
diff --git a/modules/user/vitashell_user.h b/modules/user/vitashell_user.h
index bf55f577..66640af7 100644
--- a/modules/user/vitashell_user.h
+++ b/modules/user/vitashell_user.h
@@ -21,9 +21,8 @@
 
 #include <vitashell_kernel.h>
 
-int shellUserIsUx0Redirected();
+int shellUserIsUx0Redirected(const char *blkdev, const char *blkdev2);
 int shellUserRedirectUx0(const char *blkdev, const char *blkdev2);
-int shellUserUnredirectUx0();
 int shellUserMountById(ShellMountIdArgs *args);
 int shellUserGetRifVitaKey(const void *license_buf, void *klicensee);
 
diff --git a/pkg/sce_sys/livearea/contents/template.xml b/pkg/sce_sys/livearea/contents/template.xml
index 8ec279d9..c1692b13 100644
--- a/pkg/sce_sys/livearea/contents/template.xml
+++ b/pkg/sce_sys/livearea/contents/template.xml
@@ -28,7 +28,7 @@
 	<frame id="frame4">
 		<liveitem>
 			<text align="left" text-align="left" word-wrap="off" ellipsis="on">
-				<str size="18" color="#ffffff" shadow="on">v1.92</str>
+				<str size="18" color="#ffffff" shadow="on">v1.93</str>
 			</text>
 		</liveitem>
 	</frame>
diff --git a/resources/kernel.skprx b/resources/kernel.skprx
index 8962805d03419dee4277794410154fba8297a034..d0bc2ddc9238a307c33dc13fb8b72ee525be5e9d 100644
GIT binary patch
delta 2415
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

delta 2423
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

diff --git a/resources/user.suprx b/resources/user.suprx
index db6ba27b7afb325573e66519be45c4985ebf763b..ff83ffe09501812dd2f9088062b6468e4bd19f5e 100644
GIT binary patch
delta 664
zcmeC>{lGIpf^!uwBLfH&OjMlC*f4RYxu{4J0|N-Nf`kPa7(nt<CbKfi^G@J|s0B$V
zOg3Z`m)s5&U;+sN0gS#rIgwGG^FG)J28M~7I~iv))$h#?P82!*vH0?y2~(D7<{s2+
zc{IUMqs2$>ZIaQJ!>yOP0y2U)Oa)Y2+S4xFE1A%iCNT9?#9S*8LGh&vAIx8{SgLDn
z(}O9Fjv6lKCx4&eIbHAm`KRUl=eeKnJb!oBwiz3Ayshr^u9z|LamSIZ`?y}5(4Du#
zCB<ctktXBIw|O&fN#z|)W>d^uXP@`2Wb5Tex$9S7VXj~Ay<~l&$K->I`t>^)zCMs%
z*=}+#toO-ewb>`PcNR{3zpU!k)$8k$qpErB>N)?<vlYE*|9Ah!2<@BJFPF}q8I$+3
zY?;B2(zwrDQ(bb-HZEJXvp#6$xBOWJF3aXVTz%B^+a%fF)9(u!>K|8KxBuDMpDQOt
zZvRqP{`|h|{o0w=f6AT>K6~%?Rd@dV|Fr7mV&|Q#tuCAQzGn8~m6>escFl;@U&8Hr
zIX&@L){d&jr`~m|f7g>Wdt>SSy~?ES?2P1hNiWyk+nK(8wd!a69{H%dw-1-UoVRs?
z=ABbdlIA|P%bPO4-Yaf>&pOsq@^x&rm2dO2pP6c&m3Mz#f2QIVGbp+kD{h&dUC7Ji
zDAMw<zR`i{iH8DXyG`Q`B>@hWM_v|<4hkBHj<K8^EKNoeIJy?_a6PEMY5CFUe#gzw
z_*MFsW(nt=I5ltiox|QW8-(p{#n)^)|KwWU$+@-4-^=u$%E>+2ZF`Krx@-R3-%n2e
vo0wl+FxBqve$DR%z3$)G#LJq~A9ijz<aIMO=dEkbTP^l&cjN<H)K35a(q=7W

delta 693
zcmeys)5|+Sf|HM*kpTpHCn`>7TrhE`xu{DM0|N-Nf`kPa7(nt%CbKfi^IqVBs0B&5
zOg3Z`mplO#U;+sN0gQezIgwGG^8?rj28OwtI~iv))$jI>PLw$Q@%fP>-cd)n1$AAU
zN(ux-I=j86XRygKEeg^M;Xc^q=u~pS(e|WTDF@fCW0xEqkNAFM`p5Y)Vz)`|!T^mO
z98HVt^7YhSsc`7sKmV{??jHC1;(MDf+`XP0Iqiw%`lus4leTsEXaDt<wLJP%c>NTQ
z?kk<qT)Q{_`IsXalNO*m^XvMV#<Dw8rarrN)#FsG#nJeZgsqbgGV0fV;PK1;{$z{e
zXRqLOD{l$st4!#e#VPZ>!sXx0sA;Re9~X_{X8-r+ZpqzgVxG(9r|DdK@Z(Fy|K$M|
zHU^?y_x}D0`kd9@>0+YUYpiE9@rI1vy(b%8rQWuOf6r|Cd$8~LAHDUJH~9+h%r^h~
zc1Gm(FNJr{E$@3)CS<jLq2-k|b=CFzH~o2DQ}*At_{aNSt}6d?J<l$Eb}sh!F?%=n
z#hahaiSrM?d~o-*^X;mq|8KwkOnTe8rhMJI?=OX9XqlRB+c|mZZtlPJZ{?1hu{Vs%
z&h59~b2<0?y?_!Uk#{Gy=f3^2-2a%^{y!W%x_f^-i2G9)7Akg8j`M7X+KP>)=1<D|
zv@7awF@qwIvEr8QxrIWEi6U(e53iBrF=jb<#x3y12FDu;Tut5rERHw4EwWi03pk}?
zTNF5&P7AP#D^%3~7eBY>{PjN5v!_nw9F#2EHN{=7{DXx26Dj$p`gSMNcTLnU(T;!V
zmsfG;pl;1%>mPdGKRU}jT0ZB^*|?&v`$cW`MK4tg|NlR@bI&p3%2w{1A8mGIn;m?1
X(bD%x)3&EmzCF>DEwI1Wt6u^DHS9R_

diff --git a/usb.c b/usb.c
index 39b490e1..79e5492a 100644
--- a/usb.c
+++ b/usb.c
@@ -65,7 +65,10 @@ int umountGamecardUx0() {
   sceAppMgrDestroyOtherApp();
 
   // Restore ux0: patch
-  shellUserUnredirectUx0();
+  if (checkFileExist("sdstor0:xmc-lp-ign-userext"))
+    shellUserRedirectUx0("sdstor0:xmc-lp-ign-userext", "sdstor0:xmc-lp-ign-userext");
+  else
+    shellUserRedirectUx0("sdstor0:int-lp-ign-userext", "sdstor0:int-lp-ign-userext");
 
   // Remount Memory Card
   remount(0x800);
@@ -115,7 +118,10 @@ int umountUsbUx0() {
   sceAppMgrDestroyOtherApp();
 
   // Restore ux0: patch
-  shellUserUnredirectUx0();
+  if (checkFileExist("sdstor0:xmc-lp-ign-userext"))
+    shellUserRedirectUx0("sdstor0:xmc-lp-ign-userext", "sdstor0:xmc-lp-ign-userext");
+  else
+    shellUserRedirectUx0("sdstor0:int-lp-ign-userext", "sdstor0:int-lp-ign-userext");
 
   // Remount Memory Card
   remount(0x800);