Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm	(revision 194)
@@ -182,4 +182,5 @@
 	shl		bl,1				;  drive letter high order bit to CF, Item/Information bit to SF
 	jc		SHORT BootMenuPrint_HardDiskMenuitem
+	; fall through to BootMenuEvent_FallThroughToFloppyMenuitem
 		
 ;;; 
@@ -189,3 +190,3 @@
 ALIGN JUMP_ALIGN
 BootMenuEvent_FallThroughToFloppyMenuitem:	
-
+	; fall through to BootMenuPrint_FloppyMenuitem
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrint.asm	(revision 194)
@@ -32,8 +32,9 @@
 	jmp		short BootMenuPrint_FormatCSSIfromParamsInSSBP
 
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if BootMenuPrint_FloppyMenuitem <> BootMenuEvent_FallThroughToFloppyMenuitem
 %error "BootMenuPrint.asm must follow BootMenuEvent.asm, and BootMenuPrint_FloppyMenuitem must be the first routine in BootMenuPrint.asm"
 %endif
-
+%endif
 		
 ;--------------------------------------------------------------------
@@ -174,6 +175,8 @@
 	db		2880  / FloppyTypes.rgbCapacityMultiplier    ;  type 6
 
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if g_szFddFiveQuarter <> g_szFddThreeHalf+g_szFddThreeFive_Displacement
 %error "FddThreeFive_Displacement incorrect"
+%endif
 %endif
 		
@@ -225,4 +228,5 @@
 	cmp		bl, FLOPPY_TYPE_525_HD
 	ja		.ThreeHalf
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if g_szFddThreeFive_Displacement = 2 		
 	inc		ax						; compressed string case
@@ -230,4 +234,5 @@
 %else
 	add		ax, g_szFddThreeFive_Displacement
+%endif
 %endif
 .ThreeHalf:		
Index: trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuPrintCfg.asm	(revision 194)
@@ -26,5 +26,5 @@
 	eMOVZX	ax, BYTE [di+DPT.bIdevarsOffset]
 	xchg	si, ax						; CS:SI now points to IDEVARS
-	; Fall to PushAndFormatCfgString
+	; Fall to .PushAndFormatCfgString
 
 ;--------------------------------------------------------------------
@@ -38,5 +38,5 @@
 ;		AX, DX, SI, DI
 ;--------------------------------------------------------------------
-PushAndFormatCfgString:
+.PushAndFormatCfgString:
 	push	bp
 	mov		bp, sp
@@ -53,5 +53,5 @@
 ;		AX, BX
 ;--------------------------------------------------------------------
-PushAddressingMode:
+.PushAddressingMode:
 	CustomDPT_GetUnshiftedAddressModeToALZF
 	;; 
@@ -76,5 +76,5 @@
 ;		AX
 ;--------------------------------------------------------------------
-PushBlockMode:
+.PushBlockMode:
 	mov		ax, 1
 	test	BYTE [di+DPT.bFlagsHigh], FLGH_DPT_BLOCK_MODE_SUPPORTED
@@ -94,5 +94,5 @@
 ;		AX, DX
 ;--------------------------------------------------------------------
-;PushBusType:
+.PushBusType:
 	mov		al,g_szBusTypeValues_Displacement
 	mul		BYTE [cs:si+IDEVARS.bDevice]
@@ -113,5 +113,5 @@
 ;		AX, DX
 ;--------------------------------------------------------------------
-PushIRQ:
+.PushIRQ:
 	eMOVZX	ax, BYTE [cs:si+IDEVARS.bIRQ]
 	push	ax
@@ -127,5 +127,5 @@
 ;		AX
 ;--------------------------------------------------------------------
-PushResetStatus:
+.PushResetStatus:
 	mov		al, [di+DPT.bFlagsHigh]
 	and		ax, MASKH_DPT_RESET
@@ -141,5 +141,5 @@
 ;		AX, SI, DI
 ;--------------------------------------------------------------------
-PrintValuesFromStack:
+.PrintValuesFromStack:
 	mov		si, g_szCfgFormat
 	jmp		BootPrint_BootMenuPrint_FormatCSSIfromParamsInSSBP_Relay
Index: trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Tools/Address.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Tools/Address.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Tools/Address.asm	(revision 194)
@@ -85,17 +85,21 @@
 ALIGN JUMP_ALIGN
 Address_OldInt13hAddressToIdeAddress:
-	call	Address_ExtractLCHSparametersFromOldInt13hAddress
+		call	Address_ExtractLCHSparametersFromOldInt13hAddress
+			
+		CustomDPT_GetUnshiftedAddressModeToALZF
 		
-	CustomDPT_GetUnshiftedAddressModeToALZF
-	jz		DoNotConvertLCHS	; 0, ADDR_DPT_LCHS
+;;; 0: ADDR_DPT_LCHS		
+		jz		DoNotConvertLCHS	
 		
