Update transaction API

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

diff --git a/frsh_core_types.h b/frsh_core_types.h
index a4a48f2b6669462214df4973ea3512cbcaad71b0..d355c25c7a11520bb8aadf4f86f42a37adc8c0c1 100644 (file)
--- a/frsh_core_types.h
+++ b/frsh_core_types.h
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2008 FRESCOR consortium partners:
+//  Copyright (C) 2006 - 2009 FRESCOR consortium partners:
 //
 //    Universidad de Cantabria,              SPAIN
 //    University of York,                    UK
@@ -151,8 +151,6 @@ typedef enum {FRSH_RS_IN_PROGRESS,
               FRSH_RS_ADMITTED,
               FRSH_RS_NOT_REQUESTED} frsh_renegotiation_status_t;
 
-
-
 /**
  *  Vres Id type, that identifies a vres created to manage a given
  *  contract
@@ -164,7 +162,9 @@ typedef enum {
     FRSH_RT_PROCESSOR = 0,
     FRSH_RT_NETWORK   = 1,
     FRSH_RT_MEMORY    = 2,
-    FRSH_RT_DISK      = 3
+    FRSH_RT_DISK      = 3,
+    FRSH_RT_FPGA      = 4,
+    FRSH_RT_LCD       = 5
 } frsh_resource_type_t;
 
 /** Ressource Id: processor_id or network_id **/
@@ -193,20 +193,16 @@ typedef FRSH_CONTRACT_T_OPAQUE  frsh_contract_t;
 /** List of vres **/
 typedef  struct {
   int             size;
-  frsh_vres_id_t  vres[FRSH_MAX_N_VRES];
+  frsh_vres_id_t  vres[FRSH_MAX_GROUP_OPS];
 } frsh_vres_group_t;
 
 /** List of contracts to negotiate **/
 typedef struct {
     int  size;
-    frsh_contract_t*  contracts[FRSH_MAX_N_VRES];
+    frsh_contract_t contracts[FRSH_MAX_GROUP_OPS];
 } frsh_contracts_group_t;
 
-typedef struct {
-    int size;
-    frsh_contract_label_t contract_labels[FRSH_MAX_N_VRES];
-} frsh_contract_labels_group_t;
-
+typedef FRSH_GROUP_ID_T_OPAQUE frsh_group_id_t;
 
 /**
  * An abstract synchronization object is defined by the application.