Commit de71e2fe authored by Franksen, Benjamin's avatar Franksen, Benjamin
Browse files

fix in LowCAL: always return PROT_INHIB from lowcal_get


Previously, PROT_INHIB was returned only if the member prot_inhibit
of Buf_Entry was non-zero. This member is no longer initialized, so
the result was that the writer always used the blocking sci_write.
This patch removed the prot_inhibit member and returns the PROT_INHIB
flag unconditionally.
parent a3e50e89
......@@ -199,7 +199,6 @@ typedef struct
/* a function to query the higher protocol
layer about that variable */
void* query_data; /* Parameter to function query_func() */
int inhibit_time;
#ifdef LCAL_STAT
Buf_Stat stat; /* Statistics */
#endif
......@@ -693,7 +692,6 @@ prot_Return lowcal_init_start (
glbl_num_slots = num_slots;
/* Set up error buf */
ERRORBUF.inhibit_time=0;
ERRORBUF.err_type = errtype;
ERRORBUF.out_data[1] = LCAL_E_IMUX;
......@@ -930,7 +928,6 @@ prot_Return lowcal_init_entity_cb (
}
/* Connect varset to slot */
slot_p->varset_p = varset;
slot_p->inhibit_time= 0;
}
UNLOCK(mutex); /* End of critical section */
......@@ -1465,8 +1462,7 @@ prot_Return lowcal_get (
}
}
if (slot_p->inhibit_time!=0)
func_ret |= PROT_INHIB;
func_ret |= PROT_INHIB;
EXIT:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment