Export a few extra bits

CDFSSoftATAPI 1.35 and later uses symbols instead of magic numbers for ADFS_IDEDeviceInfo and ADFS_ATAPIOp, export them here so this combination builds.

Version 3.52. Tagged as 'ADFS-3_52'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "3.51"
-Module_Version          SETA    351
+Module_MajorVersion     SETS    "3.52"
+Module_Version          SETA    352
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "10 Jan 2016"
-Module_ApplicationDate  SETS    "10-Jan-16"
+Module_Date             SETS    "23 May 2016"
+Module_ApplicationDate  SETS    "23-May-16"
 Module_ComponentName    SETS    "ADFS"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
-Module_FullVersion      SETS    "3.51"
-Module_HelpVersion      SETS    "3.51 (10 Jan 2016)"
+Module_FullVersion      SETS    "3.52"
+Module_HelpVersion      SETS    "3.52 (23 May 2016)"
                         END

VersionNum

-/* (3.51)
+/* (3.52)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        3.51
+#define Module_MajorVersion_CMHG        3.52
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                10 Jan 2016
+#define Module_Date_CMHG                23 May 2016
 
-#define Module_MajorVersion             "3.51"
-#define Module_Version                  351
+#define Module_MajorVersion             "3.52"
+#define Module_Version                  352
 #define Module_MinorVersion             ""
-#define Module_Date                     "10 Jan 2016"
+#define Module_Date                     "23 May 2016"
 
-#define Module_ApplicationDate          "10-Jan-16"
+#define Module_ApplicationDate          "23-May-16"
 
 #define Module_ComponentName            "ADFS"
 #define Module_ComponentPath            "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
 
-#define Module_FullVersion              "3.51"
-#define Module_HelpVersion              "3.51 (10 Jan 2016)"
-#define Module_LibraryVersionInfo       "3:51"
+#define Module_FullVersion              "3.52"
+#define Module_HelpVersion              "3.52 (23 May 2016)"
+#define Module_LibraryVersionInfo       "3:52"

hdr/ADFS

@@ -52,7 +52,7 @@ SWIClass        SETS    ADFSSWI_Name
                 AddSWI  NOP2               ; &4024E
                 AddSWI  NOP3               ; &4024F
                 AddSWI  ECCSAndRetries     ; &40250
-                AddSWI  LockIDE		   ; &40251
+                AddSWI  LockIDE            ; &40251
                 AddSWI  FreeSpace64        ; &40252
                 AddSWI  IDEDeviceInfo      ; &40253
                 AddSWI  DiscOp64           ; &40254
@@ -60,6 +60,39 @@ SWIClass        SETS    ADFSSWI_Name
 
 ADFSSWICheckValue       *       @
 
+; ADFS_IDEDeviceInfo reason codes
+                                ^ 0
+ADFSIDEDeviceInfo_ByLegacyID    # 1
+ADFSIDEDeviceInfo_ByID          # 1
+ADFSIDEDeviceInfo_ByDrive       # 1
+
+; ADFS_IDEDeviceInfo flags
+
+ADFSIDEDeviceInfo_DeviceIDShift * 0
+ADFSIDEDeviceInfo_DeviceIDMask  * &F:SHL:ADFSIDEDeviceInfo_DeviceIDShift
+ADFSIDEDeviceInfo_CPIDShift     * 4
+ADFSIDEDeviceInfo_CPIDMask      * &FF:SHL:ADFSIDEDeviceInfo_CPIDShift
+
+; ADFS_IDEDeviceInfo device types
+                                ^ 0
+ADFSIDEDeviceInfo_None          # 1
+ADFSIDEDeviceInfo_NonPacket     # 1
+ADFSIDEDeviceInfo_Packet        # 1
+
+; ADFS_ATAPIOp flags
+
+ADFSATAPIOp_Reset               * 1:SHL:0
+ADFSATAPIOp_DeviceIDShift       * 12
+ADFSATAPIOp_DeviceIDMask        * &F:SHL:ADFSATAPIOp_DeviceIDShift
+ADFSATAPIOp_CPIDShift           * 16
+ADFSATAPIOp_CPIDMask            * &FF:SHL:ADFSATAPIOp_CPIDShift
+ADFSATAPIOp_TransShift          * 24
+ADFSATAPIOp_TransNone           * 0:SHL:ADFSATAPIOp_TransShift
+ADFSATAPIOp_TransRead           * 1:SHL:ADFSATAPIOp_TransShift
+ADFSATAPIOp_TransWrite          * 2:SHL:ADFSATAPIOp_TransShift
+ADFSATAPIOp_TransMask           * 3:SHL:ADFSATAPIOp_TransShift
+ADFSATAPIOp_DMA                 * 1:SHL:26
+ADFSATAPIOp_DMADIR              * 1:SHL:27
 
         OPT OldOpt
         END