summaryrefslogtreecommitdiff
path: root/cesar/bsu/beacon
diff options
context:
space:
mode:
authorlaranjeiro2010-07-22 08:40:42 +0000
committerlaranjeiro2010-07-22 08:40:42 +0000
commit0665ce40cb403c93eb131e48ea4972588ed11386 (patch)
treec9f96e96cb4de32c3d8e6c482d6e5480f038b5d4 /cesar/bsu/beacon
parentc28228fbc5c05a9e489d6a05bf931471357b880d (diff)
cesar/{cp/beacon, bsu/beacon}: read network mode from beacon
removed cp_beacon_nm_t already present in bsu/beacon git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7305 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/bsu/beacon')
-rw-r--r--cesar/bsu/beacon/beacon.h2
-rw-r--r--cesar/bsu/beacon/src/beacon.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/cesar/bsu/beacon/beacon.h b/cesar/bsu/beacon/beacon.h
index 7cafd88eec..dedafb3711 100644
--- a/cesar/bsu/beacon/beacon.h
+++ b/cesar/bsu/beacon/beacon.h
@@ -142,6 +142,8 @@ struct bsu_beacon_schedules_t
u8 snid[BSU_BEACON_SCHEDULES_MAX];
/** NEK switch. */
uint nek_switch[BSU_BEACON_SCHEDULES_MAX];
+ /** Network mode. */
+ bsu_beacon_nm_t nm;
/** Persistent schedule. */
bsu_beacon_bmi_persistent_schedule_t ps;
/** Non persistent schedule. */
diff --git a/cesar/bsu/beacon/src/beacon.c b/cesar/bsu/beacon/src/beacon.c
index 5ed22ab649..adadc99070 100644
--- a/cesar/bsu/beacon/src/beacon.c
+++ b/cesar/bsu/beacon/src/beacon.c
@@ -1034,8 +1034,11 @@ bsu_beacon_read_schedules (pb_beacon_t *beacon,
/* Skip the NID. */
bitstream_skip (&stream, 22);
schedules->hm[0] = bitstream_read (&stream, 2);
+ /* Skip the variant fields until network mode. */
+ bitstream_skip (&stream, 32);
+ schedules->nm = bitstream_read (&stream, 2);
/* Skip the end of variant fields. */
- bitstream_skip (&stream, 40);
+ bitstream_skip (&stream, 6);
/* Read number of beacon entry. */
nbe = bitstream_read (&stream, 8);
/* Reset schedule data. */