Skip to content

Commit

Permalink
webMAN MOD 1.47.43
Browse files Browse the repository at this point in the history 
- Added detection of 4.89.3 PEX (DEX mode)
- Fixed issue with noBD patches applied at startup on CFW noBD
  • Loading branch information
@aldostools
aldostools committed Feb 1, 2023
1 parent 133c00f commit 730044f
Show file tree
Hide file tree
Showing 24 changed files with 49 additions and 27 deletions.
2 changes: 1 addition & 1 deletion _Make_pkg.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ call make_update.bat
rd custom

set ver=1.47
set rev=42
set rev=43

move webMAN_MOD_%ver%.xx_Updater.pkg ..\..\webMAN_MOD_%ver%.%rev%_Installer.pkg
move webMAN_MOD_%ver%.xx_Updater_rebugification_theme.pkg ..\..\webMAN_MOD_%ver%.%rev%_Installer_rebugification_theme.pkg
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DATA := data
INCLUDES := include
PKGFILES := $(CURDIR)/pkgfiles

TITLE := webMAN MOD 1.47.42 Installer [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition]
TITLE := webMAN MOD 1.47.43 Installer [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition]
APPID := UPDWEBMOD
CONTENTID := EP0001-$(APPID)_00-0000000000000000

Expand Down
Binary file modified _Projects_/updater/pkgfiles/PARAM.SFO
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/fs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function t2lnks(){
var dev2 =/(\/\b(dev_+.*))/ig;
var htab = txt.innerHTML.indexOf("\t") > 0;
var count = txt.innerHTML.split("\n").length - 1;
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.42</a><HR>"+
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.43</a><HR>"+
"<style>td+td{width:100px;}</style><table>" +
txt.innerHTML
.replace(url, "<tr><td><a href='$1'>$1</td></tr>")
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/help.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/mobile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@
</div>

<div id="menu" style="display:none;">
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.42</a></div>
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.43</a></div>
<div id="wrapper-menu">
<div id="scroller">
<ul id="thelist">
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/pkgfiles/USRDIR/html/sman.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<head>
<title>wMAN MOD 1.47.42</title>
<title>wMAN MOD 1.47.43</title>
<link rel="stylesheet" type="text/css" href="/dev_hdd0/xmlhost/game_plugin/sman.css"/>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery.min.js"></script>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery-ui.min.js"></script>
Expand Down
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
View file
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx
View file
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
View file
Binary file not shown.
Binary file modified _Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions _Projects_/updater/pkgfiles/USRDIR/xml/wm_apps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<A>
<T key="app002_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230108.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230108.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230130.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230130.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>CUSTOM-PS2CONFIG_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand Down
4 changes: 2 additions & 2 deletions _Projects_/updater/update/dev_hdd0/game/XMBMANPLS/USRDIR/FEATURES/wm_apps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<A>
<T key="app002_link">
<P key="info"><>net_package_install</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230108.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230108.pkg</></P>
<P key="pkg_src"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230130.pkg</></P>
<P key="pkg_src_qa"><>https://github.com/aldostools/webMAN-MOD/releases/download/1.47.42/PS2CONFIG_20230130.pkg</></P>
<P key="content_name"><>msg_install</></P>
<P key="content_id"><>CUSTOM-PS2CONFIG_00-0000000000000000</></P>
<P key="prod_pict_path"><>/dev_hdd0//game/XMBMANPLS/USRDIR/IMAGES/package.png</></P>
Expand Down
Binary file modified _Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx
View file
Binary file not shown.
Binary file modified _Projects_/updater/update/dev_hdd0/plugins/webftp_server_lite.sprx
View file
Binary file not shown.
Binary file modified _Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion _Projects_/updater/update/dev_hdd0/xmlhost/game_plugin/fs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function t2lnks(){
var dev2 =/(\/\b(dev_+.*))/ig;
var htab = txt.innerHTML.indexOf("\t") > 0;
var count = txt.innerHTML.split("\n").length - 1;
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.42</a><HR>"+
txt.innerHTML = "<a href='/'><b>webMAN MOD</b> 1.47.43</a><HR>"+
"<style>td+td{width:100px;}</style><table>" +
txt.innerHTML
.replace(url, "<tr><td><a href='$1'>$1</td></tr>")
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/update/dev_hdd0/xmlhost/game_plugin/help.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _Projects_/updater/update/dev_hdd0/xmlhost/game_plugin/mobile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@
</div>

<div id="menu" style="display:none;">
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.42</a></div>
<div id="header"><a id="nav-close" href="javascript:void(0)" onclick="hideMenu();"><span style="position:absolute;left:10px">&#9664;</span> webMAN MOD 1.47.43</a></div>
<div id="wrapper-menu">
<div id="scroller">
<ul id="thelist">
Expand Down
2 changes: 1 addition & 1 deletion _Projects_/updater/update/dev_hdd0/xmlhost/game_plugin/sman.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<head>
<title>wMAN MOD 1.47.42</title>
<title>wMAN MOD 1.47.43</title>
<link rel="stylesheet" type="text/css" href="/dev_hdd0/xmlhost/game_plugin/sman.css"/>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery.min.js"></script>
<script src="/dev_hdd0/xmlhost/game_plugin/jquery-ui.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion include/cmd/nobd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

if(!param[9] || param[10])
{
apply_noBD_patches(noBD);
apply_noBD_patches(noBD, false);
}

_concat2(&sbuffer, "noBD: ", noBD ? STR_ENABLED : STR_DISABLED);
Expand Down
40 changes: 31 additions & 9 deletions include/init/firmware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static u64 sc_142 = 0;
#define FW487 0x323032302F30372FULL // 2020/07/
#define FW488 0x323032312F30342FULL // 2021/04/
#define FW489 0x323032322F30322FULL // 2022/02/
#define FW489P 0x323032332F30312FULL // 2023/01/ # Ported 4.84 in 4.89.3 Evilnat

#define SC_GET_PLATFORM_INFO (387)
#define SC_GET_CONSOLE_TYPE (985)
Expand Down Expand Up @@ -148,6 +149,7 @@ static void detect_firmware(void)

#ifdef DEX_SUPPORT
if(peek(0x30F3B0) == DEX) {SYSCALL_TABLE = SYSCALL_TABLE_481D; c_firmware = (peek(0x31F028) == FW484) ? 4.84f :
(peek(0x31F028) == FW489P)? 4.89f : // Ported 4.84 in 4.89.3 Evilnat
#ifndef LAST_FIRMWARE_ONLY
(peek(0x31F028) == FW489) ? 4.89f :
(peek(0x31F028) == FW488) ? 4.88f :
Expand Down Expand Up @@ -474,19 +476,39 @@ static void detect_firmware(void)
}

#ifdef NOBD_PATCH
static void apply_noBD_patches(u8 noBD)
static void apply_noBD_patches(u8 noBD, u8 from_boot)
{
// noBD LV1 4.75 - 4.89
if(ALLOW_NOBD)
{
//00712790 78 84 00 20 F8 01 00 70 F9 21 00 78 40 9E 00 0C
poke_lv1(0x712798ULL, noBD ? 0xF921007860000000ULL : 0xF9210078409E000CULL);
//00712890 F9 21 00 78 40 9D 00 14 E8 62 96 08 E8 BF 00 40
poke_lv1(0x712890ULL, noBD ? 0xF921007860000000ULL : 0xF9210078409D0014ULL);
//00712C10 2F BF 00 A7 41 9E 00 0C 2F BF 00 A5 40 9E 00 54
poke_lv1(0x712C18ULL, noBD ? 0x2FBF00A560000000ULL : 0x2FBF00A5409E0054ULL);
//00714BE0 78 63 00 20 40 9E 00 18 E8 01 00 90 EB E1 00 78
poke_lv1(0x714BE0ULL, noBD ? 0x7863002060000000ULL : 0x78630020409E0018ULL);
if(noBD && peek_lv1(0x712798ULL) == 0xF9210078409E000CULL)
{
// apply noBD patches on normal CFW

//00712790 78 84 00 20 F8 01 00 70 F9 21 00 78 40 9E 00 0C
poke_lv1(0x712798ULL, 0xF921007860000000ULL);
//00712890 F9 21 00 78 40 9D 00 14 E8 62 96 08 E8 BF 00 40
poke_lv1(0x712890ULL, 0xF921007860000000ULL);
//00712C10 2F BF 00 A7 41 9E 00 0C 2F BF 00 A5 40 9E 00 54
poke_lv1(0x712C18ULL, 0x2FBF00A560000000ULL);
//00714BE0 78 63 00 20 40 9E 00 18 E8 01 00 90 EB E1 00 78
poke_lv1(0x714BE0ULL, 0x7863002060000000ULL);
}
else if(peek_lv1(0x712798ULL) == 0xF921007860000000ULL)
{
if(from_boot) return; // skip if booting a noBD CFW

// revert noBD patches

//00712790 78 84 00 20 F8 01 00 70 F9 21 00 78 40 9E 00 0C
poke_lv1(0x712798ULL, 0xF9210078409E000CULL);
//00712890 F9 21 00 78 40 9D 00 14 E8 62 96 08 E8 BF 00 40
poke_lv1(0x712890ULL, 0xF9210078409D0014ULL);
//00712C10 2F BF 00 A7 41 9E 00 0C 2F BF 00 A5 40 9E 00 54
poke_lv1(0x712C18ULL, 0x2FBF00A5409E0054ULL);
//00714BE0 78 63 00 20 40 9E 00 18 E8 01 00 90 EB E1 00 78
poke_lv1(0x714BE0ULL, 0x78630020409E0018ULL);
}
}
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/setup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static void setup_parse_settings(char *param)
disable_dev_blind();

#ifdef NOBD_PATCH
webman_config->noBD = IS_MARKED("bd=1"); apply_noBD_patches(webman_config->noBD);
webman_config->noBD = IS_MARKED("bd=1"); apply_noBD_patches(webman_config->noBD, false);
#endif

webman_config->root = IS_UNMARKED("rt=1");
Expand Down
4 changes: 2 additions & 2 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ SYS_MODULE_STOP(wwwd_stop);
SYS_MODULE_EXIT(wwwd_stop);

#define WM_APPNAME "webMAN"
#define WM_VERSION "1.47.42 MOD"
#define WM_VERSION "1.47.43 MOD"
#define WM_APP_VERSION WM_APPNAME " " WM_VERSION
#define WEBMAN_MOD WM_APPNAME " MOD"

Expand Down Expand Up @@ -517,7 +517,7 @@ static void wwwd_thread(u64 arg)
}

#ifdef NOBD_PATCH
apply_noBD_patches(webman_config->noBD);
apply_noBD_patches(webman_config->noBD, true);
#endif

#ifdef WM_REQUEST
Expand Down

0 comments on commit 730044f

Please sign in to comment.