Fixed the number of available container blocks

[frescor/frsh.git] / fres / contract / fres_container.h

diff --git a/fres/contract/fres_container.h b/fres/contract/fres_container.h
index d87f024440a85a19027678da1b27deaecf2622df..212d5c6cf76ef04f95898b747f6f7657c15f9ce8 100644 (file)
--- a/fres/contract/fres_container.h
+++ b/fres/contract/fres_container.h
@@ -82,13 +82,17 @@ enum fres_block_type {
        FRES_BLOCK_RESOURCE,
        FRES_BLOCK_BASIC,
        FRES_BLOCK_TIMING_REQS,
+       FRES_BLOCK_CSECTS,
        FRES_BLOCK_SPARE_CAPACITY,
+       FRES_BLOCK_POWER_MANAGEMENT,
        FRES_BLOCK_DUMMY_SCHED, /**< See resources/dummy/res_dummy_idl.idl */
+       FRES_BLOCK_DISK_SCHED, /** < See resources/disk_bfq/res_disk_idl.idl */
        FRES_BLOCK_CLUSTER_TREE_TRAFFIC, /**< resources/cluster_tree/cluster_tree_idl.idl */
        FRES_BLOCK_FWP_SCHED,
        FRES_BLOCK_ITEM_NODES, /**< resources/item/item_idl.idl */
        FRES_BLOCK_FPGA,       /**< resources/fpga/res_fpga_idl.idl */
-       FRES_NUM_BLOCKS
+       FRES_BLOCK_FWP,
+       __FRES_NUM_BLOCKS,
 };
 
 typedef CORBA_boolean (fres_block_serialize_fnc_t)(FORB_CDR_Codec *codec, const void *block_data);
@@ -165,7 +169,9 @@ FRES_CONTAINER_ACCESSOR(LABEL,          label)
 FRES_CONTAINER_ACCESSOR(RESOURCE,       resource)
 FRES_CONTAINER_ACCESSOR(BASIC,          basic)
 FRES_CONTAINER_ACCESSOR(TIMING_REQS,    timing_reqs)
+FRES_CONTAINER_ACCESSOR(CSECTS,                csects)
 FRES_CONTAINER_ACCESSOR(SPARE_CAPACITY, spare_capacity)
+FRES_CONTAINER_ACCESSOR(POWER_MANAGEMENT, power_management)
 
 int
 fres_block_register(enum fres_block_type, const struct fres_block_desc *desc);
@@ -176,6 +182,15 @@ fres_block_duplicate_default(enum fres_block_type type, const void *block_data);
 int
 fres_container_to_string(char *dest, size_t size, const struct fres_container *c);
 
+int
+fres_container_get_num_blocks(const struct fres_container *c);
+
+int fres_container_merge(struct fres_container *dest,
+                        const struct fres_container *src);
+
+int fres_container_copy(struct fres_container *dest,
+                       const struct fres_container *src);
+
 #ifdef __cplusplus
 } /* extern "C"*/
 #endif