diff --git a/src/rm_policy.c b/src/rm_policy.c
index 396a08d7367776a1be0c509a8fe7863c831d5d21..63f1dc0e1cd136aa9639a7aafd1aa8fe894a6a8f 100644 (file)
--- a/src/rm_policy.c
+++ b/src/rm_policy.c
tree = rmInst->u.server.globalValidInstTree;
}
else if (rmInst->instType == Rm_instType_CLIENT_DELEGATE) {
- tree = rmInst->u.cd.staticValidInstTree;
+ tree = rmInst->u.cd.cdValidInstTree;
}
else if (rmInst->instType == Rm_instType_CLIENT) {
tree = rmInst->u.client.staticValidInstTree;
policy = rmInst->u.server.globalPolicy;
}
else if (rmInst->instType == Rm_instType_CLIENT_DELEGATE) {
- policy = rmInst->u.cd.staticPolicy;
+ policy = rmInst->u.cd.cdPolicy;
}
else if (rmInst->instType == Rm_instType_CLIENT) {
policy = rmInst->u.client.staticPolicy;
* Policy DTB.
*/
uint32_t rmPolicyGetResourceBase(void *policyDtb, Rm_PolicyValidInstNode *validInstNode,
- int32_t resourceOffset, uint32_t allocType,
+ int32_t resourceOffset, Rm_PolicyCheckType policyCheckType,
int32_t *result)
{
@@ -699,12 +699,12 @@ uint32_t rmPolicyGetResourceBase(void *policyDtb, Rm_PolicyValidInstNode *validI
if ((strncmp(permission->instName, validInstNode->name, RM_NAME_MAX_CHARS) == 0) ||
(strncmp(permission->instName, Rm_policyAllInstances, RM_NAME_MAX_CHARS) == 0)) {
/* Check instance's permissions */
- if (RM_policy_GET_PERM(allocType, RM_POLICY_PERM_INIT_SHIFT) &&
+ if ((policyCheckType == Rm_policyCheck_INIT) &&
RM_policy_GET_PERM(permission->permissionBits, RM_POLICY_PERM_INIT_SHIFT)) {
resourceBase = assignment->resourceBase;
break;
}
- else if (RM_policy_GET_PERM(allocType, RM_POLICY_PERM_USE_SHIFT) &&
+ else if ((policyCheckType == Rm_policyCheck_USE) &&
RM_policy_GET_PERM(permission->permissionBits, RM_POLICY_PERM_USE_SHIFT)) {
resourceBase = assignment->resourceBase;
break;
rmInst->u.server.globalValidInstTree = NULL;
}
else if (rmInst->instType == Rm_instType_CLIENT_DELEGATE) {
- rmInst->u.cd.staticValidInstTree = NULL;
+ rmInst->u.cd.cdValidInstTree = NULL;
}
else if (rmInst->instType == Rm_instType_CLIENT) {
rmInst->u.client.staticValidInstTree = NULL;