Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into vitaflash
Browse files Browse the repository at this point in the history
  • Loading branch information
JoseAaronLopezGarcia committed Jan 2, 2025
2 parents 744c3c4 + 897757e commit 9414590
Show file tree
Hide file tree
Showing 156 changed files with 25,623 additions and 1,029 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@
- Updated `Despertar del Cementerio` to `Version 10`. Can now be used to unbrick any `PSP` model.
- Can now install `cIPL` on all `PSP` models.
- Added `FinalSpeed` for easier access to `Live` installations.
#### Rev 151
- Added Uninstall method for fastms371_mod to Full Flash Installer
- MagicMemoryCreator (DCARK Maker) Added Local OFW 1.50/6.61 selection
- Fixed lflash formatting with DCARK.
- Added idstorage regeneration to all models. You can convert any PSP to an American, Japanese, or Europe region
- Custom Launcher can run 1.50 Homebrew via 1.50 kernel add-on ( 1K's only )
- Added qwerty osk
- Fixed ICON0 in Custom Launcher from crashing when in File Browser.
- Added more directories to search for GO
- Fixed IdStorage and Fix MAC Address not able to find real MAC.
- Fix for fatms372_mod
- USBCam patches by isage
- Fixed Copying and Pasting with File Browser in Custom Launcher.
- Fixed UMD Video sleep/resume.
- Added 20th Anniversary Theme.
- System stability improved.
#### Rev 150
- Added `150 Kernel Addon`.
- Added support for `fatms371mod`.
Expand Down
33 changes: 19 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ SUBDIRS = libs \
extras/150kernel/rebootex150 \
extras/150kernel/reboot150 \
extras/150kernel/systemctrl150 \
extras/150kernel/vshctrl150 \
extras/150kernel/tmctrl150 \
extras/150kernel/installer
extras/150kernel/vshmenu150 \
extras/150kernel/installer

.PHONY: subdirs $(SUBDIRS) cleanobj clean cleanobj copy-bin mkdir-dist encrypt-prx copy-dcark pack-flash0

Expand Down Expand Up @@ -303,6 +305,17 @@ clean:
$(Q)$(MAKE) $@ -C extras/modules/kbooti_update
$(Q)$(MAKE) $@ -C extras/modules/kpspident
$(Q)$(MAKE) $@ -C extras/modules/idsregeneration
$(Q)$(MAKE) $@ -C extras/apps/updater/
$(Q)$(MAKE) $@ -C extras/apps/installer/
$(Q)$(MAKE) $@ -C extras/apps/uninstaller
$(Q)$(MAKE) $@ -C extras/150kernel/reboot150
$(Q)$(MAKE) $@ -C extras/150kernel/rebootex150
$(Q)$(MAKE) $@ -C extras/150kernel/systemctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/vshctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/tmctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/vshmenu150
$(Q)$(MAKE) $@ -C extras/150kernel/vshctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/installer
$(Q)$(MAKE) $@ -C loader/live/FinalSpeed
$(Q)$(MAKE) $@ -C loader/live/user/linkless_payload
$(Q)$(MAKE) $@ -C loader/live/user/signed_eboot
Expand Down Expand Up @@ -330,24 +343,15 @@ clean:
$(Q)$(MAKE) $@ -C loader/dc/tmctrl/rebootex
$(Q)$(MAKE) $@ -C loader/dc/tmctrl
$(Q)$(MAKE) $@ -C loader/dc/vunbricker
$(Q)$(MAKE) $@ K=sceUID -C loader/live/kernel/kxploit
$(Q)$(MAKE) $@ K=sceSdGetLastIndex -C loader/live/kernel/kxploit
$(Q)-rm -rf dist *~ | true
$(Q)$(MAKE) $@ -C extras/apps/updater/
$(Q)$(MAKE) $@ -C extras/apps/installer/
$(Q)$(MAKE) $@ -C extras/apps/uninstaller
$(Q)$(MAKE) $@ -C extras/150kernel/reboot150
$(Q)$(MAKE) $@ -C extras/150kernel/rebootex150
$(Q)$(MAKE) $@ -C extras/150kernel/systemctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/tmctrl150
$(Q)$(MAKE) $@ -C extras/150kernel/installer
$(Q)$(MAKE) $@ -C loader/perma/cipl/new/ipl_stage1_payload
$(Q)$(MAKE) $@ -C loader/perma/cipl/new/ipl_stage2_payload
$(Q)$(MAKE) $@ K=sceUID -C loader/live/kernel/kxploit
$(Q)$(MAKE) $@ K=sceSdGetLastIndex -C loader/live/kernel/kxploit
$(Q)$(PYTHON) contrib/PC/scripts/cleandeps.py
$(Q)find -name 'THEME.ARK' -exec rm {} \;
$(Q)rm -f extras/apps/updater/ARK_01234.PKG | true
$(Q)rm -f extras/apps/updater/EBOOT_PSP.PBP | true
$(Q)rm -f extras/apps/updater/EBOOT_GO.PBP | true
$(Q)$(PYTHON) contrib/PC/scripts/cleandeps.py
$(Q)find -name 'THEME.ARK' -exec rm {} \;
$(Q)rm -f extras/menus/arkMenu/LANG.ARK
$(Q)rm -rf loader/vpk/bin/save/ARK_01234
$(Q)rm -f loader/vpk/bin/psx/ps1cfw_enabler.suprx
Expand All @@ -357,6 +361,7 @@ clean:
$(Q)rm -f loader/dc/msipl/newipl/stage1/*.h
$(Q)rm -f loader/dc/msipl/newipl/stage2/*.lzo
$(Q)rm -f loader/live/FinalSpeed/*.h
$(Q)-rm -rf dist *~ | true

subdirs: $(SUBDIRS)

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Use `-h` or `--help` to show all available flags

##### Permanent CFW via cIPL

- `New cIPL`: works with every retail model (1K, 2K, 3K, Go and Street) on firmware `6.61`.
- `New cIPL`: works with every retail model (1K, 2K, 3K, Go and Street) on firmware `6.61` or `6.60`.
- `Classic cIPL`: works with `1g` and early `2g` on firmware `6.60` or `6.61` as well as `Testkits` on `6.60 Testing Tool`.
- `DevTool cKBOOTI`: works with `DTP-T1000` (devkits) on `6.60 Development Tool`.
- Installer will choose the correct version according to your model.
Expand All @@ -128,10 +128,10 @@ Use `-h` or `--help` to show all available flags
- On `PSP` you need to be running a `CFW` to install `DC-ARK` (ARK itself or any other).
- Copy the `ARK_DC` folder to the `/PSP/GAME/` folder and run the installer from the `XMB`.
- Follow the instructions to install DC-ARK and create a magic memory stick.
- On `PC`, you need `Python 3` and run `MagicMemoryCreator` with `admin`/`root` priviledges.
- On `PC`, you need `Python 3` and run `MagicMemoryCreator` with `admin`/`root` privileges.
- On compatible models, you can use `Advanced VSH Menu` to create a `Pandora Battery`.
- Use a `Pandora` or `Baryon Sweeper` in combination with your newly created `Magic Memory Stick` to boot up `Despertar del Cementerio`.
- From here you can either boot ARK from memory stick, install 6.61 Firmware with ARK on the Nand or install 6.61 Official Firmware
- From here you can either boot ARK from memory stick, install 6.61 Firmware with ARK on the NAND or install 6.61 Official Firmware


#### Installation On PS Vita
Expand Down Expand Up @@ -165,7 +165,7 @@ Use `-h` or `--help` to show all available flags

##### There are three ways to update ARK:

- Option 1: Use the `System Update` feature in the XMB. Requires your PSP/Vita to be connected to the internet.
- Option 1: Use the `System Update` ( `ARK-4 Updater` ) feature in the XMB. Requires your PSP/Vita to be connected to the internet.
- Option 2: Copy the `UPDATE` folder to `/PSP/GAME/` and run it.
- Option 3: Copy `ARK_01234` folder and (on PSP) run `ARK Loader` again to install new flash0 files.

Expand All @@ -187,4 +187,6 @@ Use `-h` or `--help` to show all available flags
- ARK may cause ejectile malfunction if your hard drive is not hard enough.

- If this software malfunctions, you can turn it off and on again.

- You may be shunned for not reading the Wiki.
</p>
2 changes: 1 addition & 1 deletion common/include/ark.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern "C" {
#define ARK_MAJOR_VERSION 4
#define ARK_MINOR_VERSION 20
#define ARK_MICRO_VERSION 69
#define ARK_REVISION 150
#define ARK_REVISION 152

// Pointers and sizes
#define ARK_PATH_SIZE 128
Expand Down
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
#ifndef __VSHCTRL_H__
#define __VSHCTRL_H__

/**
* This api is for vsh menu. (flash0:/vsh/module/satelite.prx)
*
* The vsh menu is an user mode module, and because of this, these functions are
* only available to user mode.
*/

/**
* Registers the vsh menu.
* When HOME is pressed, vshctrl will load the satelite module.
* In module_start, call this function to register the vsh menu.
*
* @param ctrl - The function that will be executed each time
* the system calls ReadBufferPositive. Despite satelite.prx being
* an user module, this function will be executed in kernel mode.
*
* @returns 0 on success, < 0 on error.
*/
int vctrlVSHRegisterVshMenu(int (* ctrl)(SceCtrlData *, int));

/**
* Exits the vsh menu.
* vshmenu module must call this module after destroying vsh menu display and
* freeing resources.
*
* vshmenu module doesn't need to stop-unload itself, as that is vshctrl job.
*
* @param conf - Indicates the new config. vshctrl will update the internal
* vshctrl and systemctrl variables with the new configuration given by this param.
* However is job of satelite.prx to save those settings to the configuration file.
* using sctrlSESetConfig.
*
* @param videoiso - Indicates the videoiso to mount, or NULL if none.
* @param disctype - The disctype of the videoiso (0x20=video, 0x40=audio)
*
* @returns 0 on success, < 0 on error.
*/
int vctrlVSHExitVSHMenu(SEConfig *conf, char *videoiso, int disctype);


#endif
#ifndef __VSHCTRL_H__
#define __VSHCTRL_H__

/**
* This api is for vsh menu. (flash0:/vsh/module/satelite.prx)
*
* The vsh menu is an user mode module, and because of this, these functions are
* only available to user mode.
*/

/**
* Registers the vsh menu.
* When HOME is pressed, vshctrl will load the satelite module.
* In module_start, call this function to register the vsh menu.
*
* @param ctrl - The function that will be executed each time
* the system calls ReadBufferPositive. Despite satelite.prx being
* an user module, this function will be executed in kernel mode.
*
* @returns 0 on success, < 0 on error.
*/
int vctrlVSHRegisterVshMenu(int (* ctrl)(SceCtrlData *, int));

/**
* Exits the vsh menu.
* vshmenu module must call this module after destroying vsh menu display and
* freeing resources.
*
* vshmenu module doesn't need to stop-unload itself, as that is vshctrl job.
*
* @param conf - Indicates the new config. vshctrl will update the internal
* vshctrl and systemctrl variables with the new configuration given by this param.
* However is job of satelite.prx to save those settings to the configuration file.
* using sctrlSESetConfig.
*
* @param videoiso - Indicates the videoiso to mount, or NULL if none.
* @param disctype - The disctype of the videoiso (0x20=video, 0x40=audio)
*
* @returns 0 on success, < 0 on error.
*/
int vctrlVSHExitVSHMenu(SEConfig *conf, char *videoiso, int disctype);


#endif

Loading

0 comments on commit 9414590

Please sign in to comment.