Use OS_LeaveOS where possible.

Version 0.12. Tagged as 'AsmUtils-0_12'

VersionNum

-/* (0.11)
+/* (0.12)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.11
+#define Module_MajorVersion_CMHG        0.12
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                26 Jun 2009
+#define Module_Date_CMHG                14 Dec 2011
 
-#define Module_MajorVersion             "0.11"
-#define Module_Version                  11
+#define Module_MajorVersion             "0.12"
+#define Module_Version                  12
 #define Module_MinorVersion             ""
-#define Module_Date                     "26 Jun 2009"
+#define Module_Date                     "14 Dec 2011"
 
-#define Module_ApplicationDate          "26-Jun-09"
+#define Module_ApplicationDate          "14-Dec-11"
 
 #define Module_ComponentName            "AsmUtils"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Lib/AsmUtils"
 
-#define Module_FullVersion              "0.11"
-#define Module_HelpVersion              "0.11 (26 Jun 2009)"
-#define Module_LibraryVersionInfo       "0:11"
+#define Module_FullVersion              "0.12"
+#define Module_HelpVersion              "0.12 (14 Dec 2011)"
+#define Module_LibraryVersionInfo       "0:12"

h/callbacks

@@ -29,15 +29,14 @@ extern "C" {
  * until all code can be modified to call the function the same
  * thing.
  */
+extern void user_mode_donothing(void); /* Alias */
+extern void CollectCallbacks(void);    /* Alias */
 
 /* This function attempts to make the transient callback chain be processed.
  * It does this in whatever manner is appropriate to the build in which it is
  * exported
  */
 extern void usermode_donothing(void);
-extern void user_mode_donothing(void);
-
-extern void CollectCallbacks(void);
 
 #ifdef __cplusplus
 }

s/callbacks

@@ -40,9 +40,9 @@ DefineAliases SETL {TRUE}
         ]
 
         EXPORT  usermode_donothing
-        EXPORT  user_mode_donothing
         [ DefineAliases
         EXPORT  CollectCallbacks
+        EXPORT  user_mode_donothing
         ]
 
         [ No32bitCode :LAND: No26bitCode
@@ -52,14 +52,13 @@ DefineAliases SETL {TRUE}
 ; extern void usermode_donothing(void);
         [ DefineAliases
 CollectCallbacks
+user_mode_donothing
         ]
 usermode_donothing
-user_mode_donothing
         FunctionEntry "r12"
-        [ :DEF: XOS_ProcessCallbacks
-        SWI     XOS_ProcessCallbacks    ; Have we got the nice SWI to do it?
+        SWI     XOS_LeaveOS             ; Have we got the nice SWI to do it?
+        SWIVC   XOS_EnterOS
         Return  "r12",,VC
-        ]
         [ No32bitCode
         TEQP    pc, #0                  ; Set USR26 mode
         |