joel16/PSP-Everest
1
0
Fork 0
mirror of https://github.com/joel16/PSP-Everest.git synced 2024-11-26 21:10:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

console ID: Add PSID info and group product/product sub/factory info together

Browse Source
This commit is contained in:
Joel16 2022-07-23 21:41:51 -04:00
parent 31325709c3
commit 696dca9694
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -11,7 +11,7 @@ ASFLAGS = $(CFLAGS) -c
LDFLAGS = -nostdlib -nodefaultlibs
LIBDIR = libs/lib
STDLIBS = -lpspmodinfo -lpsprtc -lvlfgui -lvlfgu -lvlfutils -lvlflibc -lpsppower -lpspkubridge
STDLIBS = -lpspmodinfo -lpspopenpsid -lpsprtc -lvlfgui -lvlfgu -lvlfutils -lvlflibc -lpsppower -lpspkubridge
LIBS = $(STDLIBS) -lpspreg
EXTRA_TARGETS = EBOOT.PBP

8
include/consoleid_utils.h
View File

@ -1,8 +1,8 @@
#ifndef ___CONSOLEID_UTILS_H___
#define ___CONSOLEID_UTILS_H___
#pragma once
#include <pspopenpsid.h>
const char *pspGetProductCodeInfo(u16 productCode);
const char *pspGetProductSubCodeInfo(u16 productSubCode);
const char *pspGetFactoryCodeInfo(u16 factoryCode);
#endif
const char *pspGetPSID(PspOpenPSID *openpsid);

19
source/consoleid_utils.c
View File

@ -1,10 +1,13 @@
#include <pspsdk.h>
#include <stdio.h>
#include "consoleid_utils.h"
// Info from https://github.com/CelesteBlue-dev/PS-ConsoleId-wiki/blob/master/PS-ConsoleId-wiki.txt
const char *pspGetProductCodeInfo(u16 productCode) {
const char *product_codes[] = {
"Test - Prototype / Test unit",
"Test - Prototype / Test Unit",
"Tool - DevKit / Development Tool",
"DEX - TestKit / Testing Kit",
"CEX - Japan",
@ -48,7 +51,10 @@ const char *pspGetProductSubCodeInfo(u16 productSubCode) {
}
const char *pspGetFactoryCodeInfo(u16 factoryCode) {
if (factoryCode == 2) {
if (factoryCode == 0) {
return "Invalid: PSP Kicho & Dencho Program";
}
else if (factoryCode == 2) {
return "China manufacture 1 (01g)";
}
else if (factoryCode == 3) {
@ -66,3 +72,12 @@ const char *pspGetFactoryCodeInfo(u16 factoryCode) {
return "-";
}
const char *pspGetPSID(PspOpenPSID *openpsid) {
static char PSID[33];
for (int i = 0; i < 16; i++)
snprintf(&PSID[2 * i], 33, "%02X", openpsid->data[i]);
return PSID;
}

25
source/main.c
View File

@ -30,13 +30,13 @@ PSP_MAIN_THREAD_ATTR(0);
#define NUM_DEL_ITEMS_HARDWARE 19
#define NUM_DEL_ITEMS_BATTERY 14
#define NUM_DEL_ITEMS_SYSTEM 7
#define NUM_DEL_ITEMS_CONSOLEID 7
#define NUM_DEL_ITEMS_CONSOLEID 8
#define EVE_ENTER_EN "Enter"
#define EVE_BACK_EN "Back"
VlfText main_menu[NUM_DEL_ITEMS_MAIN], text_hardware[NUM_DEL_ITEMS_HARDWARE], text_battery[NUM_DEL_ITEMS_BATTERY],
text_system[NUM_DEL_ITEMS_SYSTEM], text_consoleId[NUM_DEL_ITEMS_SYSTEM], title_text;
text_system[NUM_DEL_ITEMS_SYSTEM], text_consoleId[NUM_DEL_ITEMS_CONSOLEID], title_text;
VlfPicture title_pic, pic_button_assign;
static int background_number = 0, max_background_number = 0;
@ -48,6 +48,7 @@ static u16 bserialdata[2], serialdata[2];
static u64 fuseid = 0;
static ScePsCode pscode = { 0 };
static char *vertxt = NULL;
static PspOpenPSID psid = { 0 };
int psp_model = 0, devkit = 0, language = 0;
s32 tachyon = 0, baryon = 0, pommel = 0, polestar = 0;
@ -326,16 +327,19 @@ void SystemInfo(void) {
}
void ConsoleIdInfo(void) {
text_consoleId[0] = pspEverestPrintf(10, 70, "Company Code: %d", pscode.companyCode);
text_consoleId[1] = pspEverestPrintf(10, 90, "Factory Code: %d", pscode.factoryCode);
text_consoleId[2] = pspEverestPrintf(237, 70, "Product Code: 0x%04X", pscode.productCode);
text_consoleId[3] = pspEverestPrintf(237, 90, "Product Sub Code: 0x%04X", pscode.productSubCode);
text_consoleId[0] = pspEverestPrintf(10, 40, "PSID: %s", pspGetPSID(&psid));
text_consoleId[4] = pspEverestPrintf(10, 120, "Product: %s", pspGetProductCodeInfo(pscode.productCode));
text_consoleId[5] = pspEverestPrintf(10, 140, "Product Sub: %s", pspGetProductSubCodeInfo(pscode.productSubCode));
text_consoleId[6] = pspEverestPrintf(10, 160, "Factory: %s", pspGetFactoryCodeInfo(pscode.factoryCode));
text_consoleId[1] = pspEverestPrintf(10, 60, "Company Code: %d", pscode.companyCode);
text_consoleId[2] = pspEverestPrintf(10, 90, "Factory Code: %d", pscode.factoryCode);
text_consoleId[3] = pspEverestPrintf(10, 110, pspGetFactoryCodeInfo(pscode.factoryCode));
text_consoleId[4] = pspEverestPrintf(10, 140, "Product Code: 0x%04X", pscode.productCode);
text_consoleId[5] = pspEverestPrintf(10, 160, pspGetProductCodeInfo(pscode.productCode));
text_consoleId[6] = pspEverestPrintf(10, 190, "Product Sub Code: 0x%04X", pscode.productSubCode);
text_consoleId[7] = pspEverestPrintf(10, 210, pspGetProductSubCodeInfo(pscode.productSubCode));
vlfGuiSetTextFontSize(text_consoleId[6], 0.75f);
SetBottomDialog(0, 1, ExitInMainMenuConsoleIdInfo, 1);
SetFade();
}
@ -407,6 +411,7 @@ int app_main(int argc, char *argv[]) {
devkit = sceKernelDevkitVersion();
pspGetInitialFW(initial_fw);
pspChkregGetPsCode(&pscode);
sceOpenPSIDGetOpenPSID(&psid);
GetRegistryValue("/CONFIG/SYSTEM/XMB", "button_assign", &button_assign, 4, 1);
vertxt = pspGetVersionTxt();