Merge upstream changes, make things ready for 0.7

src/kernel.c

@@ -128,4 +128,41 @@ const char * getBoard()
 		return "DOL-1001";
 	else
 		return "Uknown";
-}
+}
+
+/*
+
+const char * getSysrootKernelModes(int data)
+{
+	if (data == 0) //ksceSysrootIsExternalBootMode
+	{
+		if (ksceSysrootIsExternalBootMode() == 0)
+			return "boot mode enabled";
+		else 
+			return "boot mode disabled";
+	}
+	
+	else if (data == 1) //ksceSysrootIsManufacturingMode
+	{
+		if (ksceSysrootIsManufacturingMode() == 0)
+			return "manufacturing mode enabled";
+		else 
+			return "manufacturing mode disabled";
+	}
+	
+	else if (data == 2) //ksceSysrootIsSafeMode
+	{
+		if (ksceSysrootIsSafeMode() == 0)
+			return "safe mode enabled";
+		else 
+			return "safe mode disabled";
+	}
+	
+	else //ksceSysrootIsUpdateMode
+	{
+		if (ksceSysrootIsUpdateMode() == 0)
+			return "update mode enabled";
+		else 
+			return "update mode disabled";
+	}
+}*/

src/kernel.h

@@ -28,6 +28,11 @@ int vshSblAimgrIsGenuineDolce();
 int vshSblAimgrIsTest();
 int vshSblAimgrIsTool();
 
+/*int ksceSysrootIsExternalBootMode();
+int ksceSysrootIsManufacturingMode();
+int ksceSysrootIsSafeMode();
+int ksceSysrootIsUpdateMode();*/
+
 int vshSysconIsIduMode();
 int vshSysconIsShowMode();
 int vshSysconHasWWAN();
@@ -43,5 +48,6 @@ SceKernelOpenPsId getPSID();
 char * getUnit();
 const char * getDeviceModel();
 const char * getBoard();
+const char * getSysrootKernelModes(int data);
 
 #endif

src/main.c

@@ -17,14 +17,14 @@ int main(int argc, char *argv[])
 	initNet();
 	psvDebugScreenInit();
 
-	printStr(false, GREEN, "", "VITAident 0.7.1\n\n");
+	printStr(false, GREEN, "", "VITAident 0.7\n\n");
 
 
 	/*Kernel Info*/
 
 	printStr(true, RED, "Firmware version: ", "%s\n", getFwVersion(false));
 
-	printStr(true, RED, "System version: ", "%.4s\n", getFwVersion(true));
+	printStr(true, RED, "System version: ", "%s\n", getFwVersion(true));
 
 	printStr(true, RED, "Model version: ", "%s %s (0x%08X)\n", getDeviceModel(), vshSysconHasWWAN()? "3G" : "WiFi", getModel());
 
@@ -75,7 +75,9 @@ int main(int argc, char *argv[])
 		printStr(false, BLUE, "(cycle count: ", "%s", getBatteryCycleCount());
 		printStr(false, BLUE, ")\n", "");
 
-		printStr(true, BLUE, "Udcd state: ", "%s (%s)\n\n", getUdcdCableState(), getUdcdChargingState());
+		printStr(true, BLUE, "Udcd state: ", "%s", getUdcdCableState());
+		printStr(false, BLUE, "(", "%s", getUdcdChargingState());
+		printStr(false, BLUE, ")\n\n", "");
 	}
 
 

src/power.c

@@ -134,7 +134,7 @@ char * getUdcdCableState()
 	if (state.cable & SCE_UDCD_STATUS_CABLE_CONNECTED)
 		sprintf(udcdState, "Cable connected");
 	else if (state.cable & SCE_UDCD_STATUS_CABLE_DISCONNECTED)
-		sprintf(udcdState, "Cable disonnected");
+		sprintf(udcdState, "Cable disconnected");
 
 	return udcdState;
 }