summaryrefslogtreecommitdiff
path: root/cesar/cp
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/cp')
-rw-r--r--cesar/cp/beacon/defs.h10
-rw-r--r--cesar/cp/beacon/inc/beacon.h2
-rw-r--r--cesar/cp/beacon/test/src/schedules.c7
-rw-r--r--cesar/cp/sta/mgr/sta_own_data.h2
4 files changed, 2 insertions, 19 deletions
diff --git a/cesar/cp/beacon/defs.h b/cesar/cp/beacon/defs.h
index 538a8c6eb9..f463f48acb 100644
--- a/cesar/cp/beacon/defs.h
+++ b/cesar/cp/beacon/defs.h
@@ -23,16 +23,6 @@ enum cp_beacon_types_e
CP_BEACON_TYPE_NB
};
-/** Hybrid mode. */
-enum cp_beacon_hybrid_mode_e
-{
- CP_BEACON_HM_AV_ONLY,
- CP_BEACON_HM_SHARED_CSMA,
- CP_BEACON_HM_FULLY,
- CP_BEACON_HM_HYBRID_DELIMITERS,
- CP_BEACON_HM_MAX
-};
-
/** Non coordinated mode. */
enum cp_beacon_non_coordinated_mode_e
{
diff --git a/cesar/cp/beacon/inc/beacon.h b/cesar/cp/beacon/inc/beacon.h
index ed1b673b0e..f0395dbdac 100644
--- a/cesar/cp/beacon/inc/beacon.h
+++ b/cesar/cp/beacon/inc/beacon.h
@@ -43,7 +43,7 @@ struct cp_beacon_hybrid_mode_t
/** The Hybrid mode countdown. */
uint hmcd;
/** The new hybrid mode value. */
- uint hm;
+ mac_coexistence_mode_t hm;
};
struct cp_beacon_hoip_t
diff --git a/cesar/cp/beacon/test/src/schedules.c b/cesar/cp/beacon/test/src/schedules.c
index f05603d7fc..de5792a9b2 100644
--- a/cesar/cp/beacon/test/src/schedules.c
+++ b/cesar/cp/beacon/test/src/schedules.c
@@ -186,13 +186,6 @@ main (void)
return test_nb_failed (test) == 0 ? 0 : 1;
}
-/** Compute the CA schedules using the allocation defined in the bw module.
- * \param ctx the CP context.
- * \param common the beacon context (central, discover, proxy)
- * \param hybrid_mode the hybrid mode of the medium
- * \param schedules the schedules computed from the BW or read in the
- * beacon.
- */
void
ca_alloc_update_beacon_periods (ca_t *ctx,
ca_beacon_period_t *beacon_periods,
diff --git a/cesar/cp/sta/mgr/sta_own_data.h b/cesar/cp/sta/mgr/sta_own_data.h
index 1d97765cb6..031e5ea7b6 100644
--- a/cesar/cp/sta/mgr/sta_own_data.h
+++ b/cesar/cp/sta/mgr/sta_own_data.h
@@ -52,7 +52,7 @@ struct cp_sta_own_data_t
/**
* Current hybrid mode.
*/
- u8 hybrid_mode;
+ mac_coexistence_mode_t hybrid_mode;
/**
* The current NID being track for the NTB synchronization.