refactor(tools/cbmc): rework cbmc delegate and undelegate

The cbmc analysis now has 0 failures for RMI_DELEGATE and
RMI_UNDELEGATE after this patch.

Change-Id: Ib7434e31870ee860d6eafb86af5b8c7aa742f777
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
diff --git a/plat/host/host_cbmc/include/tb_common.h b/plat/host/host_cbmc/include/tb_common.h
index 36d989c..c77462f 100644
--- a/plat/host/host_cbmc/include/tb_common.h
+++ b/plat/host/host_cbmc/include/tb_common.h
@@ -128,9 +128,9 @@
 			       const void *src_page,
 			       size_t src_size);
 
-/* Returns whether the granule with address is set to NS in the GPT, or not */
-bool is_granule_gpt_ns(uint64_t addr);
-/* Set for a granule whether it is set to NS in GPT, or not. */
-void set_granule_gpt_ns(uint64_t addr, bool gpt_ns);
+/* Returns the status of the granule in the GPT. */
+enum granule_gpt get_granule_gpt(uint64_t addr);
+/* Set the status of the granule in GPT. */
+void set_granule_gpt(uint64_t addr, enum granule_gpt granule_gpt);
 
 #endif  /* !TB_COMMON_H */