Revert "-Minor fix attempt on IconMenu"

This reverts commit c10e314.

Author: bennydiamond

boot/BootResetAction.c

@@ -124,7 +124,7 @@ extern void BootResetAction ( void ) {
 	   LPCmodSettings.LCDsettings.customTextBoot == 0xFF ||
 	   LPCmodSettings.LCDsettings.displayBIOSNameBoot == 0xFF){
 			fFirstBoot = true;
-			initialLPCModOSBoot(&LPCmodSettings);				//No settings for LPCMod were present in flash.
+			initialLPCModOSBoot(&LPCmodSettings);				//No settings for LPCMod were present in flash.									//Certainly don't write to flash if no proper hardware was detected!
 			BootFlashSaveOSSettings();		//Put some initial values in there.
 			LEDFirstBoot(NULL);
 			LPCmodSettings.OSsettings.bootTimeout = 0;		//No countdown since it's the first boot since a flash update.
@@ -165,7 +165,7 @@ extern void BootResetAction ( void ) {
 		BootVideoJpegUnpackAsRgb(
 			(u8 *)&_start_backdrop,
 			&jpegBackdrop
-		);//Certainly don't write to flash if no proper hardware was detected!
+		);
 	}
 	// paint the backdrop
 #ifndef DEBUG_MODE

drivers/pci/i2cio.c

@@ -241,14 +241,13 @@ void I2CSetFanSpeed(u8 speed){
 u8 I2CGetXboxMBRev(void){
 	u8 result = REVUNKNOWN;
 	u32 temp;
-	u32 ver32[3];	//Just to avoid warning on pointer type for ReadfromSMBus function.
+	u32 ver32[3];
 	char ver[4] = "000";
 	ver[3] = 0;		//Terminator.
 	ReadfromSMBus(0x10, 0x01, 1, &ver32[1]);
 	ReadfromSMBus(0x10, 0x01, 1, &ver32[2]);
 	ReadfromSMBus(0x10, 0x01, 1, &ver32[0]);
 
-	//I'm not on a small embedded system. I've got plenty of RAM to spare.
 	ver[0] = ver32[0];
 	ver[1] = ver32[1];
 	ver[2] = ver32[2];

include/lpcmod_v1.h

@@ -8,7 +8,6 @@
 #define BNKTSOP1 0x05
 #define BNKTSOP2 0x06
 #define BNKTSOP3 0x07
-#define NOBNKID  0xFF
 #define LPCMOD_TRUE 0x01
 #define LPCMOD_FALSE	0x00
 

menu/iconmenu/IconMenu.c

@@ -88,17 +88,11 @@ static void IconMenuDraw(int nXOffset, int nYOffset) {
 			if(iconSeeker->bankID == LPCmodSettings.OSsettings.activeBank){
 				//Yes. Identify as selected icon and get out of while loop.
 				selectedIcon = iconSeeker;
-				//Just to be sure before digging deeper. Should always be true.
-				if(selectedIcon->nextIcon != NULL){
-					//If selectedIcon is last before "Advanced settings"
-					if(selectedIcon->nextIcon->nextIcon == NULL){
-						//iconPtr must point at least 2 icons before end of list
-						//to properly show 3 icons on IconMenu.
-						iconPtr = selectedIcon->previousIcon;
-					}
-					else{
-						iconPtr = selectedIcon;
-					}
+				//If selectedIcon is last before "Advanced settings"
+				if(selectedIcon->nextIcon->nextIcon == NULL){
+					//iconPtr must point at least 2 icons before end of list
+					//to properly show 3 icons on IconMenu.
+					iconPtr = selectedIcon->previousIcon;
 				}
 				else{
 					iconPtr = selectedIcon;

menu/iconmenu/IconMenuInit.c

@@ -152,7 +152,6 @@ else {										//No split.
 	iconPtr = (ICON *)malloc(sizeof(ICON));
 	iconPtr->iconSlot = ICON_SOURCE_SLOT0;
 	iconPtr->szCaption = "Advanced";
-	iconPtr->bankID = NOBNKID;
 	iconPtr->functionPtr = AdvancedMenu;
 	iconPtr->functionDataPtr = (void *)TextMenuInit();
 	AddIcon(iconPtr);