Clean surf

diff --git a/doc/doxygen/module-msg.doc b/doc/doxygen/module-msg.doc
index d652b97..b27ec73 100644 (file)
--- a/doc/doxygen/module-msg.doc
+++ b/doc/doxygen/module-msg.doc
@@ -118,6 +118,13 @@ details).
  *
  */
 
+/** @defgroup msg_storage_management Storage Management Functions
+ *  @ingroup MSG_API
+ *  @brief This section describes the storage structure of MSG
+ *         (#msg_storage_t) and the functions for managing it. It
+ *   is based on POSIX functions.
+ */
+
 /** @defgroup msg_file_management File Management Functions
  *  @ingroup MSG_API
  *  @brief This section describes the file structure of MSG
@@ -125,7 +132,6 @@ details).
  *   is based on POSIX functions.
  */
 
-
 /**
 @defgroup msg_trace_driven Trace-driven simulations
 @ingroup MSG_API

diff --git a/doc/doxygen/module-surf.doc b/doc/doxygen/module-surf.doc
index 36f6899..7e3733f 100644 (file)
--- a/doc/doxygen/module-surf.doc
+++ b/doc/doxygen/module-surf.doc
@@ -27,20 +27,6 @@
     the simulation and exiting SURF.
 */
 
-/** \defgroup SURF_actions SURF actions
-    \ingroup SURF_API
-    \brief This section describes the different datatypes and operations related to the actions in SURF.
-
-    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Actions" --> \endhtmlonly
-*/
-
-/** \defgroup SURF_resources SURF resources
-    \ingroup SURF_API
-    \brief This section describes the different datatypes and operations related to the resources in SURF.
-
-    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Resources" --> \endhtmlonly
-*/
-
 /** \defgroup SURF_build_api Create a new API
     \ingroup SURF_API
     \brief How to build a new API on top of SURF

diff --git a/src/include/surf/datatypes.h b/src/include/surf/datatypes.h
index 636721e..23b9a78 100644 (file)
--- a/src/include/surf/datatypes.h
+++ b/src/include/surf/datatypes.h
@@ -7,22 +7,6 @@
 #ifndef MAXMIN_DATATYPES_H
 #define MAXMIN_DATATYPES_H
 
-/** \ingroup SURF_models
- *  \brief Model datatype
- *
- *  Generic data structure for a model. The workstations,
- *  the CPUs and the network links are examples of models.
- */
-//FIXME: typedef struct surf_model *surf_model_t;
-
-/** \ingroup SURF_actions
- *  \brief Action datatype
- *
- * An action is some working amount on a model.
- * It is represented as a cost, a priority, a duration and a state.
- */
-//FIXME:typedef struct surf_action *surf_action_t;
-//FIXME:typedef struct surf_file *surf_file_t;
 typedef struct surf_storage *surf_storage_t;
 typedef struct surf_stat *surf_stat_t;
 

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index b243c91..196cb15 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -82,7 +82,7 @@ typedef struct RoutingEdge RoutingEdge;
 typedef struct RoutingPlatf RoutingPlatf;
 #endif
 
-/** \ingroup SURF_models
+/** @ingroup SURF_c_bindings
  *  \brief Model datatype
  *
  *  Generic data structure for a model. The workstations,
@@ -102,7 +102,7 @@ typedef WorkstationCLM03 *surf_workstation_CLM03_t;
 typedef NetworkCm02Link *surf_network_link_t;
 typedef Cpu *surf_cpu_t;
 
-/** \ingroup SURF_actions
+/** @ingroup SURF_c_bindings 
  *  \brief Action structure
  *
  *  Never create s_surf_action_t by yourself ! The actions are created
@@ -111,8 +111,6 @@ typedef Cpu *surf_cpu_t;
  *  \see e_surf_action_state_t
  */
 typedef Action *surf_action_t;
-typedef ActionLmm *surf_action_lmm_t;
-typedef StorageActionLmm *surf_storage_action_lmm_t;
 
 typedef As *AS_t;
 typedef RoutingEdge *routing_edge_t;