summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaranjeiro2008-04-01 09:30:25 +0000
committerlaranjeiro2008-04-01 09:30:25 +0000
commit9e801cc468dc27f54fa4b947c3f8f25fcdc5cfa0 (patch)
tree0a8c5689993f6cc737e3f1f0f4919c676e4252d1
parentd8a14b0c2b85ab010595b41b11dac91aced115a7 (diff)
Rename the sec_t by cp_secu_t for the unit test in the beacon module.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1715 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--cp/beacon/beacons.h2
-rw-r--r--cp/beacon/inc/beacons_ctx.h2
-rw-r--r--cp/beacon/src/beacons.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/cp/beacon/beacons.h b/cp/beacon/beacons.h
index 80b572b10f..11ce714096 100644
--- a/cp/beacon/beacons.h
+++ b/cp/beacon/beacons.h
@@ -63,7 +63,7 @@ enum cp_beacon_type
*/
cp_beacon_t *
cp_beacon_init(interface_t *interface, phy_t *phy, cp_sta_t *sta,
- sec_t /*cp_secu_t*/ *secu, ca_t *ca,
+ cp_secu_t *secu, ca_t *ca,
pbproc_t *pbproc, mac_store_t *mac_store, cp_cco_t *cco,
hal_timer_t *timer, void *user_data, cp_beacon_timer_cb_t cb);
diff --git a/cp/beacon/inc/beacons_ctx.h b/cp/beacon/inc/beacons_ctx.h
index 440fa30e34..41594b7d84 100644
--- a/cp/beacon/inc/beacons_ctx.h
+++ b/cp/beacon/inc/beacons_ctx.h
@@ -119,7 +119,7 @@ struct cp_beacon_t
cp_pw_line_t pwl;
/** Security layer context. */
- sec_t/*cp_secu_t*/ *secu;
+ cp_secu_t *secu;
/** CCo context. */
cp_cco_t *cco;
diff --git a/cp/beacon/src/beacons.c b/cp/beacon/src/beacons.c
index d7d7c030ce..470410996b 100644
--- a/cp/beacon/src/beacons.c
+++ b/cp/beacon/src/beacons.c
@@ -54,7 +54,7 @@ static cp_beacon_t cp_beacon_global;
*/
cp_beacon_t *
cp_beacon_init(interface_t *interface, phy_t *phy, cp_sta_t *sta,
- sec_t /*cp_secu_t*/ *secu, ca_t *ca,
+ cp_secu_t *secu, ca_t *ca,
pbproc_t *pbproc, mac_store_t *mac_store, cp_cco_t *cco,
hal_timer_t *timer, void *user_data, cp_beacon_timer_cb_t cb)
{
@@ -771,7 +771,6 @@ cp_beacon_xcco_fill_common_part (cp_beacon_t *ctx, cp_beacon_desc_t *beacon,
// Beacon payload
nid = cp_station_get_nid (ctx->sta);
- printf("\n\n%u %s() : ####### nid = 0x%016llx #######\n\n",cyg_hal_sys_getpid(),__FUNCTION__,nid);
data.nid_msb = nid >> 22;
data.nid_lsb = nid & 0x7FFFFF;