Index: trunk/XTIDE_Universal_BIOS/Src/Strings.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS/Src/Strings.asm	(revision 589)
+++ trunk/XTIDE_Universal_BIOS/Src/Strings.asm	(revision 601)
@@ -135,20 +135,21 @@
 
 g_szDeviceTypeValues:
-g_szDeviceTypeValues_16bit:			db	" 16",NULL
+g_szDeviceTypeValues_16bit:				db	" 16",NULL
 %ifdef MODULE_ADVANCED_ATA OR MODULE_8BIT_IDE OR MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
-g_szDeviceTypeValues_32bit:			db	" 32",NULL
+g_szDeviceTypeValues_32bit:				db	" 32",NULL
 %ifdef MODULE_8BIT_IDE OR MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
-g_szDeviceTypeValues_8bit:			db	"  8",NULL
-g_szDeviceTypeValues_XTIDEr1:		db	"D8 ",NULL	; Dual 8-bit
-g_szDeviceTypeValues_XTIDEr2:		db	"X8 ",NULL	; A0<->A3 swapped 8-bit
+g_szDeviceTypeValues_8bit:				db	"  8",NULL
+g_szDeviceTypeValues_XTIDEr1:			db	"D8 ",NULL	; Dual 8-bit
+g_szDeviceTypeValues_XTIDEr2:			db	"X8 ",NULL	; A0<->A3 swapped 8-bit
+g_szDeviceTypeValues_XTIDEr2_Olivetti:	db	"X8O",NULL	; Same as above but in Olivetti M24 and derivatives
 %ifdef MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
-g_szDeviceTypeValues_XTCFpio8:		db	"T8 ",NULL	; True 8-bit
-g_szDeviceTypeValues_XTCFpio8BIU:	db	"T8B",NULL
-g_szDeviceTypeValues_XTCFpio16BIU:	db	"16B",NULL
-g_szDeviceTypeValues_XTCFdma:		db	"8MA",NULL	; DMA 8-bit
-g_szDeviceTypeValues_JrIde:			db	"M8 ",NULL	; Memory Mapped 8-bit
-g_szDeviceTypeValues_ADP50L:		db	"M8 ",NULL	; Memory Mapped 8-bit
+g_szDeviceTypeValues_XTCFpio8:			db	"T8 ",NULL	; True 8-bit
+g_szDeviceTypeValues_XTCFpio8BIU:		db	"T8B",NULL
+g_szDeviceTypeValues_XTCFpio16BIU:		db	"16B",NULL
+g_szDeviceTypeValues_XTCFdma:			db	"8MA",NULL	; DMA 8-bit
+g_szDeviceTypeValues_JrIde:				db	"M8 ",NULL	; Memory Mapped 8-bit
+g_szDeviceTypeValues_ADP50L:			db	"M8 ",NULL	; Memory Mapped 8-bit
 %ifdef MODULE_SERIAL
-g_szDeviceTypeValues_Serial:		db	"SER",NULL
+g_szDeviceTypeValues_Serial:			db	"SER",NULL
 %endif ; MODULE_SERIAL
 %endif ; MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
@@ -183,24 +184,27 @@
 		%error "g_szDeviceTypeValues Displacement Incorrect 5"
 	%endif
+	%if g_szDeviceTypeValues_XTIDEr2_Olivetti <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
+		%error "g_szDeviceTypeValues Displacement Incorrect 6"
+	%endif
 
 	%ifdef MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
 
-	%if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 6"
+	%if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2_Olivetti + g_szDeviceTypeValues_Displacement
+		%error "g_szDeviceTypeValues Displacement Incorrect 7"
 	%endif
 	%if g_szDeviceTypeValues_XTCFpio8BIU <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 7"
+		%error "g_szDeviceTypeValues Displacement Incorrect 8"
 	%endif
 	%if g_szDeviceTypeValues_XTCFpio16BIU <> g_szDeviceTypeValues_XTCFpio8BIU + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 8"
+		%error "g_szDeviceTypeValues Displacement Incorrect 9"
 	%endif
 	%if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio16BIU + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 9"
+		%error "g_szDeviceTypeValues Displacement Incorrect 10"
 	%endif
 	%if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 10"
+		%error "g_szDeviceTypeValues Displacement Incorrect 11"
 	%endif
 	%if g_szDeviceTypeValues_ADP50L <> g_szDeviceTypeValues_JrIde + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 11"
+		%error "g_szDeviceTypeValues Displacement Incorrect 12"
 	%endif
 
@@ -208,5 +212,5 @@
 
 	%if g_szDeviceTypeValues_Serial <> g_szDeviceTypeValues_ADP50L + g_szDeviceTypeValues_Displacement
-		%error "g_szDeviceTypeValues Displacement Incorrect 12"
+		%error "g_szDeviceTypeValues Displacement Incorrect 13"
 	%endif
 
