lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

- Removed unused oms58Setup() argument.

Browse Source 
- Remove #define STATIC.
This commit is contained in:
Ron Sluiter
2004-07-16 19:51:24 +00:00
parent 0036444049
commit bb474e03e5
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/OmsSrc/drvOms58.cc
+21 -23
View File
@@ -2,9 +2,9 @@
FILENAME... drvOms58.cc
USAGE... Motor record driver level support for OMS model VME58.
Version: $Revision: 1.10 $
Version: $Revision: 1.11 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-02-03 20:09:00 $
Last Modified: $Date: 2004-07-16 19:51:24 $
*/
/*
@@ -80,6 +80,7 @@ Last Modified: $Date: 2004-02-03 20:09:00 $
* described in;
* http://www.aps.anl.gov/upd/people/sluiter/epics/motor/R5-2/Problems.html
* .26 02-03-04 rls - Eliminate erroneous "Motor motion timeout ERROR".
* .27 07-16-04 rls - removed unused <driver>Setup() argument.
*/
#include <vxLib.h>
@@ -110,8 +111,6 @@ extern "C" {
#define PRIVATE_FUNCTIONS 1 /* normal:1, debug:0 */
#define STATIC static
/* Define for return test on devNoResponseProbe() */
#define PROBE_SUCCESS(STATUS) ((STATUS)==S_dev_addressOverlap)
@@ -141,12 +140,12 @@ int oms58_num_cards = 0;
#include "motordrvComCode.h"
/* --- Local data common to all OMS drivers. --- */
STATIC char *oms_addrs = 0x0;
STATIC volatile unsigned omsInterruptVector = 0;
STATIC volatile epicsUInt8 omsInterruptLevel = OMS_INT_LEVEL;
STATIC volatile int max_io_tries = MAX_COUNT;
STATIC volatile int motionTO = 10;
STATIC char oms58_axis[] = {'X', 'Y', 'Z', 'T', 'U', 'V', 'R', 'S'};
static char *oms_addrs = 0x0;
static volatile unsigned omsInterruptVector = 0;
static volatile epicsUInt8 omsInterruptLevel = OMS_INT_LEVEL;
static volatile int max_io_tries = MAX_COUNT;
static volatile int motionTO = 10;
static char oms58_axis[] = {'X', 'Y', 'Z', 'T', 'U', 'V', 'R', 'S'};
/*----------------functions-----------------*/
@@ -161,8 +160,8 @@ static void motorIsr(int card);
static int motor_init();
static void oms_reset();
STATIC void start_status(int card);
STATIC int motorIsrSetup(int card);
static void start_status(int card);
static int motorIsrSetup(int card);
struct driver_table oms58_access =
{
@@ -197,7 +196,7 @@ struct
epicsExportAddress(drvet, drvOms58);
STATIC struct thread_args targs = {SCAN_RATE, &oms58_access};
static struct thread_args targs = {SCAN_RATE, &oms58_access};
/*----------------functions-----------------*/
@@ -232,7 +231,7 @@ static long init()
}
STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
static void query_done(int card, int axis, struct mess_node *nodeptr)
{
char buffer[40];
@@ -255,7 +254,7 @@ STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
* start_status(int card)
* if card == -1 then start all cards
*********************************************************/
STATIC void start_status(int card)
static void start_status(int card)
{
volatile struct vmex_motor *pmotor;
CNTRL_REG cntrlReg;
@@ -343,7 +342,7 @@ STATIC void start_status(int card)
* EXIT with return state indicator.
******************************************************************************/
STATIC int set_status(int card, int signal)
static int set_status(int card, int signal)
{
struct mess_info *motor_info;
struct mess_node *nodeptr;
@@ -584,7 +583,7 @@ errorexit: errMessage(-1, "Invalid device directive");
/* send a message to the OMS board */
/* send_mess() */
/*****************************************************/
STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
static RTN_STATUS send_mess(int card, char const *com, char inchar)
{
volatile struct vmex_motor *pmotor;
epicsInt16 putIndex;
@@ -691,7 +690,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
* ENDFOR
*
*/
STATIC int recv_mess(int card, char *com, int amount)
static int recv_mess(int card, char *com, int amount)
{
volatile struct vmex_motor *pmotor;
epicsInt16 getIndex;
@@ -815,7 +814,6 @@ STATIC int recv_mess(int card, char *com, int amount)
/* areas. omsSetup() */
/*****************************************************/
int oms58Setup(int num_cards, /* maximum number of cards in rack */
int num_channels,/* Not used - Channels per card (4 or 8) */
void *addrs, /* Base Address(0x0-0xb000 on 4K boundary) */
unsigned vector, /* noninterrupting(0), valid vectors(64-255) */
int int_level, /* interrupt level (1-6) */
@@ -866,7 +864,7 @@ int oms58Setup(int num_cards, /* maximum number of cards in rack */
/* Interrupt service routine. */
/* motorIsr() */
/*****************************************************/
STATIC void motorIsr(int card)
static void motorIsr(int card)
{
volatile struct controller *pmotorState;
volatile struct vmex_motor *pmotor;
@@ -923,7 +921,7 @@ STATIC void motorIsr(int card)
card, 0, 0, 0, 0, 0);
}
STATIC int motorIsrSetup(int card)
static int motorIsrSetup(int card)
{
volatile struct vmex_motor *pmotor;
long status;
@@ -972,7 +970,7 @@ STATIC int motorIsrSetup(int card)
/* initialize all software and hardware */
/* motor_init() */
/*****************************************************/
STATIC int motor_init()
static int motor_init()
{
volatile struct controller *pmotorState;
volatile struct vmex_motor *pmotor;
@@ -1173,7 +1171,7 @@ STATIC int motor_init()
/* Disables interrupts. Called on CTL X reboot. */
STATIC void oms_reset()
static void oms_reset()
{
short card;
volatile struct vmex_motor *pmotor;