diff --git a/src/ioc/db/chfPlugin.c b/src/ioc/db/chfPlugin.c index f249d854b..86ddbc662 100644 --- a/src/ioc/db/chfPlugin.c +++ b/src/ioc/db/chfPlugin.c @@ -6,6 +6,10 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Ralph Lange + */ + /* Based on the linkoptions utility by Michael Davidsaver (BNL) */ #include diff --git a/src/ioc/db/chfPlugin.h b/src/ioc/db/chfPlugin.h index d6762481a..29e78fe76 100644 --- a/src/ioc/db/chfPlugin.h +++ b/src/ioc/db/chfPlugin.h @@ -6,6 +6,12 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Ralph Lange + */ + +/* Based on the linkoptions utility by Michael Davidsaver (BNL) */ + #ifndef CHFPLUGIN_H #define CHFPLUGIN_H @@ -16,8 +22,6 @@ struct db_field_log; -/* Based on the linkoptions utility by Michael Davidsaver (BNL) */ - /** @file chfPlugin.h * @brief Channel filter simplified plugins. * diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c index 9a7cc4137..c6247543c 100644 --- a/src/ioc/db/dbAccess.c +++ b/src/ioc/db/dbAccess.c @@ -1,20 +1,21 @@ /*************************************************************************\ +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbAccess.c */ -/* $Revision-Id$ */ + /* * Original Author: Bob Dalesio * Current Author: Marty Kraimer - * Date: 11-7-90 -*/ - + * Andrew Johnson + * Ralph Lange + */ #include #include diff --git a/src/ioc/db/dbChannel.c b/src/ioc/db/dbChannel.c index ca81540a9..e4c932109 100644 --- a/src/ioc/db/dbChannel.c +++ b/src/ioc/db/dbChannel.c @@ -1,10 +1,18 @@ /*************************************************************************\ * Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Andrew Johnson + * Ralph Lange + */ + #include #include diff --git a/src/ioc/db/dbChannel.h b/src/ioc/db/dbChannel.h index 04f571fd0..21ba8ac96 100644 --- a/src/ioc/db/dbChannel.h +++ b/src/ioc/db/dbChannel.h @@ -1,10 +1,18 @@ /*************************************************************************\ * Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Andrew Johnson + * Ralph Lange + */ + #ifndef INC_dbChannel_H #define INC_dbChannel_H diff --git a/src/ioc/db/dbEvent.c b/src/ioc/db/dbEvent.c index cd9794cbf..9b509612d 100644 --- a/src/ioc/db/dbEvent.c +++ b/src/ioc/db/dbEvent.c @@ -1,19 +1,20 @@ /*************************************************************************\ +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbEvent.c */ -/* $Revision-Id$ */ -/* routines for scheduling events to lower priority tasks via the RT kernel */ + /* - * Author: Jeffrey O. Hill - * Date: 4-1-89 -*/ + * Author: Jeffrey O. Hill + * + * Ralph Lange + */ #include #include @@ -98,9 +99,9 @@ struct event_user { ( (unsigned short) ( (OLD) >= (EVENTQUESIZE-1) ? 0 : (OLD)+1 ) ) #define LOCKEVQUE(EV_QUE) epicsMutexMustLock((EV_QUE)->writelock) -#define UNLOCKEVQUE(EV_QUE) {epicsMutexUnlock((EV_QUE)->writelock);} +#define UNLOCKEVQUE(EV_QUE) epicsMutexUnlock((EV_QUE)->writelock) #define LOCKREC(RECPTR) epicsMutexMustLock((RECPTR)->mlok) -#define UNLOCKREC(RECPTR) {epicsMutexUnlock((RECPTR)->mlok);} +#define UNLOCKREC(RECPTR) epicsMutexUnlock((RECPTR)->mlok) static void *dbevEventUserFreeList; static void *dbevEventQueueFreeList; @@ -149,13 +150,13 @@ int epicsShareAPI dbel ( const char *pname, unsigned level ) return DB_EVENT_ERROR; } - LOCKREC (addr.precord) + LOCKREC (addr.precord); pevent = (struct evSubscrip *) ellFirst ( &addr.precord->mlis ); if ( ! pevent ) { printf ( "\"%s\": No PV event subscriptions ( monitors ).\n", pname ); - UNLOCKREC (addr.precord) + UNLOCKREC (addr.precord); return DB_EVENT_OK; } @@ -234,7 +235,7 @@ int epicsShareAPI dbel ( const char *pname, unsigned level ) pevent = (struct evSubscrip *) ellNext ( &pevent->node ); } - UNLOCKREC (addr.precord) + UNLOCKREC (addr.precord); return DB_EVENT_OK; } @@ -442,12 +443,12 @@ void epicsShareAPI db_event_enable (dbEventSubscription event) struct evSubscrip * const pevent = (struct evSubscrip *) event; struct dbCommon * const precord = dbChannelRecord(pevent->chan); - LOCKREC (precord) + LOCKREC (precord); if ( ! pevent->enabled ) { ellAdd (&precord->mlis, &pevent->node); pevent->enabled = TRUE; } - UNLOCKREC (precord) + UNLOCKREC (precord); } /* @@ -458,12 +459,12 @@ void epicsShareAPI db_event_disable (dbEventSubscription event) struct evSubscrip * const pevent = (struct evSubscrip *) event; struct dbCommon * const precord = dbChannelRecord(pevent->chan); - LOCKREC (precord) + LOCKREC (precord); if ( pevent->enabled ) { ellDelete(&precord->mlis, &pevent->node); pevent->enabled = FALSE; } - UNLOCKREC (precord) + UNLOCKREC (precord); } /* @@ -509,7 +510,7 @@ void epicsShareAPI db_cancel_event (dbEventSubscription event) * make certain that the event isnt being accessed while * its call back changes */ - LOCKEVQUE (pevent->ev_que) + LOCKEVQUE (pevent->ev_que); pevent->user_sub = NULL; @@ -542,15 +543,15 @@ void epicsShareAPI db_cancel_event (dbEventSubscription event) } else { while ( pevent->callBackInProgress ) { - UNLOCKEVQUE (pevent->ev_que) + UNLOCKEVQUE (pevent->ev_que); epicsEventMustWait ( pevent->ev_que->evUser->pflush_sem ); - LOCKEVQUE (pevent->ev_que) + LOCKEVQUE (pevent->ev_que); } } pevent->ev_que->quota -= EVENTENTRIES; - UNLOCKEVQUE (pevent->ev_que) + UNLOCKEVQUE (pevent->ev_que); freeListFree ( dbevEventSubscriptionFreeList, pevent ); @@ -687,7 +688,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) * threads writing/reading it */ - LOCKEVQUE (ev_que) + LOCKEVQUE (ev_que); /* * if we have an event on the queue and both the last @@ -699,7 +700,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) (*pevent->pLastLog)->type == dbfl_type_rec && pLog->type == dbfl_type_rec) { db_delete_field_log(pLog); - UNLOCKEVQUE (ev_que) + UNLOCKEVQUE (ev_que); return; } @@ -755,7 +756,7 @@ static void db_queue_event_log (evSubscrip *pevent, db_field_log *pLog) ev_que->putix = RNGINC ( ev_que->putix ); } - UNLOCKEVQUE (ev_que) + UNLOCKEVQUE (ev_que); /* * its more efficent to notify the event handler @@ -788,7 +789,7 @@ unsigned int caEventMask if (prec->mlis.count == 0) return DB_EVENT_OK; /* no monitors set */ - LOCKREC (prec) + LOCKREC (prec); for (pevent = (struct evSubscrip *) prec->mlis.node.next; pevent; pevent = (struct evSubscrip *) pevent->node.next){ @@ -805,7 +806,7 @@ unsigned int caEventMask } } - UNLOCKREC (prec) + UNLOCKREC (prec); return DB_EVENT_OK; } @@ -840,7 +841,7 @@ static int event_read ( struct event_que *ev_que ) * evUser ring buffer must be locked for the multiple * threads writing/reading it */ - LOCKEVQUE (ev_que) + LOCKEVQUE (ev_que); /* * if in flow control mode drain duplicates and then @@ -848,7 +849,7 @@ static int event_read ( struct event_que *ev_que ) * mode is over */ if ( ev_que->evUser->flowCtrlMode && ev_que->nDuplicates == 0u ) { - UNLOCKEVQUE (ev_que) + UNLOCKEVQUE (ev_que); return DB_EVENT_OK; } @@ -900,7 +901,7 @@ static int event_read ( struct event_que *ev_que ) * it. */ pevent->callBackInProgress = TRUE; - UNLOCKEVQUE (ev_que) + UNLOCKEVQUE (ev_que); /* Run post-event-queue filter chain */ if (ellCount(&pevent->chan->post_chain)) { dbChannelRunPostChain(pevent->chan, pfl); @@ -908,7 +909,7 @@ static int event_read ( struct event_que *ev_que ) /* Issue user callback */ ( *user_sub ) ( pevent->user_arg, pevent->chan, ev_que->evque[ev_que->getix] != EVENTQEMPTY, pfl ); - LOCKEVQUE (ev_que) + LOCKEVQUE (ev_que); /* * check to see if this event has been canceled each @@ -933,7 +934,7 @@ static int event_read ( struct event_que *ev_que ) db_delete_field_log(pfl); } - UNLOCKEVQUE (ev_que) + UNLOCKEVQUE (ev_que); return DB_EVENT_OK; } diff --git a/src/ioc/db/dbEvent.h b/src/ioc/db/dbEvent.h index bbd4ff06b..323a3d4e0 100644 --- a/src/ioc/db/dbEvent.h +++ b/src/ioc/db/dbEvent.h @@ -1,17 +1,19 @@ /*************************************************************************\ +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ + /* - * $Revision-Id$ + * Author: Jeffrey O. Hill * - * Author: Jeff Hill - * Date: 030393 + * Ralph Lange */ #ifndef INCLdbEventh diff --git a/src/ioc/db/dbNotify.c b/src/ioc/db/dbNotify.c index 1280291d2..401bc371b 100644 --- a/src/ioc/db/dbNotify.c +++ b/src/ioc/db/dbNotify.c @@ -1,17 +1,17 @@ /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne - * National Laboratory. - * Copyright (c) 2002 The Regents of the University of California, as - * Operator of Los Alamos National Laboratory. - * EPICS BASE Versions 3.13.7 - * and higher are distributed subject to a Software License Agreement found - * in file LICENSE that is included with this distribution. - \*************************************************************************/ -/* dbNotify.c */ -/* base/src/db $Revision-Id$ */ +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE Versions 3.13.7 +* and higher are distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + /* * Author: Marty Kraimer - * Date: 03-30-95 + * Andrew Johnson + * * Extracted from dbLink.c */ diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c index f1ea31a01..792469676 100644 --- a/src/ioc/db/db_access.c +++ b/src/ioc/db/db_access.c @@ -7,12 +7,10 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ */ - /* Interface between old database access and new * * Author: Marty Kraimer - * Date: 6-1-90 + * Andrew Johnson */ #include diff --git a/src/ioc/db/db_access_routines.h b/src/ioc/db/db_access_routines.h index 380afb0fa..d890f1d1c 100644 --- a/src/ioc/db/db_access_routines.h +++ b/src/ioc/db/db_access_routines.h @@ -1,10 +1,9 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ /* base/include/db_access_routines.h */ diff --git a/src/ioc/db/db_field_log.h b/src/ioc/db/db_field_log.h index 53ea242d7..22f3108d6 100644 --- a/src/ioc/db/db_field_log.h +++ b/src/ioc/db/db_field_log.h @@ -1,16 +1,21 @@ /*************************************************************************\ +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ - * Author: Jeffrey O. Hill - * Date: 4-1-89 + +/* + * Author: Jeffrey O. Hill + * + * Ralph Lange */ + #ifndef INCLdb_field_logh #define INCLdb_field_logh diff --git a/src/ioc/db/db_test.c b/src/ioc/db/db_test.c index 352d0b285..45a5ceca5 100644 --- a/src/ioc/db/db_test.c +++ b/src/ioc/db/db_test.c @@ -1,17 +1,17 @@ /*************************************************************************\ * Copyright (c) 2002 The University of Chicago, as Operator of Argonne - * National Laboratory. - * Copyright (c) 2002 The Regents of the University of California, as - * Operator of Los Alamos National Laboratory. - * EPICS BASE Versions 3.13.7 - * and higher are distributed subject to a Software License Agreement found - * in file LICENSE that is included with this distribution. - \*************************************************************************/ -/* share/src/db @(#)db_test.c 1.10 2/3/94 */ +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE Versions 3.13.7 +* and higher are distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + /* database access subroutines */ /* * Author: Bob Dalesio - * Date: 4/15/88 + * Andrew Johnson */ #include #include diff --git a/src/ioc/db/recGbl.c b/src/ioc/db/recGbl.c index 2ccac3a07..80c55eb64 100644 --- a/src/ioc/db/recGbl.c +++ b/src/ioc/db/recGbl.c @@ -6,12 +6,10 @@ * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* recGbl.c */ -/* $Revision-Id$ */ /* * Author: Marty Kraimer - * Date: 11-7-90 + * Andrew Johnson */ #include diff --git a/src/ioc/db/test/chfPluginTest.c b/src/ioc/db/test/chfPluginTest.c index 7c2613c44..ac0e579e5 100644 --- a/src/ioc/db/test/chfPluginTest.c +++ b/src/ioc/db/test/chfPluginTest.c @@ -6,6 +6,10 @@ * in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Ralph Lange + */ + #include #include "chfPlugin.h" diff --git a/src/ioc/db/test/dbChannelTest.c b/src/ioc/db/test/dbChannelTest.c index df49c1183..c126c7625 100644 --- a/src/ioc/db/test/dbChannelTest.c +++ b/src/ioc/db/test/dbChannelTest.c @@ -1,10 +1,18 @@ /*************************************************************************\ * Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne - * National Laboratory. - * EPICS BASE is distributed subject to a Software License Agreement found - * in file LICENSE that is included with this distribution. +* National Laboratory. +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. \*************************************************************************/ +/* + * Author: Andrew Johnson + * Ralph Lange + */ + #include "dbChannel.h" #include "dbStaticLib.h" #include "dbAccessDefs.h" diff --git a/src/ioc/rsrv/camessage.c b/src/ioc/rsrv/camessage.c index f43df2c77..c52d18347 100644 --- a/src/ioc/rsrv/camessage.c +++ b/src/ioc/rsrv/camessage.c @@ -1,4 +1,7 @@ /*************************************************************************\ +* Copyright (c) 2010 Brookhaven National Laboratory. +* Copyright (c) 2010 Helmholtz-Zentrum Berlin +* fuer Materialien und Energie GmbH. * Copyright (c) 2002 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as @@ -8,8 +11,9 @@ \*************************************************************************/ /* - * Author: Jeffrey O. Hill + * Author: Jeffrey O. Hill * + * Ralph Lange */ #include diff --git a/src/libCom/ellLib/ellLib.h b/src/libCom/ellLib/ellLib.h index 3bc167a41..ea90774cf 100644 --- a/src/libCom/ellLib/ellLib.h +++ b/src/libCom/ellLib/ellLib.h @@ -1,15 +1,16 @@ /*************************************************************************\ -* Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne +* Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. * EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* $Revision-Id$ + +/* * * Author: John Winans (ANL) - * Date: 07-02-92 + * Andrew Johnson */ #ifndef INC_ellLib_H #define INC_ellLib_H