summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorJérémy Dufour2012-04-24 16:52:22 +0200
committerJérémy Dufour2012-05-04 14:52:23 +0200
commit7617b3533c2c9ca58c90f6a2ad2174c2db80d1f1 (patch)
treed379569eefed8adc76e523343aad9c71f9a3a4c5 /cesar
parent6af3fc2eaea698d1ab41c9fb779ca5b906be9718 (diff)
cesar: move ce_rx_t forward declaration to a dedicated header, closes #3100
Diffstat (limited to 'cesar')
-rw-r--r--cesar/ce/rx/bitloading/fsm/src/fsm/template_defs.h2
-rw-r--r--cesar/ce/rx/bitloading/test/inc/scenario_defs.h2
-rw-r--r--cesar/ce/rx/cp/cp.h2
-rw-r--r--cesar/ce/rx/cp/test/override/cp/inc/context.h2
-rw-r--r--cesar/ce/rx/forward.h24
-rw-r--r--cesar/ce/rx/inc/measure.h2
-rw-r--r--cesar/ce/rx/rx.h6
-rw-r--r--cesar/ce/rx/test/override/cp/inc/context.h2
-rw-r--r--cesar/cp/cp.h2
-rw-r--r--cesar/cp/inc/context.h2
-rw-r--r--cesar/cp/sta/action/src/vs.c1
-rw-r--r--cesar/cp/sta/core/test/override/cp/inc/context.h2
-rw-r--r--cesar/station/src/station.c1
-rw-r--r--cesar/station/station.h2
14 files changed, 37 insertions, 15 deletions
diff --git a/cesar/ce/rx/bitloading/fsm/src/fsm/template_defs.h b/cesar/ce/rx/bitloading/fsm/src/fsm/template_defs.h
index 9b7dc49916..b8db081193 100644
--- a/cesar/ce/rx/bitloading/fsm/src/fsm/template_defs.h
+++ b/cesar/ce/rx/bitloading/fsm/src/fsm/template_defs.h
@@ -9,7 +9,7 @@
#include "mac/common/sta.h"
#include "ce/rx/bitloading/fsm/event.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
/* %(name)s states. */
enum %(prefix)s_state_t
diff --git a/cesar/ce/rx/bitloading/test/inc/scenario_defs.h b/cesar/ce/rx/bitloading/test/inc/scenario_defs.h
index 7b7a758692..d032208217 100644
--- a/cesar/ce/rx/bitloading/test/inc/scenario_defs.h
+++ b/cesar/ce/rx/bitloading/test/inc/scenario_defs.h
@@ -13,7 +13,7 @@
* \ingroup test
*/
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "mac/common/sta.h"
#include "mac/common/tonemap.h"
#include "ce/rx/bitloading/fsm/event.h"
diff --git a/cesar/ce/rx/cp/cp.h b/cesar/ce/rx/cp/cp.h
index a44b6039a1..e98ad2d37b 100644
--- a/cesar/ce/rx/cp/cp.h
+++ b/cesar/ce/rx/cp/cp.h
@@ -28,7 +28,7 @@
*/
#include "cp/cp.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
/**
* Callback used by the CE RX to set a flag in the CP.
diff --git a/cesar/ce/rx/cp/test/override/cp/inc/context.h b/cesar/ce/rx/cp/test/override/cp/inc/context.h
index de350177b5..c861ae02ed 100644
--- a/cesar/ce/rx/cp/test/override/cp/inc/context.h
+++ b/cesar/ce/rx/cp/test/override/cp/inc/context.h
@@ -15,7 +15,7 @@
#include "mac/common/config.h"
#include "mac/common/store.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "lib/bitstream.h"
#include "cp/sta/mgr/sta_mgr.h"
#include "cp/sta/mgr/inc/sta_mgr.h"
diff --git a/cesar/ce/rx/forward.h b/cesar/ce/rx/forward.h
new file mode 100644
index 0000000000..b414f6cef6
--- /dev/null
+++ b/cesar/ce/rx/forward.h
@@ -0,0 +1,24 @@
+#ifndef ce_rx_forward_h
+#define ce_rx_forward_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2012 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file ce/rx/forward.h
+ * \brief Forward declarations of CE RX module
+ * \ingroup ce_rx
+ *
+ * To prevent too much includes and infinite loop, forward declarations are
+ * used.
+ */
+
+/**
+ * Context of the CE in RX mode (forward declaration).
+ */
+typedef struct ce_rx_t ce_rx_t;
+
+#endif /* ce_rx_forward_h */
diff --git a/cesar/ce/rx/inc/measure.h b/cesar/ce/rx/inc/measure.h
index bbb38d98e0..359605f4b9 100644
--- a/cesar/ce/rx/inc/measure.h
+++ b/cesar/ce/rx/inc/measure.h
@@ -15,7 +15,7 @@
#include "lib/mbox.h"
#include "mac/sar/sar.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "ce/rx/measure.h"
#include "mac/pbproc/pbproc.h"
diff --git a/cesar/ce/rx/rx.h b/cesar/ce/rx/rx.h
index d2ec2cd612..63393de5ee 100644
--- a/cesar/ce/rx/rx.h
+++ b/cesar/ce/rx/rx.h
@@ -16,11 +16,7 @@
#include "mac/common/store.h"
#include "mac/sar/sar.h"
#include "cp/types.h"
-
-/**
- * Context of the CE in RX mode (forward declaration).
- */
-typedef struct ce_rx_t ce_rx_t;
+#include "ce/rx/forward.h"
BEGIN_DECLS
diff --git a/cesar/ce/rx/test/override/cp/inc/context.h b/cesar/ce/rx/test/override/cp/inc/context.h
index f7bb352255..6bfbc6f0de 100644
--- a/cesar/ce/rx/test/override/cp/inc/context.h
+++ b/cesar/ce/rx/test/override/cp/inc/context.h
@@ -19,7 +19,7 @@
#include "cp/sta/mgr/inc/sta_mgr.h"
#include "cl/cl.h"
#include "mac/sar/sar.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "lib/bitstream.h"
#include "lib/rnd.h"
diff --git a/cesar/cp/cp.h b/cesar/cp/cp.h
index 8e58531d85..32fff78cc2 100644
--- a/cesar/cp/cp.h
+++ b/cesar/cp/cp.h
@@ -21,7 +21,7 @@
#include "interface/forward.h"
#include "hal/timer/timer.h"
#include "cl/cl.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "bsu/beacon/beacon.h"
#include "bsu/aclf/aclf.h"
#include "bsu/bsu.h"
diff --git a/cesar/cp/inc/context.h b/cesar/cp/inc/context.h
index 0c9d697dd7..a8bd13fcd8 100644
--- a/cesar/cp/inc/context.h
+++ b/cesar/cp/inc/context.h
@@ -36,7 +36,7 @@
#include "cp/fsm/fsm.h"
#include "cp/msg/msg.h"
#include "cp/secu/secu.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "bsu/beacon/beacon.h"
#include "bsu/aclf/aclf.h"
#include "bufmgr/bufmgr.h"
diff --git a/cesar/cp/sta/action/src/vs.c b/cesar/cp/sta/action/src/vs.c
index 6f307fdae2..a5eb13e4e8 100644
--- a/cesar/cp/sta/action/src/vs.c
+++ b/cesar/cp/sta/action/src/vs.c
@@ -22,6 +22,7 @@
#include "ce/rx/bitloading/nsr.h"
#include "mac/sar/sar_pb_stats.h"
#include "cl/cl_mactotei.h"
+#include "ce/rx/rx.h"
/**
* Handle STARTED => VS_GET_TONEMAP.REQ.
diff --git a/cesar/cp/sta/core/test/override/cp/inc/context.h b/cesar/cp/sta/core/test/override/cp/inc/context.h
index 2e271c60ad..fda74cda88 100644
--- a/cesar/cp/sta/core/test/override/cp/inc/context.h
+++ b/cesar/cp/sta/core/test/override/cp/inc/context.h
@@ -18,7 +18,7 @@
#include "cp/sta/core/inc/core.h"
#include "cp/sta/core/defs.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
struct cp_t
{
diff --git a/cesar/station/src/station.c b/cesar/station/src/station.c
index a730d137bc..19ff1091b6 100644
--- a/cesar/station/src/station.c
+++ b/cesar/station/src/station.c
@@ -26,6 +26,7 @@
#include "hal/boot_params/boot_params.h"
#include "lib/seq_check.h"
+#include "ce/rx/rx.h"
#include "lib/init.h"
diff --git a/cesar/station/station.h b/cesar/station/station.h
index 3b58396d38..d9bd3782b3 100644
--- a/cesar/station/station.h
+++ b/cesar/station/station.h
@@ -20,7 +20,7 @@
#include "interface/interface.h"
#include "cp/cp.h"
#include "hal/timer/timer.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "bsu/bsu.h"
#include "bsu/aclf/aclf.h"