diff --git a/CHANGELOG.md b/CHANGELOG.md index 6398b022..b2b4085d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,19 @@ # Changelog -### Changelog 1.95 +### Changelog 1.96 +- Added ability to skip pages in file browser and SFO viewer using L/R triggers. + (QR download has been temporarily removed and will be reimplemented later). +- Added ability to move files between partitions by copying&removing. +- Fixed bug where the option to disable warning message was not saved. +- Undone usb changes because people reported an issue with vpk installation with it. +### Changelog 1.95 - Added option to disable warning messages when installing vpks. - Fixed bug in USB connection, where your Memory Card could be corrupted. - Fixed line breaks in SFO files and long names will now scroll. - Fixed compatibility with `udcd_uvc.skprx ` thanks to xerpi. ### Changelog 1.94 - - Added ability to umount all partitions that you can mount. - Fixed crash when using StorageMgr. diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dd62342..bf324862 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.95") +set(VITA_VERSION "01.96") # 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/main.h b/main.h index 3cfa7731..3f90430b 100644 --- a/main.h +++ b/main.h @@ -54,7 +54,7 @@ // VitaShell version major.minor #define VITASHELL_VERSION_MAJOR 0x01 -#define VITASHELL_VERSION_MINOR 0x95 +#define VITASHELL_VERSION_MINOR 0x96 #define VITASHELL_VERSION ((VITASHELL_VERSION_MAJOR << 0x18) | (VITASHELL_VERSION_MINOR << 0x10)) diff --git a/pkg/sce_sys/livearea/contents/template.xml b/pkg/sce_sys/livearea/contents/template.xml index 553ad006..c5feb02c 100644 --- a/pkg/sce_sys/livearea/contents/template.xml +++ b/pkg/sce_sys/livearea/contents/template.xml @@ -28,7 +28,7 @@ - v1.95 + v1.96 diff --git a/release/VitaShell.vpk b/release/VitaShell.vpk index b8b2e28c..ce61c32d 100644 Binary files a/release/VitaShell.vpk and b/release/VitaShell.vpk differ diff --git a/release/eboot.bin b/release/eboot.bin index fb5cba81..0fa1f02b 100644 Binary files a/release/eboot.bin and b/release/eboot.bin differ diff --git a/release/param.sfo b/release/param.sfo index f4dc8f43..36b745d9 100644 Binary files a/release/param.sfo and b/release/param.sfo differ diff --git a/release/template.xml b/release/template.xml index 553ad006..c5feb02c 100644 --- a/release/template.xml +++ b/release/template.xml @@ -28,7 +28,7 @@ - v1.95 + v1.96 diff --git a/release/version.bin b/release/version.bin index 41034cc3..b9667961 100644 Binary files a/release/version.bin and b/release/version.bin differ diff --git a/usb.c b/usb.c index 059d7dd3..c1f663aa 100644 --- a/usb.c +++ b/usb.c @@ -132,20 +132,6 @@ int umountUsbUx0() { return 0; } -int remount_uma0 = 0, remount_xmc0 = 0, remount_imc0 = 0, remount_ux0 = 0; - -void remount_partitions() { - if (remount_ux0) - vshIoMount(0x800, NULL, 0, 0, 0, 0); - if (remount_imc0) - vshIoMount(0xD00, NULL, 0, 0, 0, 0); - if (remount_xmc0) - vshIoMount(0xE00, NULL, 0, 0, 0, 0); - if (remount_uma0) - vshIoMount(0xF00, NULL, 0, 0, 0, 0); - remount_uma0 = remount_xmc0 = remount_imc0 = remount_ux0 = 0; -} - SceUID startUsb(const char *usbDevicePath, const char *imgFilePath, int type) { SceUID modid = -1; int res; @@ -175,25 +161,6 @@ SceUID startUsb(const char *usbDevicePath, const char *imgFilePath, int type) { if (res < 0) goto ERROR_USBSTOR_VSTOR; - // Umount all partitions - remount_uma0 = remount_xmc0 = remount_imc0 = remount_ux0 = 0; - if (checkFolderExist("uma0:")) { - vshIoUmount(0xF00, 0, 0, 0); - remount_uma0 = 1; - } - if (checkFolderExist("xmc0:")) { - vshIoUmount(0xE00, 0, 0, 0); - remount_xmc0 = 1; - } - if (checkFolderExist("imc0:")) { - vshIoUmount(0xD00, 0, 0, 0); - remount_imc0 = 1; - } - if (checkFolderExist("ux0:")) { - vshIoUmount(0x800, 0, 0, 0); - remount_ux0 = 1; - } - // Start USB storage res = sceUsbstorVStorStart(type); if (res < 0) @@ -202,7 +169,6 @@ SceUID startUsb(const char *usbDevicePath, const char *imgFilePath, int type) { return modid; ERROR_USBSTOR_VSTOR: - remount_partitions(); sceMtpIfStartDriver(1); ERROR_STOP_DRIVER: @@ -230,8 +196,20 @@ int stopUsb(SceUID modid) { if (res < 0) return res; - // Remount partitions - remount_partitions(); + // Remount Memory Card + remount(0x800); + + // Remount imc0: + if (checkFolderExist("imc0:")) + remount(0xD00); + + // Remount xmc0: + if (checkFolderExist("xmc0:")) + remount(0xE00); + + // Remount uma0: + if (checkFolderExist("uma0:")) + remount(0xF00); return 0; }