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

Fixed sevaeral bugs. Allow numeric types for choices.

Browse Source
This commit is contained in:
Marty Kraimer
1991-07-31 16:30:44 +00:00
parent adf203c1c9
commit 49856492d2
1 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/db/dbAccess.c
View File

@@ -29,7 +29,7 @@
*
* Modification Log:
* -----------------
* .01 mm-dd-yy iii Comment
* .01 07-26-91 mrk Allow choices to be retrieved as numeric
*/
/* Global Database Access Routines
@@ -2820,23 +2820,6 @@ static long getGchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
return(0);
}
static long getGchoiceEnum(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
{
unsigned short *psrc=(unsigned short *)(paddr->pfield);
if(no_elements!=1){
recGblDbaddrError(S_db_onlyOne,paddr,"dbGetField(getGchoiceEnum)");
return(S_db_onlyOne);
}
*pbuffer = *psrc;
return(0);
}
static long getCchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
char *pbuffer;
@@ -2859,22 +2842,6 @@ static long getCchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
return(0);
}
static long getCchoiceEnum(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
{
unsigned short *psrc=(unsigned short *)(paddr->pfield);
if(no_elements!=1){
recGblDbaddrError(S_db_onlyOne,paddr,"dbGetField(getCchoiceEnum)");
return(S_db_onlyOne);
}
*pbuffer = *psrc;
return(0);
}
static long getRchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
@@ -2903,23 +2870,7 @@ static long getRchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
return(0);
}
static long getRchoiceEnum(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
{
unsigned short *psrc=(unsigned short *)(paddr->pfield);
if(no_elements!=1){
recGblDbaddrError(S_db_onlyOne,paddr,"dbGetField(getRchoiceEnum)");
return(S_db_onlyOne);
}
*pbuffer = *psrc;
return(0);
}
static long getDchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
char *pbuffer;
@@ -2943,23 +2894,6 @@ static long getDchoiceString(paddr,pbuffer,nRequest,no_elements,offset)
strncpy(pbuffer,pdevChoice->pchoice,MAX_STRING_SIZE);
return(0);
}
static long getDchoiceEnum(paddr,pbuffer,nRequest,no_elements,offset)
struct dbAddr *paddr;
unsigned short *pbuffer;
long nRequest;
long no_elements;
long offset;
{
unsigned short *psrc=(unsigned short *)(paddr->pfield);
if(no_elements!=1){
recGblDbaddrError(S_db_onlyOne,paddr,"dbGetField(getDchoiceEnum)");
return(S_db_onlyOne);
}
*pbuffer = *psrc;
return(0);
}
/* This is the table of routines for converting database fields */
/* the rows represent the field type of the database field */
@@ -3003,17 +2937,17 @@ long (*get_convert_table[DBF_DEVCHOICE+1][DBR_ENUM+1])() = {
{getEnumString, getEnumChar, getEnumUchar, getEnumShort, getEnumUshort,
getEnumLong, getEnumUlong, getEnumFloat, getEnumDouble, getEnumEnum},
/* source is a DBF_GBLCHOICE */
{getGchoiceString,NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, getGchoiceEnum},
{getGchoiceString,getEnumChar, getEnumUchar, getEnumShort, getEnumUshort,
getEnumLong, getEnumUlong, getEnumFloat, getEnumDouble, getEnumEnum},
/* source is a DBF_CVTCHOICE */
{getCchoiceString,NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, getCchoiceEnum},
{getCchoiceString,getEnumChar, getEnumUchar, getEnumShort, getEnumUshort,
getEnumLong, getEnumUlong, getEnumFloat, getEnumDouble, getEnumEnum},
/* source is a DBF_RECCHOICE */
{getRchoiceString,NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, getRchoiceEnum},
{getRchoiceString,getEnumChar, getEnumUchar, getEnumShort, getEnumUshort,
getEnumLong, getEnumUlong, getEnumFloat, getEnumDouble, getEnumEnum},
/* source is a DBF_DEVCHOICE */
{getDchoiceString,NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, getDchoiceEnum}
{getDchoiceString,getEnumChar, getEnumUchar, getEnumShort, getEnumUshort,
getEnumLong, getEnumUlong, getEnumFloat, getEnumDouble, getEnumEnum}
};
@@ -3306,7 +3240,7 @@ long *options;
(*prset->get_alarm_double)(paddr,&ald);
got_data=TRUE;
}
if( (*options) & (DBR_GR_LONG) ) {
if( (*options) & (DBR_AL_LONG) ) {
char *pbuffer=*ppbuffer;
if(got_data) {
@@ -3321,7 +3255,7 @@ long *options;
}
*ppbuffer += dbr_alLong_size;
}
if( (*options) & (DBR_GR_DOUBLE) ) {
if( (*options) & (DBR_AL_DOUBLE) ) {
char *pbuffer=*ppbuffer;
if(got_data) {