Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm	(revision 501)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm	(revision 505)
@@ -50,5 +50,5 @@
 %ifdef MODULE_HOTKEYS
 	call	HotkeyBar_ScanHotkeysFromKeyBufferAndStoreToBootvars		; Done here while CX is still protected
-%endif				
+%endif
 
 	pop		cx
@@ -73,6 +73,6 @@
 %ifdef MODULE_HOTKEYS
 	cmp		al, COM_DETECT_HOTKEY_SCANCODE  ; Set by last call to HotkeyBar_UpdateDuringDriveDetection above
-	jz		.DriveDetectLoop
-%endif		
+	je		.DriveDetectLoop
+%endif
 
 	mov		al,[cs:ROMVARS.wFlags]			; Configurator set to always scan?
@@ -201,6 +201,6 @@
 %ifdef MODULE_HOTKEYS
 	call	HotkeyBar_UpdateDuringDriveDetection
-%endif				
-		
+%endif
+
 %ifdef MODULE_8BIT_IDE_ADVANCED
 	pop		dx
@@ -248,5 +248,5 @@
 ;		Nothing
 ;	Returns:
-;		CF:     Set (from BootMenuPrint_NullTerminatedStringFromCSSIandSetCF)
+;		CF:     Set (from DetectPrint_NullTerminatedStringFromCSSIandSetCF)
 ;	Corrupts registers:
 ;		AX, SI
Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm	(revision 501)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm	(revision 505)
@@ -3,5 +3,5 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10,11 +10,11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.		
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;		
+;
 
 ; Section containing code
@@ -31,8 +31,7 @@
 ;--------------------------------------------------------------------
 DetectPrint_InitializeDisplayContext:
-	CALL_DISPLAY_LIBRARY	InitializeDisplayContext
-	ret
-
-		
+	JMP_DISPLAY_LIBRARY InitializeDisplayContext
+
+
 %ifdef MODULE_HOTKEYS
 ;--------------------------------------------------------------------
@@ -46,9 +45,8 @@
 ;--------------------------------------------------------------------
 DetectPrint_GetSoftwareCoordinatesToAX:
-	CALL_DISPLAY_LIBRARY	GetSoftwareCoordinatesToAX
-	ret
+	JMP_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
 %endif
 
-		
+
 ;--------------------------------------------------------------------
 ; DetectPrint_StartDetectWithMasterOrSlaveStringInCXandIdeVarsInCSBP
@@ -75,5 +73,5 @@
 ;	Corrupts registers:
 ;		AX, CX, DX, SI, DI
-;--------------------------------------------------------------------	
+;--------------------------------------------------------------------
 DetectPrint_StartDetectWithAutodetectedBasePortInAXandIdeVarsInCSBP:
 	mov		dx, [cs:bp+IDEVARS.bDevice-1]   ; for Serial: AL=port address>>2, AH=baud rate
@@ -152,5 +150,5 @@
 DetectPrint_DriveNameFromDrvDetectInfoInESBX:
 	push	bp
-	mov		bp,sp	
+	mov		bp,sp
 	lea		si,[bx+DRVDETECTINFO.szDrvName]
 	push	si
@@ -158,5 +156,5 @@
 	jmp		SHORT DetectPrint_FormatCSSIfromParamsInSSBP
 
-				
+
 ;--------------------------------------------------------------------
 ; Prints BIOS name and segment address where it is found.
@@ -175,5 +173,5 @@
 										; so that it can be a different value when using .BootMenuEntry
 
-.BootMenuEntry:	
+.BootMenuEntry:
 	push	bp
 	mov		bp, sp
@@ -186,5 +184,5 @@
 	push	ax
 %else
-	; szTitle and szVersion have the high order byte of their addresses zero, 
+	; szTitle and szVersion have the high order byte of their addresses zero,
 	; so these push instructions are only 2 bytes
 	;
@@ -259,5 +257,5 @@
 
 	mov		si, g_szTryToBoot
-	jmp		SHORT DetectPrint_FormatCSSIfromParamsInSSBP	
+	jmp		SHORT DetectPrint_FormatCSSIfromParamsInSSBP
 
 
