replace osiMutex with epicsMutex; osiEvent with epicsEvent

src/db/dbCAC.h

@@ -82,7 +82,7 @@ public:
     void * operator new ( size_t size );
     void operator delete ( void *pCadaver, size_t size );
 private:
-    osiEvent block;
+    epicsEvent block;
     dbPutNotifyIO *pPN;
     dbChannelIO &chan;
 
@@ -150,6 +150,6 @@ private:
     dbEventCtx ctx;
     char *pEventCallbackCache;
     unsigned long eventCallbackCacheSize;
-    osiMutex mutex;
+    epicsMutex mutex;
 };
 

src/db/dbCa.c

@@ -626,7 +626,8 @@ void dbCaTask()
     short	link_action;
     int		status;
 
-    SEVCHK(ca_context_create(enablePreemption),"dbCaTask calling ca_task_initialize");
+    SEVCHK(ca_context_create(enablePreemption),
+        "dbCaTask calling ca_context_create");
     SEVCHK(ca_add_exception_event(exceptionCallback,NULL),
 	"ca_add_exception_event");
     /*Dont do anything until iocInit initializes database*/

src/db/dbChannelIO.cpp

@@ -20,7 +20,7 @@
 #include "cadef.h"
 #include "cacIO.h"
 #include "tsFreeList.h"
-#include "osiMutex.h"
+#include "epicsMutex.h"
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"

src/db/dbPutNotifyBlocker.cpp

@@ -19,7 +19,7 @@
 #include "limits.h"
 #include "string.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "osiTime.h"
 #include "tsFreeList.h"
 #include "errMdef.h"

src/db/dbPutNotifyIO.cpp

@@ -19,7 +19,7 @@
 #include "limits.h"
 #include "string.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 #include "errMdef.h"
 

src/db/dbServiceIO.cpp

@@ -17,7 +17,7 @@
 
 #include "limits.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 
 #include "cadef.h"

src/db/dbSubscriptionIO.cpp

@@ -17,7 +17,7 @@
 
 #include "limits.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 
 #include "cadef.h"