Changing an assertion of current RR blocked thread should always be rr_first

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

diff --git a/frsh_core_types.h b/frsh_core_types.h
index 3ee6570f3f526a65dba4778d307374aca7989e47..a78800055d2a28cc6eb5b90f77d32b9dc702be59 100644 (file)
--- a/frsh_core_types.h
+++ b/frsh_core_types.h
@@ -123,19 +123,14 @@ typedef unsigned int      frsh_vres_id_t;             // => 0
 typedef enum {
     FRSH_RT_PROCESSOR = 0,
     FRSH_RT_NETWORK   = 1,
-    FRSH_RT_MEMORY    = 2
+    FRSH_RT_MEMORY    = 2,
+    FRSH_RT_DISK      = 3
 } frsh_resource_type_t;
 
 /** Ressource Id: processor_id or network_id **/
 /**********************************************/
 typedef unsigned int frsh_resource_id_t;
 
-/** This defines 1 resource_id value for systems that have only one
-    resource of a kind. **/
-#define FRSH_RESOURCE_ID_DEFAULT 0
-#define FRSH_CPU_ID_DEFAULT 0
-#define FRSH_NETWORK_ID_DEFAULT 0
-
 /** Kind of contract: regular, background or dummy **/
 typedef enum {
         FRSH_CT_REGULAR    = 0,
@@ -144,7 +139,6 @@ typedef enum {
 } frsh_contract_type_t;
 
 // The name of this constant has been updated to have the FRSH_ prefix
-#define FRSH_CONTRACT_LABEL_MAXLENGTH 15
 typedef char frsh_contract_label_t[FRSH_CONTRACT_LABEL_MAXLENGTH + 1];
 
 /**