epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

bad init for the command table, I changed it to code-based init

Browse Source
This commit is contained in:
John Winans
1991-12-06 09:59:07 +00:00
parent 94b61d708a
commit 52208a6dbf
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/devOpt/devGpibInteract.c
View File

@@ -88,16 +88,8 @@ struct gpibIntCmd {
char busy; /* used by timing routine */
};
static struct gpibIntCmd gpibIntCmds[] =
{
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0}
};
#define LIST_SIZE sizeof(gpibIntCmds)/sizeof(struct gpibIntCmd)
#define LIST_SIZE 10
static struct gpibIntCmd gpibIntCmds[LIST_SIZE];
/* declare other required variables used by more than one routine */
@@ -129,6 +121,22 @@ GI()
firstTime = 0;
msgReply = semCreate();
for (cnt=0; cnt < LIST_SIZE; cnt++)
{ /* init the elements of the command table */
gpibIntCmds[cnt].head.header.list.list1 = NULL;
gpibIntCmds[cnt].head.header.list.list2 = NULL;
gpibIntCmds[cnt].head.workStart = gpibWork;
gpibIntCmds[cnt].head.link = 0;
gpibIntCmds[cnt].head.device = 0;
gpibIntCmds[cnt].head.bitBusDpvt= NULL; /* not supported yet */
gpibIntCmds[cnt].type = 'R';
gpibIntCmds[cnt].cmd[0] = '\0';
gpibIntCmds[cnt].resp[0] = '\0';
gpibIntCmds[cnt].count = 0;
gpibIntCmds[cnt].busy = 0;
}
}
ans = 0; /* set loop not to exit */

28
src/vxWorks/devOpt/devGpibInteract.c
View File

@@ -88,16 +88,8 @@ struct gpibIntCmd {
char busy; /* used by timing routine */
};
static struct gpibIntCmd gpibIntCmds[] =
{
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0},
{NULL, NULL, gpibWork, 0, 0, NULL, 'R', "", "", 0, 0}
};
#define LIST_SIZE sizeof(gpibIntCmds)/sizeof(struct gpibIntCmd)
#define LIST_SIZE 10
static struct gpibIntCmd gpibIntCmds[LIST_SIZE];
/* declare other required variables used by more than one routine */
@@ -129,6 +121,22 @@ GI()
firstTime = 0;
msgReply = semCreate();
for (cnt=0; cnt < LIST_SIZE; cnt++)
{ /* init the elements of the command table */
gpibIntCmds[cnt].head.header.list.list1 = NULL;
gpibIntCmds[cnt].head.header.list.list2 = NULL;
gpibIntCmds[cnt].head.workStart = gpibWork;
gpibIntCmds[cnt].head.link = 0;
gpibIntCmds[cnt].head.device = 0;
gpibIntCmds[cnt].head.bitBusDpvt= NULL; /* not supported yet */
gpibIntCmds[cnt].type = 'R';
gpibIntCmds[cnt].cmd[0] = '\0';
gpibIntCmds[cnt].resp[0] = '\0';
gpibIntCmds[cnt].count = 0;
gpibIntCmds[cnt].busy = 0;
}
}
ans = 0; /* set loop not to exit */