CollectCallbacks -> usermode_donothing() the preferred AsmUtils name.

Retagged.

c/Attr

@@ -253,7 +253,7 @@ static int SearchFileForEntry ( int FH, char *name )
 
 /* --------------------------- */
 
-static bool CacheEmpty ()
+static bool CacheEmpty (void)
 {
   int i;
   for ( i=0; i<AttrCacheLen; i++)

c/LLC

@@ -35,6 +35,7 @@
 #include "os.h"
 #include "swis.h"
 #include "sys/dcistructs.h"
+#include "AsmUtils/callbacks.h"
 
 /* Our includes */
 
@@ -130,7 +131,7 @@ int LLC_CallbackFn_handler(_kernel_swi_regs *r, void *pw)
 
 /* --------------------- */
 
-static void SetCallback()
+static void SetCallback(void)
 {
   if (!CallbackSet)
   {
@@ -601,7 +602,7 @@ err_t LLC_AttachDriver( char *name, const NETADDR *Multi_Addr )
 
 /* --------------------------------- */
 
-static void DetachDriver()
+static void DetachDriver(void)
 {
   _kernel_swi_regs R;
 
@@ -1238,9 +1239,9 @@ static void ReceiveProcess (BUFCHAIN pB)
   LLC_RcvProcess( &srcaddr, pB);
 }
 
-/* LLC_BackgroundProcess() -------------------------- */
+/* LLC_BackgroundProcess(void) -------------------------- */
 
-void LLC_BackgroundProcess()
+void LLC_BackgroundProcess(void)
 {
   BUFCHAIN pB;
 
@@ -1560,7 +1561,7 @@ void LLC_Shutdown ( void )
   /* 25/3/96 - if our callback has been set, collect it now before
        we leave. All rx packets have been flushed & timers deleted,
        so it is safe to do this without fear of the consequences */
-  CollectCallbacks();
+  usermode_donothing();
 
   for ( i=0; i < MAX_LLC_CONN; i++ )
   {

c/NBIP

@@ -44,6 +44,7 @@
 #include "kernel.h"
 #include "os.h"
 #include "swis.h"
+#include "AsmUtils/callbacks.h"
 
 /* Our includes */
 
@@ -1331,7 +1332,7 @@ static NAME_ENTRY *FindRemoteName ( NETNAME *pnn )
     tstart = NB_GetTime();
     do
     {
-      CollectCallbacks();
+      usermode_donothing();
       NBIP_CallbackFn_handler();
       if (pNE->status == RMT_FOUND)
       {
@@ -1428,7 +1429,7 @@ EXPORT err_t _NB_AddLocalName ( nametype_t nt, char *name, hNAME *phName )
     tstart = NB_GetTime();
     do
     {
-      CollectCallbacks();
+      usermode_donothing();
       NBIP_CallbackFn_handler();
       if ( pNE->status == LCL_IN_CONFLICT )  /* Failed */
       {
@@ -1469,7 +1470,7 @@ EXPORT err_t _NB_RemoveLocalName ( hNAME hName )
       tstart = NB_GetTime();
       do
       {
-        CollectCallbacks();
+        usermode_donothing();
         NBIP_CallbackFn_handler();
       }
         while ( (NB_GetTime() - tstart) < 50 );
@@ -1515,7 +1516,7 @@ EXPORT int _NB_FindNames ( NETNAME *pnnFind,
   tstart = NB_GetTime();
   do
   {
-    CollectCallbacks();
+    usermode_donothing();
     NBIP_CallbackFn_handler();
   }
     while ( SR.spaces_left > 0 && (NB_GetTime() - tstart) < timeout );
@@ -1532,7 +1533,7 @@ EXPORT int _NB_FindNames ( NETNAME *pnnFind,
   tstart = NB_GetTime();
   do
   {
-    CollectCallbacks();
+    usermode_donothing();
     NBIP_CallbackFn_handler();
   }
     while ( SR.spaces_left > 0 && (NB_GetTime() - tstart) < timeout );
@@ -1602,7 +1603,7 @@ static bool ReadData ( int sid, BYTE *where, int len, uint timeout, int flags )
 
   while ( len > 0 )
   {
-    CollectCallbacks();   /* Let IP do its thing */
+    usermode_donothing();   /* Let IP do its thing */
     NBIP_CallbackFn_handler(); /* Process any datagrams */
 
     tv.tv_sec=0;
@@ -1827,7 +1828,7 @@ EXPORT err_t _NB_SendData ( hSESSION hS, BUFCHAIN Data )
   }
     while ( i==IOV_MAX );
 
-  CollectCallbacks();
+  usermode_donothing();
   FreeChain(Data);
   return OK;
 }
@@ -1867,7 +1868,7 @@ EXPORT err_t _NB_SendBlockData ( hSESSION hS, BYTE *where, int datalen )
     return ELINKFAILED;
   }
 
-  CollectCallbacks();
+  usermode_donothing();
   return OK;
 }
 

h/LanMan

@@ -89,7 +89,5 @@ extern void veneer_fsentry_gbpb( void );
 
 extern void Free_ServiceRoutine(void);
 
-extern void CollectCallbacks(void);
-
 extern char Default_FileTName[6];
 extern int Default_FileType;

s/Interface

@@ -21,7 +21,6 @@
 ; Original based on FSinC
 ; 20-10-94  IH  Add suicide callback bit
 ;               Add 'free' veneer
-; 26-01-96      Add CollectCallbacks
 ; **************************************************
 
         GET   Hdr:ListOpts