Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MasterSlaveMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MasterSlaveMenu.asm	(revision 548)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MasterSlaveMenu.asm	(revision 567)
@@ -290,21 +290,21 @@
 	; Enable both
 	mov		bx, g_MenuitemMasterSlaveUserCHS
-	call	.EnableMenuitemFromCSBX
+	call	EnableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveUserLBA
-	jmp		.EnableMenuitemFromCSBX
+	jmp		SHORT .EnableMenuitemFromCSBX
 
 ALIGN JUMP_ALIGN
 .EnableCHSandDisableLBA:
 	mov		bx, g_MenuitemMasterSlaveUserCHS
-	call	.EnableMenuitemFromCSBX
+	call	EnableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveUserLBA
-	jmp		.DisableMenuitemFromCSBX
+	jmp		SHORT .DisableMenuitemFromCSBX
 
 ALIGN JUMP_ALIGN
 .DisableCHSandEnableLBA:
 	mov		bx, g_MenuitemMasterSlaveUserLBA
-	call	.EnableMenuitemFromCSBX
+	call	EnableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveUserCHS
-	jmp		.DisableMenuitemFromCSBX
+	jmp		SHORT .DisableMenuitemFromCSBX
 
 
@@ -328,7 +328,7 @@
 
 	mov		bx, g_MenuitemMasterSlaveCylinders
-	call	.EnableMenuitemFromCSBX
+	call	EnableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveHeads
-	call	.EnableMenuitemFromCSBX
+	call	EnableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveSectors
 	jmp		SHORT .EnableMenuitemFromCSBX
@@ -337,7 +337,7 @@
 .DisableCHandS:
 	mov		bx, g_MenuitemMasterSlaveCylinders
-	call	.DisableMenuitemFromCSBX
+	call	DisableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveHeads
-	call	.DisableMenuitemFromCSBX
+	call	DisableMenuitemFromCSBX
 	mov		bx, g_MenuitemMasterSlaveSectors
 	jmp		SHORT .DisableMenuitemFromCSBX
@@ -377,11 +377,9 @@
 ALIGN JUMP_ALIGN
 .EnableMenuitemFromCSBX:
-	or		BYTE [cs:bx+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
-	ret
+	jmp		EnableMenuitemFromCSBX
 
 ALIGN JUMP_ALIGN
 .DisableMenuitemFromCSBX:
-	and		BYTE [cs:bx+MENUITEM.bFlags], ~FLG_MENUITEM_VISIBLE
-	ret
+	jmp		DisableMenuitemFromCSBX
 
 
@@ -407,5 +405,5 @@
 
 	xchg	ax, dx				; SHR 16
-	eSHIFT_IM ax, 4, shr		; SHR 4 => AX = DX:AX / (1024*1024)
+	eSHR_IM	ax, 4				; SHR 4 => AX = DX:AX / (1024*1024)
 
 	pop		dx
@@ -429,5 +427,5 @@
 
 	xor		dx, dx
-	eSHIFT_IM ax, 4, shl
+	eSHL_IM	ax, 4
 	xchg	dx, ax			; DX:AX now holds AX * 1024 * 1024
 
@@ -445,29 +443,29 @@
 ALIGN JUMP_ALIGN
 MasterSlaveMenu_WriteCHSFlag:
-		test	word [es:di], FLG_DRVPARAMS_USERCHS
-		jnz		.alreadySet
-
-		push	ax
-		push	di
-		push	si
-
-		mov		ax, MASTERSLAVE_CYLINDERS_DEFAULT
-		mov		si, g_MenuitemMasterSlaveCylinders
-		call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
-
-		mov		ax, MASTERSLAVE_HEADS_DEFAULT
-		mov		si, g_MenuitemMasterSlaveHeads
-		call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
-
-		mov		ax, MASTERSLAVE_SECTORS_DEFAULT
-		mov		si, g_MenuitemMasterSlaveSectors
-		call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
-
-		pop		si
-		pop		di
-		pop		ax
+	test	word [es:di], FLG_DRVPARAMS_USERCHS
+	jnz		.alreadySet
+
+	push	ax
+	push	di
+	push	si
+
+	mov		ax, MASTERSLAVE_CYLINDERS_DEFAULT
+	mov		si, g_MenuitemMasterSlaveCylinders
+	call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
+
+	mov		ax, MASTERSLAVE_HEADS_DEFAULT
+	mov		si, g_MenuitemMasterSlaveHeads
+	call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
+
+	mov		ax, MASTERSLAVE_SECTORS_DEFAULT
+	mov		si, g_MenuitemMasterSlaveSectors
+	call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
+
+	pop		si
+	pop		di
+	pop		ax
 
 .alreadySet:
-		ret
+	ret
 
 ;
@@ -477,19 +475,19 @@
 ALIGN JUMP_ALIGN
 MasterSlaveMenu_WriteLBAFlag:
-		test	word [es:di], FLG_DRVPARAMS_USERLBA
-		jnz		.alreadySet
-
-		push	ax
-		push	di
-		push	si
-
-		mov		ax, MASTERSLAVE_USERLBA_DEFAULT
-		mov		si, g_MenuitemMasterSlaveUserLbaValue
-		call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
-
-		pop		si
-		pop		di
-		pop		ax
+	test	word [es:di], FLG_DRVPARAMS_USERLBA
+	jnz		.alreadySet
+
+	push	ax
+	push	di
+	push	si
+
+	mov		ax, MASTERSLAVE_USERLBA_DEFAULT
+	mov		si, g_MenuitemMasterSlaveUserLbaValue
+	call	Menuitem_StoreValueFromAXtoMenuitemInDSSI
+
+	pop		si
+	pop		di
+	pop		ax
 
 .alreadySet:
-		ret
+	ret
