Index: trunk/XTIDE_Universal_BIOS/Inc/ATA_ID.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/ATA_ID.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/ATA_ID.inc	(revision 567)
@@ -86,6 +86,6 @@
 	.strModel	resb 40	; 27...46F, Model number (40 ASCII characters, 0000h=not specified)
 	.bBlckSize	resb 1	; 47[0-7]F, Maximum number of sectors that can be transferred
-						;          per interrupt on read and write multiple commands
-						;		   (00h=Read/write multiple commands not implemented)
+						;			per interrupt on read and write multiple commands
+						;			(00h=Read/write multiple commands not implemented)
 				resb 1	; 47[8-15]X
 	.wDWIO		resw 1	; 48F, Can perform doubleword I/O (boolean)
@@ -106,5 +106,5 @@
 	; Words 59-63 are always valid
 	.bBlockSel	resb 1	; 59[0-7]V, Current setting for number of sectors that
-						;           can be transferred per interrupt on R/W multiple command
+						;			can be transferred per interrupt on R/W multiple command
 	.bBlockFlgs	resb 1	; 59[8-15]VR, bit 0 set if Multiple sector setting is valid
 	.dwLBACnt	resd 1	; 60...61F, Total number of user addressable sectors (LBA mode only)
@@ -168,6 +168,6 @@
 	.strModel	resb 40	; 27...46F, Model number (40 ASCII characters, 0000h=not specified)
 	.bBlckSize	resb 1	; 47[0-7]F, Maximum number of sectors that can be transferred
-						;          per interrupt on read and write multiple commands
-						;		   (00h=Read/write multiple commands not implemented)
+						;			per interrupt on read and write multiple commands
+						;			(00h=Read/write multiple commands not implemented)
 				resb 1	; 47[8-15]X
 				resw 1	; 48R
@@ -188,5 +188,5 @@
 	; Words 59-63 are always valid
 	.bBlockSel	resb 1	; 59[0-7]V, Current setting for number of sectors that
-						;           can be transferred per interrupt on R/W multiple command
+						;			can be transferred per interrupt on R/W multiple command
 	.bBlockFlgs	resb 1	; 59[8-15]VR, bit 0 set if Multiple sector setting is valid
 	.dwLBACnt	resd 1	; 60...61F, Total number of user addressable sectors (LBA mode only)
@@ -253,6 +253,6 @@
 	.strModel	resb 40	; 27...46F, Model number (40 ASCII characters, 0000h=not specified)
 	.bBlckSize	resb 1	; 47[0-7]F, Maximum number of sectors that can be transferred
-						;           per interrupt on read and write multiple commands
-						;		    (00h=Read/write multiple commands not implemented)
+						;			per interrupt on read and write multiple commands
+						;			(00h=Read/write multiple commands not implemented)
 				resb 1	; 47[8-15]F, 80h
 				resw 1	; 48R
@@ -271,5 +271,5 @@
 	; Words 59-63 are always valid
 	.bBlockSel	resb 1	; 59[0-7]V, Current setting for number of sectors that
-						;           can be transferred per interrupt on R/W multiple command
+						;			can be transferred per interrupt on R/W multiple command
 	.bBlockFlgs	resb 1	; 59[8-15]VR, bit 0 set if Multiple sector setting is valid
 	.dwLBACnt	resd 1	; 60...61F, Total number of user addressable sectors (LBA-28)
Index: trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/Controllers/XTCF.inc	(revision 567)
@@ -1,4 +1,4 @@
 ; Project name	:	XTIDE Universal BIOS
-; Description	:	Lo-tech XT-CFv2 board specifications.
+; Description	:	Lo-tech XT-CF board specifications.
 ;
 ; More information at http://www.lo-tech.co.uk/XT-CF
@@ -19,7 +19,4 @@
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 ;
-
-; Modified by JJP for XT-CFv3 support, Mar-13
-
 
 %ifndef XTCF_INC
@@ -56,5 +53,5 @@
 ; For XT-CFv3 adapter, DMA transfers are also supported via channel 3.
 ;
-; XT-CFv3 cannot be distinguised by software, so user must decide and set
+; XT-CFv3 cannot be distinguished by software, so user must decide and set
 ; the mode via a call to Int 13h function 1Eh accordingly (see AH1E_XTCF.asm).
 ;
Index: trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/CustomDPT.inc	(revision 567)
@@ -61,25 +61,24 @@
 	FLGL_DPT_LBA						EQU	FLG_DRVNHEAD_LBA	; Bit 6, Drive supports LBA and so EBIOS functions can be supported
 %ifdef MODULE_EBIOS
