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

@@ -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];
 }
 

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 */

include/games_xml.h

@@ -77,10 +77,9 @@ static void add_launchpad_entry(char *tempstr, char *templn, const char *url, ch
 		sprintf(tempstr, "<mtrl id=\"%lu\" until=\"2100-12-31T23:59:00.000Z\">\n"
 						 "<desc>%s</desc>\n"
 						 "<url type=\"2\">%s/%s%s</url>\n"
-						 "<target type=\"u\">%s</target>\n", (1080000000UL + mtrl_items), templn, LAUNCHPAD_COVER_SVR, tempID, strstr(tempID, ".png") ? "" : ".JPG", url);
-
-		strcat(tempstr, "<cntry agelmt=\"0\">all</cntry>\n"
-						"<lang>all</lang></mtrl>\n\n");
+						 "<target type=\"u\">%s</target>\n"
+						 "<cntry agelmt=\"0\">all</cntry>\n"
+						 "<lang>all</lang></mtrl>\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);

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,	"</head>"
 					"<body bgcolor=\"#101010\">"
+					"<div style=\"position:fixed;right:20px;bottom:10px;opacity:0.2\"><a href=\"#Top\">&#9650;</a></div>"
 					"<font face=\"Courier New\"><b>");
 
 #ifndef ENGLISH_ONLY

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
 

updater/pkgfiles/USRDIR/mobile.html

@@ -1962,7 +1962,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.43.29</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.43.30</a></div>
 	<div id="wrapper-menu">
 		<div id="scroller">
 			<ul id="thelist">