summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cesar/cp/cco/action/test/utest/override/mac/sar/inc/context.h23
-rw-r--r--cesar/cp/cco/action/test/utest/override/mac/sar/inc/sar_context.h8
-rw-r--r--cesar/cp/cco/action/test/utest/src/dataplane_stub.c2
-rw-r--r--cesar/cp/cco/action/test/utest/src/test_cco_action.c2
-rw-r--r--cesar/mac/sar/inc/context.h (renamed from cesar/mac/sar/inc/sar_context.h)8
-rw-r--r--cesar/mac/sar/src/beacon.c2
-rw-r--r--cesar/mac/sar/src/brg.c2
-rw-r--r--cesar/mac/sar/src/expiration.c2
-rw-r--r--cesar/mac/sar/src/mfs.c2
-rw-r--r--cesar/mac/sar/src/pb_stats.c2
-rw-r--r--cesar/mac/sar/src/rx.c2
-rw-r--r--cesar/mac/sar/src/sar.c2
-rw-r--r--cesar/mac/sar/src/thread.c2
-rw-r--r--cesar/mac/sar/src/trace.c2
-rw-r--r--cesar/mac/sar/src/tx.c2
-rw-r--r--cesar/mac/sar/test/functional/src/sar_rx_perf.c2
-rw-r--r--cesar/mac/sar/test/functional/src/sar_rx_tx.c2
-rw-r--r--cesar/mac/sar/test/functional/src/sar_tx_out_in_rx.c2
-rw-r--r--cesar/mac/sar/test/functional/src/sar_tx_perf.c2
-rw-r--r--cesar/mac/sar/test/functional/src/sar_tx_rx.c2
-rw-r--r--cesar/mac/sar/test/functional/src/test_functions.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/activate.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/crc_error.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/get_associated_mfs.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_cmd.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_create.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/misc.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/reassembly.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_remove_sta.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/segmentation.c2
-rw-r--r--cesar/mac/sar/test/utest/host/src/tests.c2
-rw-r--r--cesar/mac/sar/test/utest/host/tests.h2
-rw-r--r--cesar/maximus/prototest/integration/src/test_integration.c2
-rw-r--r--cesar/test_general/station/common/src/station.c2
37 files changed, 65 insertions, 42 deletions
diff --git a/cesar/cp/cco/action/test/utest/override/mac/sar/inc/context.h b/cesar/cp/cco/action/test/utest/override/mac/sar/inc/context.h
new file mode 100644
index 0000000000..46d6876df2
--- /dev/null
+++ b/cesar/cp/cco/action/test/utest/override/mac/sar/inc/context.h
@@ -0,0 +1,23 @@
+#ifndef override_mac_sar_inc_sar_context_h
+#define override_mac_sar_inc_sar_context_h
+/* Cesar project {{{
+ *
+ * Copyright (C) 2009 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file override/mac/sar/inc/sar_context.h
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+
+struct sar_t
+{
+ mac_store_t *mac_store;
+};
+
+#endif /* override_mac_sar_inc_sar_context_h */
diff --git a/cesar/cp/cco/action/test/utest/override/mac/sar/inc/sar_context.h b/cesar/cp/cco/action/test/utest/override/mac/sar/inc/sar_context.h
index 46d6876df2..ab2a656f3d 100644
--- a/cesar/cp/cco/action/test/utest/override/mac/sar/inc/sar_context.h
+++ b/cesar/cp/cco/action/test/utest/override/mac/sar/inc/sar_context.h
@@ -1,5 +1,5 @@
-#ifndef override_mac_sar_inc_sar_context_h
-#define override_mac_sar_inc_sar_context_h
+#ifndef override_mac_sar_inc_context_h
+#define override_mac_sar_inc_context_h
/* Cesar project {{{
*
* Copyright (C) 2009 Spidcom
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file override/mac/sar/inc/sar_context.h
+ * \file override/mac/sar/inc/context.h
* \brief « brief description »
* \ingroup « module »
*
@@ -20,4 +20,4 @@ struct sar_t
mac_store_t *mac_store;
};
-#endif /* override_mac_sar_inc_sar_context_h */
+#endif /* override_mac_sar_inc_context_h */
diff --git a/cesar/cp/cco/action/test/utest/src/dataplane_stub.c b/cesar/cp/cco/action/test/utest/src/dataplane_stub.c
index eb141f6312..b350d9c457 100644
--- a/cesar/cp/cco/action/test/utest/src/dataplane_stub.c
+++ b/cesar/cp/cco/action/test/utest/src/dataplane_stub.c
@@ -17,7 +17,7 @@
#include "cl/cl_mactotei.h"
#include "mac/pbproc/pbproc.h"
#include "cp/inc/context.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
void
sar_activate (sar_t *ctx, bool flag)
diff --git a/cesar/cp/cco/action/test/utest/src/test_cco_action.c b/cesar/cp/cco/action/test/utest/src/test_cco_action.c
index 508f852239..91e729acca 100644
--- a/cesar/cp/cco/action/test/utest/src/test_cco_action.c
+++ b/cesar/cp/cco/action/test/utest/src/test_cco_action.c
@@ -13,7 +13,7 @@
#include "common/std.h"
#include "inc/test_cco_action.h"
#include "lib/test.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
void
assoc_test_suite (test_t t);
diff --git a/cesar/mac/sar/inc/sar_context.h b/cesar/mac/sar/inc/context.h
index dfa20ca54b..f2f95cb497 100644
--- a/cesar/mac/sar/inc/sar_context.h
+++ b/cesar/mac/sar/inc/context.h
@@ -1,5 +1,5 @@
-#ifndef SAR_CONTEXT_H_
-#define SAR_CONTEXT_H_
+#ifndef MAC_SAR_INC_CONTEXT_H
+#define MAC_SAR_INC_CONTEXT_H
/* Cesar project {{{
*
@@ -9,7 +9,7 @@
*
* }}} */
/**
- * \file mac/sar/inc/sar_context.h
+ * \file mac/sar/inc/context.h
* \brief SAR context declarations.
* \ingroup mac_sar
*/
@@ -178,4 +178,4 @@ struct sar_t
#endif
};
-#endif /*SAR_CONTEXT_H_*/
+#endif /*MAC_SAR_INC_CONTEXT_H*/
diff --git a/cesar/mac/sar/src/beacon.c b/cesar/mac/sar/src/beacon.c
index bfdaa52c21..f3364bd4dc 100644
--- a/cesar/mac/sar/src/beacon.c
+++ b/cesar/mac/sar/src/beacon.c
@@ -13,7 +13,7 @@
#include "common/std.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
void
diff --git a/cesar/mac/sar/src/brg.c b/cesar/mac/sar/src/brg.c
index 4ff0df16a1..87bce5e351 100644
--- a/cesar/mac/sar/src/brg.c
+++ b/cesar/mac/sar/src/brg.c
@@ -12,7 +12,7 @@
*/
#include "common/std.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/brg.h"
#include "mac/sar/inc/sar_job_mfs.h"
diff --git a/cesar/mac/sar/src/expiration.c b/cesar/mac/sar/src/expiration.c
index 37794a29b8..e3eae1bd25 100644
--- a/cesar/mac/sar/src/expiration.c
+++ b/cesar/mac/sar/src/expiration.c
@@ -13,7 +13,7 @@
*/
#include "common/std.h"
#include "mac/common/timings.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/expiration.h"
#include "mac/sar/inc/trace.h"
#include "mac/common/ntb.h"
diff --git a/cesar/mac/sar/src/mfs.c b/cesar/mac/sar/src/mfs.c
index d861cc8016..62a45c6635 100644
--- a/cesar/mac/sar/src/mfs.c
+++ b/cesar/mac/sar/src/mfs.c
@@ -15,7 +15,7 @@
#include "mac/common/ntb.h"
#include "mac/common/timings.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
void
sar_mfs_add (sar_t *ctx, mfs_t *mfs)
diff --git a/cesar/mac/sar/src/pb_stats.c b/cesar/mac/sar/src/pb_stats.c
index 7b31180f0d..3196e35c71 100644
--- a/cesar/mac/sar/src/pb_stats.c
+++ b/cesar/mac/sar/src/pb_stats.c
@@ -17,7 +17,7 @@
#include "common/std.h"
#include "lib/stats.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include <string.h>
diff --git a/cesar/mac/sar/src/rx.c b/cesar/mac/sar/src/rx.c
index a597b5a76b..4c539290bb 100644
--- a/cesar/mac/sar/src/rx.c
+++ b/cesar/mac/sar/src/rx.c
@@ -13,7 +13,7 @@
#include "common/std.h"
#include "mac/common/mfs.h"
#include "mac/common/timings.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/pb_stats.h"
#include "mac/sar/inc/rx.h"
diff --git a/cesar/mac/sar/src/sar.c b/cesar/mac/sar/src/sar.c
index df9efe0dee..d4abe85d9f 100644
--- a/cesar/mac/sar/src/sar.c
+++ b/cesar/mac/sar/src/sar.c
@@ -21,7 +21,7 @@
#include "mac/sar/sar.h"
#include "mac/sar/sar_pb_stats.h"
#include "mac/sar/inc/thread.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/rx.h"
#include "mac/sar/inc/pb_stats.h"
diff --git a/cesar/mac/sar/src/thread.c b/cesar/mac/sar/src/thread.c
index ee1ec44b13..e7d56a3151 100644
--- a/cesar/mac/sar/src/thread.c
+++ b/cesar/mac/sar/src/thread.c
@@ -11,7 +11,7 @@
* \ingroup mac_sar
*/
#include "common/std.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/expiration.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/thread.h"
diff --git a/cesar/mac/sar/src/trace.c b/cesar/mac/sar/src/trace.c
index ea2b4aad26..2e35c13a1b 100644
--- a/cesar/mac/sar/src/trace.c
+++ b/cesar/mac/sar/src/trace.c
@@ -15,7 +15,7 @@
#include "mac/sar/sar.h"
#include "mac/sar/inc/trace.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
void
sar_trace_init (sar_t *ctx)
diff --git a/cesar/mac/sar/src/tx.c b/cesar/mac/sar/src/tx.c
index b5da09c5f7..52f43befbd 100644
--- a/cesar/mac/sar/src/tx.c
+++ b/cesar/mac/sar/src/tx.c
@@ -12,7 +12,7 @@
*/
#include "common/std.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/brg.h"
#include "mac/sar/inc/sar.h"
diff --git a/cesar/mac/sar/test/functional/src/sar_rx_perf.c b/cesar/mac/sar/test/functional/src/sar_rx_perf.c
index 2cd29fcb5d..2dfb274780 100644
--- a/cesar/mac/sar/test/functional/src/sar_rx_perf.c
+++ b/cesar/mac/sar/test/functional/src/sar_rx_perf.c
@@ -21,7 +21,7 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/functional/test_functions.h"
/* Thread data for the test. */
diff --git a/cesar/mac/sar/test/functional/src/sar_rx_tx.c b/cesar/mac/sar/test/functional/src/sar_rx_tx.c
index a2e979b2f2..0cc6a2019e 100644
--- a/cesar/mac/sar/test/functional/src/sar_rx_tx.c
+++ b/cesar/mac/sar/test/functional/src/sar_rx_tx.c
@@ -21,7 +21,7 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/functional/test_functions.h"
/* Thread data for the test. */
diff --git a/cesar/mac/sar/test/functional/src/sar_tx_out_in_rx.c b/cesar/mac/sar/test/functional/src/sar_tx_out_in_rx.c
index a8b50cc7ff..e98696260f 100644
--- a/cesar/mac/sar/test/functional/src/sar_tx_out_in_rx.c
+++ b/cesar/mac/sar/test/functional/src/sar_tx_out_in_rx.c
@@ -19,7 +19,7 @@
#include "lib/bitstream.h"
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/functional/test_functions.h"
/* Thread data for the test. */
diff --git a/cesar/mac/sar/test/functional/src/sar_tx_perf.c b/cesar/mac/sar/test/functional/src/sar_tx_perf.c
index ef03415fc1..26fd14b88a 100644
--- a/cesar/mac/sar/test/functional/src/sar_tx_perf.c
+++ b/cesar/mac/sar/test/functional/src/sar_tx_perf.c
@@ -23,7 +23,7 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/functional/test_functions.h"
/* Thread data for the test. */
diff --git a/cesar/mac/sar/test/functional/src/sar_tx_rx.c b/cesar/mac/sar/test/functional/src/sar_tx_rx.c
index c15a5a5980..4eda424d2a 100644
--- a/cesar/mac/sar/test/functional/src/sar_tx_rx.c
+++ b/cesar/mac/sar/test/functional/src/sar_tx_rx.c
@@ -21,7 +21,7 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/functional/test_functions.h"
/* Thread data for the test. */
diff --git a/cesar/mac/sar/test/functional/src/test_functions.c b/cesar/mac/sar/test/functional/src/test_functions.c
index bca4afb9cf..61f2206adc 100644
--- a/cesar/mac/sar/test/functional/src/test_functions.c
+++ b/cesar/mac/sar/test/functional/src/test_functions.c
@@ -31,7 +31,7 @@
#include <cyg/kernel/kapi.h>
#include <cyg/hal/hal_arch.h>
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "hal/phy/soft/bridgedma/bridgedma_crc.h"
#include <string.h>
diff --git a/cesar/mac/sar/test/utest/host/src/activate.c b/cesar/mac/sar/test/utest/host/src/activate.c
index 409afde7ae..e6e25439cc 100644
--- a/cesar/mac/sar/test/utest/host/src/activate.c
+++ b/cesar/mac/sar/test/utest/host/src/activate.c
@@ -19,7 +19,7 @@
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/sar_job_mfs.h"
#include "mac/sar/inc/brg.h"
diff --git a/cesar/mac/sar/test/utest/host/src/crc_error.c b/cesar/mac/sar/test/utest/host/src/crc_error.c
index 277bc503d3..f266c7c249 100644
--- a/cesar/mac/sar/test/utest/host/src/crc_error.c
+++ b/cesar/mac/sar/test/utest/host/src/crc_error.c
@@ -18,7 +18,7 @@
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "ce/rx/rx.h"
diff --git a/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c b/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c
index a02229e93d..117666e984 100644
--- a/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c
+++ b/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c
@@ -17,7 +17,7 @@
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/utest/host/tests.h"
/* Function declared as inline in the source code. */
diff --git a/cesar/mac/sar/test/utest/host/src/mfs_cmd.c b/cesar/mac/sar/test/utest/host/src/mfs_cmd.c
index 15f0b2e5a3..5952a9334b 100644
--- a/cesar/mac/sar/test/utest/host/src/mfs_cmd.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_cmd.c
@@ -19,7 +19,7 @@
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/utest/host/tests.h"
void
diff --git a/cesar/mac/sar/test/utest/host/src/mfs_create.c b/cesar/mac/sar/test/utest/host/src/mfs_create.c
index 53291201ba..443e759c3c 100644
--- a/cesar/mac/sar/test/utest/host/src/mfs_create.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_create.c
@@ -26,7 +26,7 @@
#include "hal/phy/phy.h"
#include "mac/sar/inc/sar_pb.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "ce/rx/rx.h"
diff --git a/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c b/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c
index 7b78fa85c1..feaa8784c7 100644
--- a/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c
@@ -20,7 +20,7 @@
/* Stubbed modules. */
#include "ce/rx/rx.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/utest/host/tests.h"
void
diff --git a/cesar/mac/sar/test/utest/host/src/misc.c b/cesar/mac/sar/test/utest/host/src/misc.c
index 30a99360d3..a1c7795e32 100644
--- a/cesar/mac/sar/test/utest/host/src/misc.c
+++ b/cesar/mac/sar/test/utest/host/src/misc.c
@@ -13,7 +13,7 @@
#include "common/std.h"
#include "lib/test.h"
#include "lib/blk.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/utest/host/tests.h"
#include "config.h"
diff --git a/cesar/mac/sar/test/utest/host/src/reassembly.c b/cesar/mac/sar/test/utest/host/src/reassembly.c
index 6a4c7c6437..42299c279e 100644
--- a/cesar/mac/sar/test/utest/host/src/reassembly.c
+++ b/cesar/mac/sar/test/utest/host/src/reassembly.c
@@ -22,7 +22,7 @@
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar_pb.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/brg.h"
diff --git a/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c b/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c
index 8aae5eda81..2c73d2932a 100644
--- a/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c
@@ -20,7 +20,7 @@
#include "mac/common/ntb.h"
#include "hal/phy/phy.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/test/utest/host/tests.h"
diff --git a/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c b/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c
index b78946c5ee..414b2a4ae8 100644
--- a/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c
@@ -18,7 +18,7 @@
#include "lib/stats.h"
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/expiration.h"
#include "mac/sar/test/utest/host/tests.h"
diff --git a/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c b/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
index 97c32e6c7e..a83aaf5acd 100644
--- a/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
@@ -14,7 +14,7 @@
#include "common/std.h"
#include "lib/test.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include <string.h>
pb_t*
diff --git a/cesar/mac/sar/test/utest/host/src/segmentation.c b/cesar/mac/sar/test/utest/host/src/segmentation.c
index 0269201ac5..13f26aa0c6 100644
--- a/cesar/mac/sar/test/utest/host/src/segmentation.c
+++ b/cesar/mac/sar/test/utest/host/src/segmentation.c
@@ -18,7 +18,7 @@
#include "mac/common/ntb.h"
#include "mac/sar/sar.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/brg.h"
#include "mac/sar/inc/rx.h"
diff --git a/cesar/mac/sar/test/utest/host/src/tests.c b/cesar/mac/sar/test/utest/host/src/tests.c
index 803c397c6b..da51221c4c 100644
--- a/cesar/mac/sar/test/utest/host/src/tests.c
+++ b/cesar/mac/sar/test/utest/host/src/tests.c
@@ -19,7 +19,7 @@
#include "string.h"
#include "bufmgr/bufmgr.h"
#include "mac/common/ntb.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "mac/sar/test/utest/host/tests.h"
/* Override interfaces. */
diff --git a/cesar/mac/sar/test/utest/host/tests.h b/cesar/mac/sar/test/utest/host/tests.h
index 35a56bde59..919f0ab68b 100644
--- a/cesar/mac/sar/test/utest/host/tests.h
+++ b/cesar/mac/sar/test/utest/host/tests.h
@@ -13,7 +13,7 @@
* \ingroup mac_sar
*/
#include "common/defs/ethernet.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "lib/bitstream.h"
#include "ce/rx/rx.h"
diff --git a/cesar/maximus/prototest/integration/src/test_integration.c b/cesar/maximus/prototest/integration/src/test_integration.c
index 574c1c89d5..5614d75108 100644
--- a/cesar/maximus/prototest/integration/src/test_integration.c
+++ b/cesar/maximus/prototest/integration/src/test_integration.c
@@ -18,7 +18,7 @@
#include "common/std.h"
#include "interface/inc/context.h"
#include "cl/inc/context.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "interface/fcall/inc/context.h"
#include "bufmgr/inc/context.h"
#include "lib/swap.h" /* for 'swap32()' */
diff --git a/cesar/test_general/station/common/src/station.c b/cesar/test_general/station/common/src/station.c
index d4d39111aa..a43fcdc530 100644
--- a/cesar/test_general/station/common/src/station.c
+++ b/cesar/test_general/station/common/src/station.c
@@ -36,7 +36,7 @@
#endif
#include "cl/inc/context.h"
#include "mac/pbproc/inc/context.h"
-#include "mac/sar/inc/sar_context.h"
+#include "mac/sar/inc/context.h"
#include "hal/phy/maximus/inc/maximus_phy_ctx.h"
#include <stdio.h>