.gitignore

@@ -38,7 +38,7 @@
 *.PBP
 app/*.prx
 app/*.SFO
-app/data/everest_kernel.prx
+app/data/kernel.prx
 app/data/kumdman.prx
 
 # Debug files

Makefile

@@ -1,4 +1,4 @@
-SUBDIRS = plugin/everest_kernel plugin/kumdman app
+SUBDIRS = plugin/kernel plugin/kumdman app
 
 all:
 	@for dir in $(SUBDIRS); do $(MAKE) -C $$dir; done

README.md

@@ -0,0 +1,36 @@
+# PSP Everest 2, frostegater and Joel16
+
+# Description:
+PSP Everest is an application similar to PSPident that displays more information about your PSP Console, using the native PSP UI (VLF). This is a mod of the original PSP Everest 2 by frostegater. This application has been built with the latest toolchain with major changes to display various new info and fix a few bugs.
+
+# Changes PSP Everest 2 Rev 6 + (forked version)
+- Built with the latest toolchain, with upstream GCC and newlib patches.
+- New Console ID Information page:
+  - Display PSID.
+  - Display company code.
+  - Display factory code and info.
+  - Display product code and info.
+  - Display product sub code and info.
+- Battery Information page now displays the following information:
+  - Display battery elec value
+  - Display battery total elec value
+- Display polestar version in Hardware Information page.
+- Identify TMU-00X, TA-079v1-v5, TA-095v3, TA-095v4 and TA-097 motherboards.
+- Display QA flag in Hardware Information page.
+- Fix static title bar colour when changing background colours with L/R.
+- Make use of VLFlib's central menu instead of hard coding positions for the main menu.
+- Major code clean-up, eliminated all warnings, prevent overflows, limiting buffer lenghts etc.
+
+# Credits:
+frostegater, jas0nuk, Yoti, raing3, Total_Noob, some1, m0skit0, TyRaNiD, ErikPshat, vit9696, rewind83 and psdevwiki contributors.
+
+# Tested:
+- PSP-E1000 (TA-096)
+- PSP-N1000 (TA-091)
+- PSP-1000 (TA-081)
+- PSP-2000 (TA-085v1)
+- PSP-2000 (TA-088v1/v2)
+- PSP-3000 (TA-090v2)
+
+# License:
+- GPLv3 (for more information use gpl-v3.txt in 'src' directory)

app/Makefile

@@ -2,26 +2,28 @@ TARGET = EVEREST
 
 SOURCES   := data drivers source
 CFILES    := $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.c))
+CPPFILES  := $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.cpp))
 SFILES    := $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.S))
 GFXFILES  := $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.bmp))
 PRXFILES  := $(foreach dir, $(SOURCES), $(wildcard $(dir)/*.prx))
 
-OBJS := $(addsuffix .o,$(BINFILES)) $(CFILES:.c=.o) $(SFILES:.S=.o) $(GFXFILES:.bmp=.o) $(PRXFILES:.prx=.o)
+OBJS := $(addsuffix .o,$(BINFILES)) $(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(SFILES:.S=.o) \
+        $(GFXFILES:.bmp=.o) $(PRXFILES:.prx=.o)
 
 INCDIR   = ../libs/ ../libs/include include
-CFLAGS = -O2 -G0 -Wall -fshort-wchar -fno-pic -mno-check-zero-division 
-CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
+CFLAGS = -O2 -G0 -Wall -fshort-wchar -fno-pic -mno-check-zero-division
+CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -std=gnu++17
 ASFLAGS = $(CFLAGS) -c
 
 BUILD_PRX = 1
 PSP_LARGE_MEMORY = 1
 
 LIBDIR  = ../libs/lib
 LDFLAGS = -nostdlib -nodefaultlibs
-LIBS = -lpspmodinfo -lpspopenpsid -lpsprtc -lpsppower -lpspreg -lpspkubridge -lvlfgui -lvlfgu -lvlfutils -lvlflibc
+LIBS = -lpspmodinfo -lpspopenpsid -lpsprtc -lpsppower -lpspreg -lvlfgui -lvlfgu -lvlfutils -lvlflibc
 
 EXTRA_TARGETS = EBOOT.PBP
-PSP_EBOOT_TITLE = PSP EVEREST 2 Rev6
+PSP_EBOOT_TITLE = PSP EVEREST 2 Rev 9
 PSP_EBOOT_ICON = ICON0.PNG
 PSP_EBOOT_PIC1 = PIC1.png
 

app/include/consoleidinfo.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <pspopenpsid.h>
+
+namespace ConsoleIdInfo {
+    const char *GetProductCodeInfo(u16 productCode);
+    const char *GetProductSubCodeInfo(u16 productSubCode);
+    const char *GetFactoryCodeInfo(u16 factoryCode);
+    const char *GetPSID(PspOpenPSID *openpsid);
+}

app/include/gui.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "vlf.h"
+
+extern bool battery_fade_ctrl;
+extern unsigned int button_assign;
+extern VlfPicture pic_button_assign;
+
+namespace GUI {
+    void SetBottomDialog(bool enter, bool back, int (* handler)(int enter), bool delete_bd);
+    void SetTitle(const char *text);
+    void SetFade(void);
+    void GenRandomBackground(void);
+    void SetBackground(void);
+    int OnBackgroundPlus(void *param);
+    int OnBackgroundMinus(void *param);
+    VlfText Printf(int x, int y, const char *text, ...);
+}

app/include/hardwareinfo.h

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace HardwareInfo {
+    int GetModelSymbol(void);
+    const char *GetRegion(void);
+    char *GetMotherboard(s32 *tachyon, s32 *baryon, s32 *pommel);
+    char *GetUMDFirmware(void);
+    char *GetMacAddress(void);
+    const char *GetModel(void);
+    const char *GetQAFlag(void);
+}

app/include/everest_kernel.h → app/include/kernel.h

@@ -1,5 +1,11 @@
 #pragma once
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#include <pspsdk.h>
+
 /**
  * This structure contains console specific information. It is a subset of the ::SceConsoleId.
  * Check <openpsid_kernel.h> for possible member values.
@@ -32,6 +38,12 @@ int pspNandGetPagesPerBlock(void);
 u8 *pspGetMACAddress(u8 *buf);
 int pspReadSerial(u16 *pdata);
 int pspWriteSerial(u16* serial);
-int pspChkregGetPsCode(ScePsCode *pPsCode);
+int pspChkregGetPsCode(ScePsCode *psCode);
+int pspChkregGetPsFlags(u8 *psFlags, s32 index);
 int pspSysconBatteryGetElec(int *elec);
 int pspSysconBatteryGetTotalElec(int *elec);
+int pspGetModel(void);
+
+#if defined (__cplusplus)
+}
+#endif

app/include/kumdman.h

@@ -1,5 +1,9 @@
 #pragma once
 
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
 extern char outtxt[0x12];
 
 typedef struct {
@@ -20,3 +24,7 @@ extern u8 param[4];
 
 void *pspUmdManGetUmdDrive(int driveNum);
 int pspUmdExecInquiryCmd(void *drive, u8 *param, u8 *buf);
+
+#if defined (__cplusplus)
+}
+#endif

app/include/main.h

@@ -1,4 +1,3 @@
 #pragma once
 
-extern int psp_model, devkit, language;
-extern s32 tachyon, baryon, pommel;
+extern int psp_model, language;

app/include/screenshot.h

@@ -0,0 +1,5 @@
+#pragma once
+
+namespace Screenshot {
+    void Capture(int menu);
+}

app/include/systeminfo.h

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace SystemInfo {
+    char *GetFirmware(s32 *devkit);
+    char *GetVersionTxt(void);
+}

app/include/utils.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "vlf.h"
-
-int pspGetRegistryValue(const char *dir, const char *name, void *buf, int bufsize, int inttype);
-int random(int min, int max);
-int utf82unicode(wchar_t *dest, char *src);
-VlfText pspEverestPrintf(int x, int y, const char *text, ...);
+namespace Utils {
+    int UTF8ToUnicode(wchar_t *dest, char *src);
+    void ASCIIToUnicode(char *unicode, const char *ascii);
+    int Rand(int min, int max);
+    int GetRegistryValue(const char *dir, const char *name, void *buf, int bufsize, int inttype);
+}