From 342f876e3725b92f87531d4d5bfcb6b47fb1f184 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 8 Dec 2005 00:13:22 +0000 Subject: [PATCH] Added epicsShareFunc to globals for Windows --- motorApp/MotorSrc/motordevCom.cc | 21 ++++++++++++--------- motorApp/MotorSrc/motordrvCom.cc | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/motorApp/MotorSrc/motordevCom.cc b/motorApp/MotorSrc/motordevCom.cc index ae6dfebb..340ef2fe 100644 --- a/motorApp/MotorSrc/motordevCom.cc +++ b/motorApp/MotorSrc/motordevCom.cc @@ -3,9 +3,9 @@ FILENAME: motordevCom.cc USAGE... This file contains device functions that are common to all motor record device support modules. -Version: $Revision: 1.8 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-10-20 20:01:41 $ +Version: $Revision: 1.9 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2005-12-08 00:12:54 $ */ /* @@ -61,9 +61,12 @@ Last Modified: $Date: 2005-10-20 20:01:41 $ #include "motorRecord.h" #include "motor.h" -#include "motordevCom.h" #include "motordrvCom.h" +#define epicsExportSharedSymbols +#include +#include "motordevCom.h" + static void motor_callback(struct mess_node * motor_return); static void motor_init_callback(struct mess_node * motor_return); @@ -71,7 +74,7 @@ static void motor_init_callback(struct mess_node * motor_return); "motor_cmnds" in motor.h . */ -long motor_init_com(int after, int brdcnt, struct driver_table *tabptr, +epicsShareFunc long motor_init_com(int after, int brdcnt, struct driver_table *tabptr, struct board_stat ***sptr) /* Initialize motor record device support. */ { MOTOR_CARD_QUERY card_query; @@ -173,7 +176,7 @@ LOGIC... NORMAL RETURN. */ -long motor_init_record_com(struct motorRecord *mr, int brdcnt, struct driver_table *tabptr, +epicsShareFunc long motor_init_record_com(struct motorRecord *mr, int brdcnt, struct driver_table *tabptr, struct board_stat *sptr[]) { struct motor_dset *pdset = (struct motor_dset *) (mr->dset); @@ -384,7 +387,7 @@ USAGE... Update the following motor record fields with the latest driver data: NOTES... This function MUST BE reentrant. */ -CALLBACK_VALUE motor_update_values(struct motorRecord * mr) +epicsShareFunc CALLBACK_VALUE motor_update_values(struct motorRecord * mr) { struct motor_trans *ptrans; CALLBACK_VALUE rc; @@ -418,7 +421,7 @@ USAGE... Start building a transaction. NOTES... This function MUST BE reentrant. */ -long motor_start_trans_com(struct motorRecord *mr, struct board_stat **sptr) +epicsShareFunc long motor_start_trans_com(struct motorRecord *mr, struct board_stat **sptr) { int card = mr->out.value.vmeio.card; int axis = mr->out.value.vmeio.signal; @@ -452,7 +455,7 @@ USAGE... Finish building a transaction. NOTES... This function MUST BE reentrant. */ -RTN_STATUS motor_end_trans_com(struct motorRecord *mr, struct driver_table *tabptr) +epicsShareFunc RTN_STATUS motor_end_trans_com(struct motorRecord *mr, struct driver_table *tabptr) { struct motor_trans *trans = (struct motor_trans *) mr->dpvt; struct mess_node *motor_call; diff --git a/motorApp/MotorSrc/motordrvCom.cc b/motorApp/MotorSrc/motordrvCom.cc index 84b86d32..3dccdbb0 100644 --- a/motorApp/MotorSrc/motordrvCom.cc +++ b/motorApp/MotorSrc/motordrvCom.cc @@ -3,9 +3,9 @@ FILENAME... motordrvCom.cc USAGE... This file contains driver functions that are common to all motor record driver modules. -Version: $Revision: 1.13 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2005-05-10 16:31:21 $ +Version: $Revision: 1.14 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2005-12-08 00:13:22 $ */ /* @@ -54,6 +54,9 @@ Last Modified: $Date: 2005-05-10 16:31:21 $ #include #include "motor.h" + +#define epicsExportSharedSymbols +#include #include "motordrvCom.h" /*----------------debugging-----------------*/ @@ -121,7 +124,7 @@ static struct mess_node *motor_malloc(struct circ_queue *, epicsEvent *); */ /*****************************************************/ -int motor_task(struct thread_args *args) +epicsShareFunc int motor_task(struct thread_args *args) { struct driver_table *tabptr; bool sem_ret; @@ -463,7 +466,7 @@ static struct mess_node *get_head_node(struct driver_table *tabptr) * Insert new node at tail of queue. */ -RTN_STATUS motor_send(struct mess_node *u_msg, struct driver_table *tabptr) +epicsShareFunc RTN_STATUS motor_send(struct mess_node *u_msg, struct driver_table *tabptr) { struct mess_node *new_message; struct circ_queue *qptr; @@ -539,7 +542,7 @@ static struct mess_node *motor_malloc(struct circ_queue *freelistptr, epicsEvent return (node); } -int motor_free(struct mess_node * node, struct driver_table *tabptr) +epicsShareFunc int motor_free(struct mess_node * node, struct driver_table *tabptr) { struct circ_queue *freelistptr; @@ -574,7 +577,7 @@ int motor_free(struct mess_node * node, struct driver_table *tabptr) */ /* return the card information to caller */ -int motor_card_info(int card, MOTOR_CARD_QUERY * cq, struct driver_table *tabptr) +epicsShareFunc int motor_card_info(int card, MOTOR_CARD_QUERY * cq, struct driver_table *tabptr) { struct controller *brdptr; @@ -593,7 +596,7 @@ int motor_card_info(int card, MOTOR_CARD_QUERY * cq, struct driver_table *tabptr } /* return information for an axis to the caller */ -int motor_axis_info(int card, int signal, MOTOR_AXIS_QUERY * aq, struct driver_table *tabptr) +epicsShareFunc int motor_axis_info(int card, int signal, MOTOR_AXIS_QUERY * aq, struct driver_table *tabptr) { struct controller *brdptr;