Minor changes in include files and Makefile

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

diff --git a/frsh_spare_capacity_types.h b/frsh_spare_capacity_types.h
index 6c46feedfb832cde50c1641deb46d2bbfa2fd49f..9da5c84063094bd253114cec55ed15a4e17462db 100644 (file)
--- a/frsh_spare_capacity_types.h
+++ b/frsh_spare_capacity_types.h
@@ -76,8 +76,6 @@
 
 /**
  * @file frsh_spare_capacity_types.h
- *
- * Defines and typedefs for types used in spare_capacity functions.
  **/
 
 /**
@@ -90,24 +88,24 @@
 /* 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