Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

USBExtreme format extended: #485

Merged
merged 2 commits into from
Aug 17, 2021
Merged

USBExtreme format extended: #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7c1b77
Ignore non-valid entries in USBextreme game list
AKuHAK Aug 15, 2021
1c2c123
Added size calculation for USBExtreme games
AKuHAK Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions include/supportbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ typedef struct

typedef struct
{
char name[UL_GAME_NAME_MAX];
char startup[15];
u8 parts;
u8 media; // Disc type
u8 unknown[4];
u8 Byte08; // Always 0x08
u8 unknown2[10];
char name[UL_GAME_NAME_MAX]; // it is not a string but character array, terminating NULL is not necessary
char magic[3]; // magic string "ul."
char startup[GAME_STARTUP_MAX]; // it is not a string but character array, terminating NULL is not necessary
u8 parts; // slice count
u8 media; // Disc type
u8 unknown[4]; // Always zero
u8 Byte08; // Always 0x08
u8 unknown2[10]; // Always zero
} USBExtreme_game_entry_t;

int sbIsSameSize(const char *prefix, int prevSize);
Expand Down
62 changes: 40 additions & 22 deletions src/supportbase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,34 +403,53 @@ int sbReadList(base_game_info_t **list, const char *prefix, int *fsize, int *gam
snprintf(path, sizeof(path), "%sul.cfg", prefix);
fd = openFile(path, O_RDONLY);
if (fd >= 0) {
int ulcount;
USBExtreme_game_entry_t GameEntry;

if (count < 0)
count = 0;
size = getFileSize(fd);
*fsize = size;
count += size / sizeof(USBExtreme_game_entry_t);
ulcount = size / sizeof(USBExtreme_game_entry_t);

if (count > 0) {
if ((*list = (base_game_info_t *)malloc(sizeof(base_game_info_t) * count)) != NULL) {
memset(*list, 0, sizeof(base_game_info_t) * count);
if (ulcount > 0) {
if ((*list = (base_game_info_t *)malloc(sizeof(base_game_info_t) * ulcount)) != NULL) {
memset(*list, 0, sizeof(base_game_info_t) * ulcount);

while (size > 0) {
read(fd, &GameEntry, sizeof(USBExtreme_game_entry_t));

base_game_info_t *g = &(*list)[id++];

// to ensure no leaks happen, we copy manually and pad the strings
memcpy(g->name, GameEntry.name, UL_GAME_NAME_MAX);
g->name[UL_GAME_NAME_MAX] = '\0';
memcpy(g->startup, &GameEntry.startup[3], GAME_STARTUP_MAX);
g->startup[GAME_STARTUP_MAX] = '\0';
g->extension[0] = '\0';
g->parts = GameEntry.parts;
g->media = GameEntry.media;
g->format = GAME_FORMAT_USBLD;
g->sizeMB = -1;
size -= sizeof(USBExtreme_game_entry_t);

// populate game entry in list only if it has valid magic
if (!memcmp(GameEntry.magic, "ul.", 3)) {
int ulfd = 1;
u8 part;
unsigned int name_checksum;
base_game_info_t *g = &(*list)[id++];
count++;

// to ensure no leaks happen, we copy manually and pad the strings
memcpy(g->name, GameEntry.name, UL_GAME_NAME_MAX);
g->name[UL_GAME_NAME_MAX] = '\0';
memcpy(g->startup, GameEntry.startup, GAME_STARTUP_MAX);
g->startup[GAME_STARTUP_MAX] = '\0';
g->extension[0] = '\0';
g->parts = GameEntry.parts;
g->media = GameEntry.media;
g->format = GAME_FORMAT_USBLD;
g->sizeMB = 0;
name_checksum = USBA_crc32(g->name);

// calculate total size
for (part = 0; part < g->parts && ulfd >= 0; part++) {
snprintf(path, sizeof(path), "%sul.%08X.%s.%02x", prefix, name_checksum, g->startup, part);
ulfd = openFile(path, O_RDONLY);
if (ulfd >= 0) {
g->sizeMB += (getFileSize(ulfd) >> 20);
close(ulfd);
}
}
}
}
}
}
Expand Down Expand Up @@ -619,15 +638,15 @@ void sbRebuildULCfg(base_game_info_t **list, const char *prefix, int gamecount,

memset(&GameEntry, 0, sizeof(GameEntry));
GameEntry.Byte08 = 0x08; // just to be compatible with original ul.cfg
strcpy(GameEntry.startup, "ul.");
memcpy(GameEntry.magic, "ul.", 3);

for (i = 0; i < gamecount; i++) {
game = &(*list)[i];

if (game->format == GAME_FORMAT_USBLD && (i != excludeID)) {
memset(&GameEntry.startup[3], 0, GAME_STARTUP_MAX);
memcpy(GameEntry.startup, game->startup, GAME_STARTUP_MAX);
memcpy(GameEntry.name, game->name, UL_GAME_NAME_MAX);
strncpy(&GameEntry.startup[3], game->startup, GAME_STARTUP_MAX);
// don't fill last symbol with zero, cause trailing symbol can be useful character
GameEntry.parts = game->parts;
GameEntry.media = game->media;

Expand Down Expand Up @@ -702,8 +721,7 @@ config_set_t *sbPopulateConfig(base_game_info_t *game, const char *prefix, const
configRead(config); // Does not matter if the config file could be loaded or not.

configSetStr(config, CONFIG_ITEM_NAME, game->name);
if (game->sizeMB != -1)
configSetInt(config, CONFIG_ITEM_SIZE, game->sizeMB);
configSetInt(config, CONFIG_ITEM_SIZE, game->sizeMB);

configSetStr(config, CONFIG_ITEM_FORMAT, game->format != GAME_FORMAT_USBLD ? "ISO" : "UL");
configSetStr(config, CONFIG_ITEM_MEDIA, game->media == SCECdPS2CD ? "CD" : "DVD");
Expand Down
2 changes: 1 addition & 1 deletion src/system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ unsigned int USBA_crc32(const char *string)
do {
byte = string[count++];
crc = crctab[byte ^ ((crc >> 24) & 0xFF)] ^ ((crc << 8) & 0xFFFFFF00);
} while (string[count - 1] != 0);
} while ((string[count - 1] != 0) && (count <= 32));

return crc;
}
Expand Down