Adding FRSH_CPP_BEGIN|END_DECLS to public .h files

[frescor/frsh-include.git] / frsh_spare_capacity_types.h

diff --git a/frsh_spare_capacity_types.h b/frsh_spare_capacity_types.h
index 79c1de5a270d96da7f2813fe96e09abd81b2b2c7..d002aa999842d2b7fcfca9bb708bff3c77215a53 100644 (file)
--- a/frsh_spare_capacity_types.h
+++ b/frsh_spare_capacity_types.h
@@ -74,10 +74,10 @@
 
 #include <time.h>
 
+FRSH_CPP_BEGIN_DECLS
+
 /**
  * @file frsh_spare_capacity_types.h
- *
- * Defines and typedefs for types used in spare_capacity functions.
  **/
 
 /**
@@ -90,31 +90,34 @@
 /* D E F I N I T I O N S */
 /*************************/
 
-/** Granularity of spare capacity requirements **/
-typedef enum {FRSH_CONTINUOUS, FRSH_DISCRETE} frsh_granularity_t;
+/** Granularity of spare capacity requirements: continuous or discrete **/
+typedef enum {FRSH_GR_CONTINUOUS, FRSH_GR_DISCRETE} frsh_granularity_t;
 
 /** Utilization (C and T) **/
 typedef struct {
     struct timespec    budget;    // Execution time
     struct timespec    period;    // Period
-} frsh_utilization_value_t;
+} frsh_utilization_t;
 
 /** List of utilization values **/
 typedef struct {
     int                      size; // = 0
-    frsh_utilization_value_t value[FRSH_MAX_N_UTILIZATION_VALUES]; 
+    frsh_utilization_t utilizations[FRSH_MAX_N_UTILIZATION_VALUES]; 
 } frsh_utilization_set_t;
 
 // Constants for assigning default values
-#define FRSH_DEFAULT_GRANULARITY         FRSH_CONTINUOUS
-#define FRSH_DEFAULT_QUALITY             0
+#define FRSH_DEFAULT_GRANULARITY         FRSH_GR_CONTINUOUS
+#define FRSH_DEFAULT_WEIGHT              0
 #define FRSH_DEFAULT_IMPORTANCE          1
 
 // Constants for omitting the assignment of values to specific
 // arguments in calls to initialization functions
-
 #define FRSH_NULL_UTILIZATION_SET     \
    (frsh_utilization_set_t *)NULL
 
 /*@}*/
+
+FRSH_CPP_END_DECLS
+
+
 #endif             /* !FRSH_SPARE_CAPACITY_TYPES_H_ */