From c891b37df88a5b71992c04bba399cd5ce4a5b57b Mon Sep 17 00:00:00 2001 From: Aldo Vargas Date: Fri, 1 Jul 2016 10:33:30 -0400 Subject: [PATCH] webMAN MOD 1.43.30 * Sort titles on XMB using the first letter of the 2nd word. * Added an arrow to go to the top of the html pages. --- cobra/scsi.h | 116 +++++------ cobra/storage.h | 8 +- include/games_xml.h | 16 +- main.c | 3 +- ... 20150203.zip => ps3netsrv-- 20160420.zip} | Bin 56665 -> 56679 bytes updater/Makefile | 2 +- updater/pkgfiles/USRDIR/mobile.html | 2 +- updater/pkgfiles/USRDIR/webftp_server.sprx | Bin 129416 -> 129448 bytes .../pkgfiles/USRDIR/webftp_server_ccapi.sprx | Bin 103346 -> 103394 bytes .../USRDIR/webftp_server_english.sprx | Bin 123676 -> 123734 bytes .../pkgfiles/USRDIR/webftp_server_full.sprx | Bin 156093 -> 156153 bytes .../pkgfiles/USRDIR/webftp_server_lite.sprx | Bin 86381 -> 86485 bytes .../USRDIR/webftp_server_noncobra.sprx | Bin 103864 -> 103915 bytes .../USRDIR/webftp_server_ps3mapi.sprx | Bin 145183 -> 145176 bytes .../webftp_server_rebug_cobra_english.sprx | Bin 125070 -> 125130 bytes .../webftp_server_rebug_cobra_multi23.sprx | Bin 130971 -> 131032 bytes .../webftp_server_rebug_cobra_ps3mapi.sprx | Bin 146881 -> 146930 bytes wm_url_launcher/ICON0.PNG | Bin 0 -> 40493 bytes wm_url_launcher/Makefile | 193 ++++++++++++++++++ wm_url_launcher/_make.exe | Bin 0 -> 73728 bytes wm_url_launcher/main.c | 135 ++++++++++++ 21 files changed, 404 insertions(+), 71 deletions(-) rename ps3netsrv/bins/old/macOS/{ps3netsrv-- 20150203.zip => ps3netsrv-- 20160420.zip} (84%) create mode 100644 wm_url_launcher/ICON0.PNG create mode 100644 wm_url_launcher/Makefile create mode 100644 wm_url_launcher/_make.exe create mode 100644 wm_url_launcher/main.c diff --git a/cobra/scsi.h b/cobra/scsi.h index f1d83e73b..e50f18ed1 100644 --- a/cobra/scsi.h +++ b/cobra/scsi.h @@ -1,54 +1,54 @@ #ifndef __SCSI_H__ #define __SCSI_H__ -#define SCSI_CMD_TEST_UNIT_READY 0x00 -#define SCSI_CMD_REQUEST_SENSE 0x03 -#define SCSI_CMD_FORMAT_UNIT 0x04 -#define SCSI_CMD_FORMAT_INQUIRY 0x12 -#define SCSI_CMD_START_STOP_UNIT 0x1B +#define SCSI_CMD_TEST_UNIT_READY 0x00 +#define SCSI_CMD_REQUEST_SENSE 0x03 +#define SCSI_CMD_FORMAT_UNIT 0x04 +#define SCSI_CMD_FORMAT_INQUIRY 0x12 +#define SCSI_CMD_START_STOP_UNIT 0x1B #define SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1E -#define SCSI_CMD_READ_FORMAT_CAPACITIES 0x23 -#define SCSI_CMD_READ_CAPACITY 0x25 -#define SCSI_CMD_READ_10 0x28 -#define SCSI_CMD_WRITE_10 0x2A -#define SCSI_CMD_SEEK_10 0x2B -#define SCSI_CMD_WRITE_AND_VERIFY_10 0x2E -#define SCSI_CMD_VERIFY_10 0x2F -#define SCSI_CMD_SYNCHRONIZE_CACHE 0x35 -#define SCSI_CMD_WRITE_BUFFER 0x3B -#define SCSI_CMD_READ_BUFFER 0x3C -#define SCSI_CMD_READ_TOC_PMA_ATIP 0x43 -#define SCSI_CMD_GET_CONFIGURATION 0x46 +#define SCSI_CMD_READ_FORMAT_CAPACITIES 0x23 +#define SCSI_CMD_READ_CAPACITY 0x25 +#define SCSI_CMD_READ_10 0x28 +#define SCSI_CMD_WRITE_10 0x2A +#define SCSI_CMD_SEEK_10 0x2B +#define SCSI_CMD_WRITE_AND_VERIFY_10 0x2E +#define SCSI_CMD_VERIFY_10 0x2F +#define SCSI_CMD_SYNCHRONIZE_CACHE 0x35 +#define SCSI_CMD_WRITE_BUFFER 0x3B +#define SCSI_CMD_READ_BUFFER 0x3C +#define SCSI_CMD_READ_TOC_PMA_ATIP 0x43 +#define SCSI_CMD_GET_CONFIGURATION 0x46 #define SCSI_CMD_GET_EVENT_STATUS_NOTIFICATION 0x4A -#define SCSI_CMD_READ_DISC_INFORMATION 0x51 -#define SCSI_CMD_READ_TRACK_INFORMATION 0x52 -#define SCSI_CMD_RESERVE_TRACK 0x53 -#define SCSI_CMD_SEND_OPC_INFORMATION 0x54 -#define SCSI_CMD_MODE_SELECT_10 0x55 -#define SCSI_CMD_REPAIR_TRACK 0x58 -#define SCSI_CMD_MODE_SENSE_10 0x5A -#define SCSI_CMD_CLOSE_TRACK_SESSION 0x5B -#define SCSI_CMD_READ_BUFFER_CAPACITY 0x5C -#define SCSI_CMD_SEND_CUE_SHEET 0x5D -#define SCSI_CMD_REPORT_LUNS 0xA0 -#define SCSI_CMD_BLANK 0xA1 -#define SCSI_CMD_SECURITY_PROTOCOL_IN 0xA2 -#define SCSI_CMD_SEND_KEY 0xA3 -#define SCSI_CMD_REPORT_KEY 0xA4 -#define SCSI_CMD_LOAD_UNLOAD_MEDIUM 0xA6 -#define SCSI_CMD_SET_READ_AHEAD 0xA7 -#define SCSI_CMD_READ_12 0xA8 -#define SCSI_CMD_WRITE_12 0xAA -#define SCSI_CMD_READ_MEDIA_SERIAL_NUMBER 0xAB -#define SCSI_CMD_GET_PERFORMANCE 0xAC -#define SCSI_CMD_READ_DISC_STRUCTURE 0xAD -#define SCSI_CMD_SECURITY_PROTOCOL_OUT 0xB5 -#define SCSI_CMD_SET_STREAMING 0xB6 -#define SCSI_CMD_READ_CD_MSF 0xB9 -#define SCSI_CMD_SET_CD_SPEED 0xBB -#define SCSI_CMD_MECHANISM_STATUS 0xBD -#define SCSI_CMD_READ_CD 0xBE -#define SCSI_CMD_SEND_DISC_STRUCTURE 0xBF +#define SCSI_CMD_READ_DISC_INFORMATION 0x51 +#define SCSI_CMD_READ_TRACK_INFORMATION 0x52 +#define SCSI_CMD_RESERVE_TRACK 0x53 +#define SCSI_CMD_SEND_OPC_INFORMATION 0x54 +#define SCSI_CMD_MODE_SELECT_10 0x55 +#define SCSI_CMD_REPAIR_TRACK 0x58 +#define SCSI_CMD_MODE_SENSE_10 0x5A +#define SCSI_CMD_CLOSE_TRACK_SESSION 0x5B +#define SCSI_CMD_READ_BUFFER_CAPACITY 0x5C +#define SCSI_CMD_SEND_CUE_SHEET 0x5D +#define SCSI_CMD_REPORT_LUNS 0xA0 +#define SCSI_CMD_BLANK 0xA1 +#define SCSI_CMD_SECURITY_PROTOCOL_IN 0xA2 +#define SCSI_CMD_SEND_KEY 0xA3 +#define SCSI_CMD_REPORT_KEY 0xA4 +#define SCSI_CMD_LOAD_UNLOAD_MEDIUM 0xA6 +#define SCSI_CMD_SET_READ_AHEAD 0xA7 +#define SCSI_CMD_READ_12 0xA8 +#define SCSI_CMD_WRITE_12 0xAA +#define SCSI_CMD_READ_MEDIA_SERIAL_NUMBER 0xAB +#define SCSI_CMD_GET_PERFORMANCE 0xAC +#define SCSI_CMD_READ_DISC_STRUCTURE 0xAD +#define SCSI_CMD_SECURITY_PROTOCOL_OUT 0xB5 +#define SCSI_CMD_SET_STREAMING 0xB6 +#define SCSI_CMD_READ_CD_MSF 0xB9 +#define SCSI_CMD_SET_CD_SPEED 0xBB +#define SCSI_CMD_MECHANISM_STATUS 0xBD +#define SCSI_CMD_READ_CD 0xBE +#define SCSI_CMD_SEND_DISC_STRUCTURE 0xBF enum DvdBookType { @@ -62,7 +62,7 @@ enum DvdBookType BOOKTYPE_DVDPRW = 9, BOOKTYPE_DVDPR, BOOKTYPE_DVDPRWDL = 13, - BOOKTYPE_DVDPRDL + BOOKTYPE_DVDPRDL }; typedef struct _ScsiCmdTestUnitReady @@ -72,7 +72,7 @@ typedef struct _ScsiCmdTestUnitReady uint8_t control; } __attribute__((packed)) ScsiCmdTestUnitReady; -enum +enum { FORMAT_TOC, FORMAT_SESSION_INFO, @@ -90,7 +90,7 @@ typedef struct _ScsiCmdReadTocPmaAtip uint8_t reserved[3]; uint8_t track_session_num; uint16_t alloc_length; - uint8_t control; + uint8_t control; } __attribute__((packed)) ScsiCmdReadTocPmaAtip; typedef struct _ScsiTocResponse @@ -217,7 +217,7 @@ typedef struct _ScsiReadDiscStructureFormat0Response uint8_t end_sector[3]; uint8_t zero3; uint8_t sector_num_layer0[3]; - uint8_t reserved2; + uint8_t reserved2; } __attribute__((packed)) ScsiReadDiscStructureFormat0Response; static inline void lba_to_msf(uint64_t lba, uint8_t *m, uint8_t *s, uint8_t *f) @@ -229,7 +229,7 @@ static inline void lba_to_msf(uint64_t lba, uint8_t *m, uint8_t *s, uint8_t *f) static inline uint64_t msf_to_lba(uint8_t m, uint8_t s, uint8_t f) { - uint64_t lba = m; + uint64_t lba = m; lba = (lba*60)+s; lba = (lba*75)+f; return lba; @@ -239,7 +239,7 @@ static inline uint64_t msf_to_lba(uint8_t m, uint8_t s, uint8_t f) static const char *get_scsi_cmd_name(uint8_t cmd) __attribute__((unused)); -static const char *get_scsi_cmd_name(uint8_t cmd) +static const char *get_scsi_cmd_name(uint8_t cmd) { static const char *cmd_str[0x100] = { @@ -260,7 +260,7 @@ static const char *get_scsi_cmd_name(uint8_t cmd) NULL, NULL, NULL, /* 0x10 */ - NULL, + NULL, "INQUIRY", NULL, NULL, @@ -290,7 +290,7 @@ static const char *get_scsi_cmd_name(uint8_t cmd) NULL, NULL, "WRITE AND VERIFY (10)", - "VERIFY (10)", + "VERIFY (10)", NULL, /* 0x30 */ NULL, NULL, @@ -354,7 +354,7 @@ static const char *get_scsi_cmd_name(uint8_t cmd) NULL, NULL, NULL, - NULL, + NULL, NULL, /* 0x70 */ NULL, NULL, @@ -424,7 +424,7 @@ static const char *get_scsi_cmd_name(uint8_t cmd) NULL, NULL, NULL, - "SECUIRTY PROTOCOL OUT", + "SECUIRTY PROTOCOL OUT", "SET STREAMING", NULL, NULL, @@ -498,9 +498,9 @@ static const char *get_scsi_cmd_name(uint8_t cmd) NULL, NULL, NULL, - NULL, + NULL, }; - + return cmd_str[cmd]; } diff --git a/cobra/storage.h b/cobra/storage.h index 87cd782ab..5a3382591 100644 --- a/cobra/storage.h +++ b/cobra/storage.h @@ -18,15 +18,15 @@ extern "C" { #define MAX_PATH 0x420 -#define ATA_HDD 0x101000000000007ULL -#define BDVD_DRIVE 0x101000000000006ULL +#define ATA_HDD 0x101000000000007ULL +#define BDVD_DRIVE 0x101000000000006ULL #define PATA0_HDD_DRIVE 0x101000000000008ULL #define PATA0_BDVD_DRIVE BDVD_DRIVE #define PATA1_HDD_DRIVE ATA_HDD #define PATA1_BDVD_DRIVE 0x101000000000009ULL #define BUILTIN_FLASH 0x100000000000001ULL #define MEMORY_STICK 0x103000000000010ULL -#define SD_CARD 0x103000100000010ULL +#define SD_CARD 0x103000100000010ULL #define COMPACT_FLASH 0x103000200000010ULL #define USB_MASS_STORAGE_1(n) (0x10300000000000AULL+n) /* For 0-5 */ @@ -42,7 +42,7 @@ extern "C" { #define DEVICE_TYPE_PSX_CD 0xFF50 #define DEVICE_TYPE_BDROM 0x40 #define DEVICE_TYPE_BDMR_SR 0x41 /* Sequential record */ -#define DEVICE_TYPE_BDMR_RR 0x42 /* Random record */ +#define DEVICE_TYPE_BDMR_RR 0x42 /* Random record */ #define DEVICE_TYPE_BDMRE 0x43 #define DEVICE_TYPE_DVD 0x10 /* DVD-ROM, DVD+-R, DVD+-RW etc, they are differenced by booktype field in some scsi command */ #define DEVICE_TYPE_CD 0x08 /* CD-ROM, CD-DA, CD-R, CD-RW, etc, they are differenced somehow with scsi commands */ diff --git a/include/games_xml.h b/include/games_xml.h index a759e1bf3..90b12935a 100644 --- a/include/games_xml.h +++ b/include/games_xml.h @@ -77,10 +77,9 @@ static void add_launchpad_entry(char *tempstr, char *templn, const char *url, ch sprintf(tempstr, "\n" "%s\n" "%s/%s%s\n" - "%s\n", (1080000000UL + mtrl_items), templn, LAUNCHPAD_COVER_SVR, tempID, strstr(tempID, ".png") ? "" : ".JPG", url); - - strcat(tempstr, "all\n" - "all\n\n"); + "%s\n" + "all\n" + "all\n\n", (1080000000UL + mtrl_items), templn, LAUNCHPAD_COVER_SVR, tempID, strstr(tempID, ".png") ? "" : ".JPG", url); uint64_t size = strlen(tempstr); cellFsWrite(fd, tempstr, size, &size); @@ -148,8 +147,13 @@ static bool add_xmb_entry(u8 f0, u8 f1, char *param, char *tempstr, char *templn if(p) {if(ISDIGIT(p[2])) skey[6]=p[2]; if(ISDIGIT(p[3])) skey[6]=p[3];} // sort by CD# else { - u16 tlen = strlen(templn), i = 5; if(tlen > 64) tlen = 64; - while(i < tlen) {if(ISDIGIT(templn[i])) {skey[6]=templn[i]; break;} else i++;} // sort by game number (if possible) + u16 tlen = strlen(templn); if(tlen > 64) tlen = 64; + for(u16 i = 5; i < tlen; i++) + { + if(templn[i+1]=='[') break; + if(templn[i]==' ') {skey[6]=templn[++i]; break;} // sort by 2nd word + //if(ISDIGIT(templn[i])) {skey[6]=templn[i]; break;} // sort by game number (if possible) + } } u16 xlen = strlen(tempstr); diff --git a/main.c b/main.c index 87777892e..0484dddd6 100644 --- a/main.c +++ b/main.c @@ -102,7 +102,7 @@ SYS_MODULE_STOP(wwwd_stop); #define ORG_LIBFS_PATH "/dev_flash/sys/external/libfs.sprx" #define NEW_LIBFS_PATH "/dev_hdd0/tmp/libfs.sprx" -#define WM_VERSION "1.43.29 MOD" // webMAN version +#define WM_VERSION "1.43.30 MOD" // webMAN version #define MM_ROOT_STD "/dev_hdd0/game/BLES80608/USRDIR" // multiMAN root folder #define MM_ROOT_SSTL "/dev_hdd0/game/NPEA00374/USRDIR" // multiman SingStar® Stealth root folder #define MM_ROOT_STL "/dev_hdd0/tmp/game_repo/main" // stealthMAN root folder @@ -699,6 +699,7 @@ static void prepare_html(char *buffer, char *templn, char *param, u8 is_ps3_http strcat(buffer, "" "" + "
▲
" ""); #ifndef ENGLISH_ONLY diff --git a/ps3netsrv/bins/old/macOS/ps3netsrv-- 20150203.zip b/ps3netsrv/bins/old/macOS/ps3netsrv-- 20160420.zip similarity index 84% rename from ps3netsrv/bins/old/macOS/ps3netsrv-- 20150203.zip rename to ps3netsrv/bins/old/macOS/ps3netsrv-- 20160420.zip index bc3a7033c18557d70c5779bfc4e6a920b376a4cc..5036de4fc44c23ac0bc09ca4ff3bf5d906aa67e4 100644 GIT binary patch delta 5892 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 diff --git a/updater/Makefile b/updater/Makefile index 10dd6eca9..7da8576e5 100644 --- a/updater/Makefile +++ b/updater/Makefile @@ -22,7 +22,7 @@ DATA := data INCLUDES := include PKGFILES := $(CURDIR)/pkgfiles -TITLE := webMAN MOD 1.43.29 Updater [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition] +TITLE := webMAN MOD 1.43.30 Updater [Hold R1 for VSH Menu, L1 for Full Edition, X for Lite Edition] APPID := UPDWEBMOD CONTENTID := EP0001-$(APPID)_00-0000000000000000 diff --git a/updater/pkgfiles/USRDIR/mobile.html b/updater/pkgfiles/USRDIR/mobile.html index 30d014456..7af71b47f 100644 --- a/updater/pkgfiles/USRDIR/mobile.html +++ b/updater/pkgfiles/USRDIR/mobile.html @@ -1962,7 +1962,7 @@