Reintroduced two different interfaces (=widths) for priority.

This commit is contained in:
Ralph Lange
2002-02-05 10:35:25 +00:00
parent 3562336111
commit 0e3bb1193a
4 changed files with 10 additions and 11 deletions
+5 -5
View File
@@ -1,5 +1,5 @@
/* $Id$
/*
* $Id$
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -19,7 +19,7 @@
class caServerID {
public:
caServerID ( const struct sockaddr_in & addrIn, unsigned char priority );
caServerID ( const struct sockaddr_in & addrIn, unsigned priority );
bool operator == ( const caServerID & ) const;
resTableIndex hash () const;
static unsigned maxIndexBitWidth ();
@@ -38,8 +38,8 @@ static const unsigned caServerMinIndexBitWidth = 2u;
static const unsigned caServerMaxIndexBitWidth = 32u;
inline caServerID::caServerID (
const struct sockaddr_in & addrIn, unsigned char priorityIn ) :
addr ( addrIn ), pri ( priorityIn )
const struct sockaddr_in & addrIn, unsigned priorityIn ) :
addr ( addrIn ), pri ( static_cast <ca_uint8_t> ( priorityIn ) )
{
assert ( priorityIn <= 0xff );
}
+1 -2
View File
@@ -1,4 +1,3 @@
/*
* $Id$
*
@@ -124,7 +123,7 @@ public:
//
class epicsShareClass cacChannel {
public:
typedef unsigned char priLev;
typedef unsigned priLev;
static const priLev priorityMax;
static const priLev priorityMin;
static const priLev priorityDefault;
+1 -1
View File
@@ -242,7 +242,7 @@ epicsShareFunc int epicsShareAPI ca_search_and_connect
/* End of anachronistic entry points */
/************************************************************************/
typedef unsigned char capri;
typedef unsigned capri;
#define CA_PRIORITY_MAX 99
#define CA_PRIORITY_MIN 0
#define CA_PRIORITY_DEFAULT CA_PRIORITY_MIN
+3 -3
View File
@@ -1,5 +1,5 @@
/* $Id$
/*
* $Id$
*
* L O S A L A M O S
* Los Alamos National Laboratory
@@ -58,7 +58,7 @@ nciu::nciu ( cac & cacIn, netiiu & iiuIn, cacChannelNotify & chanIn,
retrySeqNo ( 0u ),
nameLength ( static_cast <ca_uint16_t> ( strlen ( pNameIn ) + 1 ) ),
typeCode ( USHRT_MAX ),
priority ( pri ),
priority ( static_cast <ca_uint8_t> ( pri ) ),
f_connected ( false ),
f_previousConn ( false ),
f_claimSent ( false ),