summaryrefslogtreecommitdiff
path: root/cesar/cp2
diff options
context:
space:
mode:
authorschodet2008-06-12 13:14:31 +0000
committerschodet2008-06-12 13:14:31 +0000
commit6d4183aa871b9cb0d244e1233faca74cef457b8a (patch)
treead9c8fcb667fdf2e60637a8a578b7cd6e1d6e396 /cesar/cp2
parent2caee570ab95e8d29c39c21932f4d6854730a34b (diff)
* cp2/fsm:
- added forward.h, as a light include dependency. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2301 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp2')
-rw-r--r--cesar/cp2/fsm/forward.h19
-rw-r--r--cesar/cp2/fsm/fsm.h1
-rw-r--r--cesar/cp2/fsm/inc/events.h7
-rw-r--r--cesar/cp2/sta/core/core.h2
-rw-r--r--cesar/cp2/sta/core/src/core.c3
-rw-r--r--cesar/cp2/sta/core/test/overide/cp2/fsm/fsm.h2
6 files changed, 26 insertions, 8 deletions
diff --git a/cesar/cp2/fsm/forward.h b/cesar/cp2/fsm/forward.h
new file mode 100644
index 0000000000..79f52ff813
--- /dev/null
+++ b/cesar/cp2/fsm/forward.h
@@ -0,0 +1,19 @@
+#ifndef cp2_fsm_forward_h
+#define cp2_fsm_forward_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp2/fsm/forward.h
+ * \brief Control plane FSM forward declarations.
+ * \ingroup cp2_fsm
+ */
+
+/* Forward declaration. */
+typedef struct cp_fsm_event_t cp_fsm_event_t;
+
+#endif /* cp2_fsm_forward_h */
diff --git a/cesar/cp2/fsm/fsm.h b/cesar/cp2/fsm/fsm.h
index 3d18d3653a..70801b8269 100644
--- a/cesar/cp2/fsm/fsm.h
+++ b/cesar/cp2/fsm/fsm.h
@@ -14,6 +14,7 @@
*/
#include "cp2/cp.h"
+#include "forward.h"
#include "inc/events.h"
BEGIN_DECLS
diff --git a/cesar/cp2/fsm/inc/events.h b/cesar/cp2/fsm/inc/events.h
index 3116bad23c..98e28e5d96 100644
--- a/cesar/cp2/fsm/inc/events.h
+++ b/cesar/cp2/fsm/inc/events.h
@@ -16,16 +16,14 @@
#include "cp2/beacon/beacon_desc.h"
#include "cp2/sta/mgr/net.h"
+/* This is a auto-generated file, check your Makefile if it is not found. */
#include "cp_fsm_defs.h"
-/* Forward declaration. */
-typedef struct cp_fsm_event_t cp_fsm_event_t;
-
/**
* Call the transition associated with an event.
* \param ctx control plane context
* \param event handled event
- * \parem transition transition function to call
+ * \param transition transition function to call
*/
typedef void (*cp_fsm_event_handler_t) (cp_t *ctx, cp_fsm_event_t *event,
void *transition);
@@ -38,6 +36,7 @@ struct cp_fsm_event_t
/** Handle transition callback. */
cp_fsm_event_handler_t handler;
};
+/* Forward declaration in cp2/fsm/forward.h. */
BEGIN_DECLS
diff --git a/cesar/cp2/sta/core/core.h b/cesar/cp2/sta/core/core.h
index c435759a91..3c67b5c3f6 100644
--- a/cesar/cp2/sta/core/core.h
+++ b/cesar/cp2/sta/core/core.h
@@ -41,7 +41,7 @@
#include <cyg/kernel/kapi.h>
#include "cp2/cp.h"
#include "cp2/defs.h"
-#include "cp2/fsm/fsm.h"
+#include "cp2/fsm/forward.h"
/** Forward declaration. */
typedef struct cp_sta_core_t cp_sta_core_t;
diff --git a/cesar/cp2/sta/core/src/core.c b/cesar/cp2/sta/core/src/core.c
index 9a7ff6e4e0..402aab87a9 100644
--- a/cesar/cp2/sta/core/src/core.c
+++ b/cesar/cp2/sta/core/src/core.c
@@ -42,9 +42,8 @@
#include "cp2/types.h"
#include "cp2/mme.h"
-#include "cp2/defs.h"
-#include "cp2/cp.h"
+#include "cp2/fsm/fsm.h"
#include "cp2/beacon/beacon.h"
#include "cp2/pwl/pwl.h"
#include "cp2/cl_interf/cl_interf.h"
diff --git a/cesar/cp2/sta/core/test/overide/cp2/fsm/fsm.h b/cesar/cp2/sta/core/test/overide/cp2/fsm/fsm.h
index bcae92ae89..2fbd20f2e2 100644
--- a/cesar/cp2/sta/core/test/overide/cp2/fsm/fsm.h
+++ b/cesar/cp2/sta/core/test/overide/cp2/fsm/fsm.h
@@ -14,7 +14,7 @@
*/
#include "cp2/cp.h"
-typedef struct cp_fsm_event_t cp_fsm_event_t;
+#include "cp2/fsm/forward.h"
BEGIN_DECLS