summaryrefslogtreecommitdiff
path: root/gr-digital/lib/packet_header_ofdm.cc
diff options
context:
space:
mode:
authorMarcus Müller <mmueller@gnuradio.org>2019-08-07 21:45:12 +0200
committerMarcus Müller <marcus@hostalia.de>2019-08-09 23:04:28 +0200
commitf7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch)
treee09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-digital/lib/packet_header_ofdm.cc
parent78431dc6941e3acc67c858277dfe4a0ed583643c (diff)
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-digital/lib/packet_header_ofdm.cc')
-rw-r--r--gr-digital/lib/packet_header_ofdm.cc194
1 files changed, 97 insertions, 97 deletions
diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc
index 22d62df1be..61f27aa70f 100644
--- a/gr-digital/lib/packet_header_ofdm.cc
+++ b/gr-digital/lib/packet_header_ofdm.cc
@@ -27,124 +27,124 @@
#include <gnuradio/digital/lfsr.h>
namespace gr {
- namespace digital {
+namespace digital {
- int _get_header_len_from_occupied_carriers(const std::vector<std::vector<int> > &occupied_carriers, int n_syms)
- {
- int header_len = 0;
- for (int i = 0; i < n_syms; i++) {
- header_len += occupied_carriers[i].size();
- }
-
- return header_len;
+int _get_header_len_from_occupied_carriers(
+ const std::vector<std::vector<int>>& occupied_carriers, int n_syms)
+{
+ int header_len = 0;
+ for (int i = 0; i < n_syms; i++) {
+ header_len += occupied_carriers[i].size();
}
- packet_header_ofdm::sptr
- packet_header_ofdm::make(
- const std::vector<std::vector<int> > &occupied_carriers,
- int n_syms,
- const std::string &len_tag_key,
- const std::string &frame_len_tag_key,
- const std::string &num_tag_key,
- int bits_per_header_sym,
- int bits_per_payload_sym,
- bool scramble_header)
- {
- return packet_header_ofdm::sptr(
- new packet_header_ofdm(
- occupied_carriers, n_syms, len_tag_key, frame_len_tag_key, num_tag_key,
- bits_per_header_sym, bits_per_payload_sym, scramble_header
- )
- );
- }
+ return header_len;
+}
+
+packet_header_ofdm::sptr
+packet_header_ofdm::make(const std::vector<std::vector<int>>& occupied_carriers,
+ int n_syms,
+ const std::string& len_tag_key,
+ const std::string& frame_len_tag_key,
+ const std::string& num_tag_key,
+ int bits_per_header_sym,
+ int bits_per_payload_sym,
+ bool scramble_header)
+{
+ return packet_header_ofdm::sptr(new packet_header_ofdm(occupied_carriers,
+ n_syms,
+ len_tag_key,
+ frame_len_tag_key,
+ num_tag_key,
+ bits_per_header_sym,
+ bits_per_payload_sym,
+ scramble_header));
+}
- packet_header_ofdm::packet_header_ofdm(
- const std::vector<std::vector<int> > &occupied_carriers,
- int n_syms,
- const std::string &len_tag_key,
- const std::string &frame_len_tag_key,
- const std::string &num_tag_key,
- int bits_per_header_sym,
- int bits_per_payload_sym,
- bool scramble_header
- ) : packet_header_default(
- _get_header_len_from_occupied_carriers(occupied_carriers, n_syms),
- len_tag_key,
- num_tag_key,
- bits_per_header_sym),
+packet_header_ofdm::packet_header_ofdm(
+ const std::vector<std::vector<int>>& occupied_carriers,
+ int n_syms,
+ const std::string& len_tag_key,
+ const std::string& frame_len_tag_key,
+ const std::string& num_tag_key,
+ int bits_per_header_sym,
+ int bits_per_payload_sym,
+ bool scramble_header)
+ : packet_header_default(
+ _get_header_len_from_occupied_carriers(occupied_carriers, n_syms),
+ len_tag_key,
+ num_tag_key,
+ bits_per_header_sym),
d_frame_len_tag_key(pmt::string_to_symbol(frame_len_tag_key)),
d_occupied_carriers(occupied_carriers),
d_bits_per_payload_sym(bits_per_payload_sym),
d_scramble_mask(d_header_len, 0)
- {
- // Init scrambler mask
- if (scramble_header) {
- // These are just random values which already have OK PAPR:
- gr::digital::lfsr shift_reg(0x8a, 0x6f, 7);
- for (int i = 0; i < d_header_len; i++) {
- for (int k = 0; k < bits_per_header_sym; k++) {
- d_scramble_mask[i] ^= shift_reg.next_bit() << k;
- }
- }
- }
+{
+ // Init scrambler mask
+ if (scramble_header) {
+ // These are just random values which already have OK PAPR:
+ gr::digital::lfsr shift_reg(0x8a, 0x6f, 7);
+ for (int i = 0; i < d_header_len; i++) {
+ for (int k = 0; k < bits_per_header_sym; k++) {
+ d_scramble_mask[i] ^= shift_reg.next_bit() << k;
+ }
+ }
}
+}
- packet_header_ofdm::~packet_header_ofdm()
- {
- }
+packet_header_ofdm::~packet_header_ofdm() {}
- bool packet_header_ofdm::header_formatter(long packet_len, unsigned char *out, const std::vector<tag_t> &tags)
- {
- bool ret_val = packet_header_default::header_formatter(packet_len, out, tags);
- for (int i = 0; i < d_header_len; i++) {
- out[i] ^= d_scramble_mask[i];
- }
- return ret_val;
+bool packet_header_ofdm::header_formatter(long packet_len,
+ unsigned char* out,
+ const std::vector<tag_t>& tags)
+{
+ bool ret_val = packet_header_default::header_formatter(packet_len, out, tags);
+ for (int i = 0; i < d_header_len; i++) {
+ out[i] ^= d_scramble_mask[i];
}
+ return ret_val;
+}
- bool packet_header_ofdm::header_parser(
- const unsigned char *in,
- std::vector<tag_t> &tags
- ) {
- std::vector<unsigned char> in_descrambled(d_header_len, 0);
- for (int i = 0; i < d_header_len; i++) {
+bool packet_header_ofdm::header_parser(const unsigned char* in, std::vector<tag_t>& tags)
+{
+ std::vector<unsigned char> in_descrambled(d_header_len, 0);
+ for (int i = 0; i < d_header_len; i++) {
in_descrambled[i] = in[i] ^ d_scramble_mask[i];
- }
- if (!packet_header_default::header_parser(&in_descrambled[0], tags)) {
+ }
+ if (!packet_header_default::header_parser(&in_descrambled[0], tags)) {
return false;
- }
- int packet_len = 0; // # of complex symbols in this frame
- for (size_t i = 0; i < tags.size(); i++) {
+ }
+ int packet_len = 0; // # of complex symbols in this frame
+ for (size_t i = 0; i < tags.size(); i++) {
if (pmt::equal(tags[i].key, d_len_tag_key)) {
- // Convert bytes to complex symbols:
- packet_len = pmt::to_long(tags[i].value) * 8 / d_bits_per_payload_sym;
- if (pmt::to_long(tags[i].value) * 8 % d_bits_per_payload_sym) {
- packet_len++;
- }
- tags[i].value = pmt::from_long(packet_len);
- break;
+ // Convert bytes to complex symbols:
+ packet_len = pmt::to_long(tags[i].value) * 8 / d_bits_per_payload_sym;
+ if (pmt::to_long(tags[i].value) * 8 % d_bits_per_payload_sym) {
+ packet_len++;
+ }
+ tags[i].value = pmt::from_long(packet_len);
+ break;
}
- }
+ }
- // To figure out how many payload OFDM symbols there are in this frame,
- // we need to go through the carrier allocation and count the number of
- // allocated carriers per OFDM symbol.
- // frame_len == # of payload OFDM symbols in this frame
- int frame_len = 0;
- size_t k = 0; // position in the carrier allocation map
- int symbols_accounted_for = 0;
- while (symbols_accounted_for < packet_len) {
+ // To figure out how many payload OFDM symbols there are in this frame,
+ // we need to go through the carrier allocation and count the number of
+ // allocated carriers per OFDM symbol.
+ // frame_len == # of payload OFDM symbols in this frame
+ int frame_len = 0;
+ size_t k = 0; // position in the carrier allocation map
+ int symbols_accounted_for = 0;
+ while (symbols_accounted_for < packet_len) {
frame_len++;
symbols_accounted_for += d_occupied_carriers[k].size();
k = (k + 1) % d_occupied_carriers.size();
- }
- tag_t tag;
- tag.key = d_frame_len_tag_key;
- tag.value = pmt::from_long(frame_len);
- tags.push_back(tag);
-
- return true;
}
+ tag_t tag;
+ tag.key = d_frame_len_tag_key;
+ tag.value = pmt::from_long(frame_len);
+ tags.push_back(tag);
+
+ return true;
+}
- } /* namespace digital */
+} /* namespace digital */
} /* namespace gr */