-	;; 
-	;; Since we are only checking for zero, we can do our math in the high order bits,
-	;; in this case effectively subtracting 1 from the address mode.
-	;; 
-	sub		al,(1<<ADDRESSING_MODE_FIELD_POSITION)
-	jz		ConvertLCHStoPCHS	; 1, ADDR_DPT_PCHS
-		
-;; Fall-through                 ; 2, ADDR_DPT_LBA28 and 3, ADDR_DPT_LBA48
+;;; 1: ADDR_DPT_PCHS
+		; 
+		; Since we are only checking for zero, we can do our math in the high order bits,
+		; in this case effectively subtracting 1 from the address mode.
+		;
+		sub		al,(1<<ADDRESSING_MODE_FIELD_POSITION)
+		jz		ConvertLCHStoPCHS	
+
+;;; 2: ADDR_DPT_LBA28 and 3: ADDR_DPT_LBA48				
+		; Fall through to ConvertLCHStoLBARegisterValues  
 		
 ;---------------------------------------------------------------------
Index: trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Initialization/Initialize.asm	(revision 194)
@@ -17,5 +17,5 @@
 ;		Nothing
 ;--------------------------------------------------------------------
-Initialize_FromMainBiosRomSearch:
+Initialize_FromMainBiosRomSearch:             ; unused entrypoint ok
 	pushf
 	push	es
Index: trunk/XTIDE_Universal_BIOS/Src/Strings.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Strings.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/Strings.asm	(revision 194)
@@ -51,4 +51,5 @@
 ; Ensure that addressing modes are correctly spaced in memory
 ;
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS		
 %if g_szLCHS <> g_szAddressingModes
 %error "g_szAddressingModes Displacement Incorrect 1"
@@ -62,5 +63,6 @@
 %if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement		
 %error "g_szAddressingModes Displacement Incorrect 4"
-%endif				
+%endif
+%endif		
 		
 g_szFddUnknown:	db	"%sUnknown",NULL
@@ -83,4 +85,5 @@
 ; Ensure that bus type strings are correctly spaced in memory
 ;
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS				
 %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
 %error "g_szBusTypeValues Displacement Incorrect 1"
@@ -100,5 +103,6 @@
 %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
 %error "g_szBusTypeValues Displacement Incorrect 6"				
-%endif				
+%endif
+%endif
 		
 g_szSelectionTimeout:	db		DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
Index: trunk/XTIDE_Universal_BIOS/Src/StringsCompress.pl
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/StringsCompress.pl	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/StringsCompress.pl	(revision 194)
@@ -203,4 +203,5 @@
 # Ensure that branch targets are within reach
 #
+print "%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS\n";
 for( $t = $format_begin; $format_index[$t]; $t++ )
 {
@@ -209,4 +210,5 @@
 	print "%endif\n";
 }
+print "%endif\n";
 
 #--------------------------------------------------------------------------------
Index: trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm	(revision 193)
+++ trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm	(revision 194)
@@ -137,4 +137,5 @@
 ; Ensure that addressing modes are correctly spaced in memory
 ;
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS		
 %if g_szLCHS <> g_szAddressingModes
 %error "g_szAddressingModes Displacement Incorrect 1"
@@ -148,5 +149,6 @@
 %if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement		
 %error "g_szAddressingModes Displacement Incorrect 4"
-%endif				
+%endif
+%endif		
 
 g_szFddUnknown:	; db	"%sUnknown",NULL
@@ -202,4 +204,5 @@
 ; Ensure that bus type strings are correctly spaced in memory
 ;
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS				
 %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
 %error "g_szBusTypeValues Displacement Incorrect 1"
@@ -219,5 +222,6 @@
 %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
 %error "g_szBusTypeValues Displacement Incorrect 6"				
-%endif				
+%endif
+%endif
 
 g_szSelectionTimeout:	; db		DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
@@ -268,4 +272,5 @@
         db     (DisplayFormatCompressed_BaseFormatOffset - DisplayFormatCompressed_Format_A)    ; 29
 
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if DisplayFormatCompressed_BaseFormatOffset < DisplayFormatCompressed_Format_s || DisplayFormatCompressed_BaseFormatOffset - DisplayFormatCompressed_Format_s > 255
 %error "DisplayFormatCompressed_Format_s is out of range of DisplayFormatCompressed_BaseFormatOffset"
@@ -298,4 +303,5 @@
 %error "DisplayFormatCompressed_Format_A is out of range of DisplayFormatCompressed_BaseFormatOffset"
 %endif
+%endif
 
 ;; translated usage stats
@@ -304,13 +310,13 @@
 ;; format usage stats
 ;; A:4
-;; c:6
-;; s:14
 ;; 2-u:1
-;; u:5
 ;; 5-u:3
-;; 2-I:1
 ;; x:6
 ;; 5-x:1
+;; s:14
 ;; nl:6
+;; 2-I:1
+;; c:6
+;; u:5
 ;; total format: 10
 
