Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm	(revision 108)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/ConfigurationMenu.asm	(revision 109)
@@ -63,14 +63,4 @@
 iend
 
-g_MenuitemConfigurationQuinaryIdeController:
-istruc MENUITEM
-	at	MENUITEM.fnActivate,		dw	QuinaryIdeController
-	at	MENUITEM.szName,			dw	g_szItemCfgIde5
-	at	MENUITEM.szQuickInfo,		dw	g_szNfoCfgIde
-	at	MENUITEM.szHelp,			dw	g_szNfoCfgIde
-	at	MENUITEM.bFlags,			db	NULL
-	at	MENUITEM.bType,				db	TYPE_MENUITEM_PAGENEXT
-iend
-
 g_MenuitemConfigurationBootMenuSettings:
 istruc MENUITEM
@@ -79,22 +69,6 @@
 	at	MENUITEM.szQuickInfo,		dw	g_szNfoCfgBootMenu
 	at	MENUITEM.szHelp,			dw	g_szNfoCfgBootMenu
-	at	MENUITEM.bFlags,			db	NULL
-	at	MENUITEM.bType,				db	TYPE_MENUITEM_PAGENEXT
-iend
-
-g_MenuitemConfigurationBootLoaderType:
-istruc MENUITEM
-	at	MENUITEM.fnActivate,		dw	Menuitem_ActivateMultichoiceSelectionForMenuitemInDSSI
-	at	MENUITEM.fnFormatValue,		dw	MenuitemPrint_WriteLookupValueStringToBufferInESDIfromShiftedItemInDSSI
-	at	MENUITEM.szName,			dw	g_szItemCfgBootLoader
-	at	MENUITEM.szQuickInfo,		dw	g_szNfoCfgBootLoader
-	at	MENUITEM.szHelp,			dw	g_szNfoCfgBootLoader
-	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE | FLG_MENUITEM_MODIFY_MENU | FLG_MENUITEM_BYTEVALUE
-	at	MENUITEM.bType,				db	TYPE_MENUITEM_MULTICHOICE
-	at	MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,		dw	ROMVARS.bBootLdrType
-	at	MENUITEM.itemValue + ITEM_VALUE.szDialogTitle,				dw	g_szItemCfgBootLoader
-	at	MENUITEM.itemValue + ITEM_VALUE.szMultichoice,				dw	g_szMultichoiceCfgBootLoader
-	at	MENUITEM.itemValue + ITEM_VALUE.rgwChoiceToValueLookup,		dw	g_rgwChoiceToValueLookupForBootLoaderType
-	at	MENUITEM.itemValue + ITEM_VALUE.rgszValueToStringLookup,	dw	g_rgszValueToStringLookupForBootLoaderType
+	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE
+	at	MENUITEM.bType,				db	TYPE_MENUITEM_PAGENEXT
 iend
 
@@ -142,17 +116,6 @@
 	at	MENUITEM.itemValue + ITEM_VALUE.szDialogTitle,				dw	g_szDlgCfgIdeCnt
 	at	MENUITEM.itemValue + ITEM_VALUE.wMinValue,					dw	1
-	at	MENUITEM.itemValue + ITEM_VALUE.wMaxValue,					dw	5
-iend
-
-
-g_rgwChoiceToValueLookupForBootLoaderType:
-	dw	BOOTLOADER_TYPE_MENU
-	dw	BOOTLOADER_TYPE_SIMPLE
-	dw	BOOTLOADER_TYPE_NONE
-g_rgszValueToStringLookupForBootLoaderType:
-	dw	g_szValueCfgBootLoaderMenu
-	dw	g_szValueCfgBootLoaderAthenC
-	dw	g_szUnidentified
-	dw	g_szValueCfgBootLoaderSystem
+	at	MENUITEM.itemValue + ITEM_VALUE.wMaxValue,					dw	4
+iend
 
 
@@ -175,5 +138,4 @@
 	call	.DisableAllIdeControllerMenuitems
 	call	.EnableIdeControllerMenuitemsBasedOnConfiguration
-	call	.EnableOrDisableBootMenuSettings
 	call	.EnableOrDisableKiBtoStealFromRAM
 	call	.EnableOrDisableIdeControllerCount
@@ -239,24 +201,4 @@
 	mov		cx, 1
 	ret
-
-
-;--------------------------------------------------------------------
-; .EnableOrDisableBootMenuSettings
-;	Parameters:
-;		SS:BP:	Menu handle
-;	Returns:
-;		Nothing
-;	Corrupts registers:
-;		AX, BX, CX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-.EnableOrDisableBootMenuSettings:
-	mov		bx, ROMVARS.bBootLdrType
-	call	Buffers_GetRomvarsValueToAXfromOffsetInBX
-	mov		bx, g_MenuitemConfigurationBootMenuSettings
-	cmp		ax, BYTE BOOTLOADER_TYPE_MENU
-	jne		SHORT .DisableMenuitemFromCSBX
-	jmp		SHORT .EnableMenuitemFromCSBX
-
 
 ;--------------------------------------------------------------------
@@ -291,6 +233,9 @@
 	mov		bx, g_MenuitemConfigurationIdeControllers
 	test	ax, FLG_ROMVARS_FULLMODE
-	jz		SHORT .DisableMenuitemFromCSBX
-	jmp		SHORT .EnableMenuitemFromCSBX
+	jnz		SHORT .EnableMenuitemFromCSBX
+.LimitIdeControllerCountToOneForLiteMode:
+	call	Buffers_GetFileBufferToESDI
+	mov		BYTE [es:di+ROMVARS.bIdeCnt], 1
+	jmp		SHORT .DisableMenuitemFromCSBX
 
 ;--------------------------------------------------------------------
@@ -343,9 +288,4 @@
 QuaternaryIdeController:
 	mov		bx, ROMVARS.ideVars3
-	jmp		SHORT DisplayIdeControllerMenu
-
-ALIGN JUMP_ALIGN
-QuinaryIdeController:
-	mov		bx, ROMVARS.ideVars4
 	; Fall to DisplayIdeControllerMenu
 