-	FLGL_DPT_LBA48						EQU	(1<<7)				; Bit 7, Drive supports 48-bit LBA (Must be bit 7!)
+	FLGL_DPT_LBA48						EQU	(1<<7)				; Bit 7, Drive supports 48-bit LBA (must be bit 7!)
 %endif
 
 
 	; Bit definitions for DPT.bFlagsHigh
-	FLGH_DPT_USE_BLOCK_MODE_COMMANDS	EQU	(1<<1)	; Bit 1, Use block transfer commands (must be bit 1!)
+	FLGH_DPT_USE_BLOCK_MODE_COMMANDS	EQU	(1<<1)				; Bit 1, Use block transfer commands (must be bit 1!)
 %ifdef MODULE_SERIAL
-	FLGH_DPT_SERIAL_DEVICE				EQU	(1<<2)	; Bit 2, Serial Port Device
+	FLGH_DPT_SERIAL_DEVICE				EQU	(1<<2)				; Bit 2, Serial Port Device
 %endif
-%ifdef MODULE_FEATURE_SETS
-	FLGH_DPT_POWER_MANAGEMENT_SUPPORTED	EQU (1<<5)	; Bit 5, Drive supports power management
+%ifdef MODULE_POWER_MANAGEMENT
+	FLGH_DPT_POWER_MANAGEMENT_SUPPORTED	EQU (1<<3)				; Bit 3, Drive supports power management (must be bit 3!)
 %endif
 %ifdef MODULE_ADVANCED_ATA
-	FLGH_DPT_IORDY						EQU	(1<<7)	; Bit 7, Controller and Drive supports IORDY
+	FLGH_DPT_IORDY						EQU	(1<<7)				; Bit 7, Controller and Drive supports IORDY
 %endif
 
 	; Serial device only
 %ifdef MODULE_SERIAL_FLOPPY
-	FLGH_DPT_SERIAL_FLOPPY						EQU	(1<<4)
-	FLGH_DPT_SERIAL_FLOPPY_TYPE_MASK			EQU	0e0h
-	FLGH_DPT_SERIAL_FLOPPY_TYPE_FIELD_POSITION	EQU	5
+	FLGH_DPT_SERIAL_FLOPPY						EQU	(1<<4)		; Bit 4, Drive is a serial floppy drive
+	FLGH_DPT_SERIAL_FLOPPY_TYPE_FIELD_POSITION	EQU	5			; Bits 7...5, Serial floppy drive type
 %endif
 
Index: trunk/XTIDE_Universal_BIOS/Inc/DeviceIDE.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/DeviceIDE.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/DeviceIDE.inc	(revision 567)
@@ -31,5 +31,5 @@
 TIMEOUT_MAXIMUM			EQU		255			; We would actually want 31 seconds here but I don't think there are so slow drives
 
-%ifdef MODULE_FEATURE_SETS
+%ifdef MODULE_POWER_MANAGEMENT
 	TIMEOUT_BSY			EQU		TIMEOUT_MOTOR_STARTUP
 	TIMEOUT_DRDY		EQU		TIMEOUT_MOTOR_STARTUP
Index: trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc	(revision 567)
@@ -130,8 +130,8 @@
 %endif
 
-%ifdef MODULE_FEATURE_SETS
-	MAIN_FLG_MODULE_FEATURE_SETS	EQU	FLG_ROMVARS_MODULE_FEATURE_SETS
+%ifdef MODULE_POWER_MANAGEMENT
+	MAIN_FLG_MODULE_POWER_MANAGEMENT	EQU	FLG_ROMVARS_MODULE_POWER_MANAGEMENT
 %else
-	MAIN_FLG_MODULE_FEATURE_SETS	EQU	0
+	MAIN_FLG_MODULE_POWER_MANAGEMENT	EQU	0
 %endif
 
@@ -142,4 +142,4 @@
 %endif
 
-MASK_ROMVARS_INCLUDED_MODULES	EQU	MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_FEATURE_SETS | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED
+MASK_ROMVARS_INCLUDED_MODULES	EQU	MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_POWER_MANAGEMENT | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED
 
Index: trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc	(revision 566)
+++ trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc	(revision 567)
@@ -72,5 +72,5 @@
 
 ; Here in case the configuration needs to know functionality is present
-FLG_ROMVARS_MODULE_FEATURE_SETS			EQU	(1<<5)
+FLG_ROMVARS_MODULE_POWER_MANAGEMENT		EQU	(1<<5)
 FLG_ROMVARS_MODULE_8BIT_IDE				EQU	(1<<6)
 FLG_ROMVARS_MODULE_8BIT_IDE_ADVANCED	EQU (1<<7)
