diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-06-14 10:48:00 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-14 10:58:05 -0700 |
| commit | 817f61bbdd180a2854116c85ccf1020e561c523f (patch) | |
| tree | 883649968739a66c537e932c65c79e9387544a07 /gr-digital/lib/protocol_formatter_async_impl.cc | |
| parent | c475f14e4604b9bca25c08f1d30a2e8ff9bbcf26 (diff) | |
digital: Complete overhaul of protocol handling
See documentation for details. In brief:
- digital_protocol_* classes added (replace packet header blocks)
- header_buffer class added
- Lots of QA
- default packet formatter: contains access code and payload length
fields.
- counter packet formatter: also contains the bits/sym in the payload
modulation and a packet number counter.
- Also adds QA code and the infrastructure for C++ QA code in
gr-digital.
- New block to use the packet formatter objects.
- The header and payload are transmitted as PDU messages out of different ports.
- header_buffer class for header formatting.
- Used by packet_formatter_x classes to more easily add and format
header data for transmission.
- New blocks that parse headers.
- Handles either hard or soft bits. Produces an info message to
instruct payload demod.
- 'receive mode' to header_buffer class.
- Designed to make extracting fields from the received header bits
easier for packet formatter classes. Use extract_field[N] to get
the different fields out of a collected set of header bits. *
Docs describing both functions with small examples for how to use
them.
- Don't force access code to be a multiple of 8
- need to verify everything else handles this correctly.
- Throw an exception in the ctor if setting the code failed and emit a
log message.
Committed-By: Martin Braun <martin.braun@ettus.com>
Diffstat (limited to 'gr-digital/lib/protocol_formatter_async_impl.cc')
| -rw-r--r-- | gr-digital/lib/protocol_formatter_async_impl.cc | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc new file mode 100644 index 0000000000..83a2eedfdd --- /dev/null +++ b/gr-digital/lib/protocol_formatter_async_impl.cc @@ -0,0 +1,94 @@ +/* -*- c++ -*- */ +/* + * Copyright 2015-2016 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <volk/volk.h> +#include <gnuradio/io_signature.h> +#include "protocol_formatter_async_impl.h" +#include <stdio.h> + +namespace gr { + namespace digital { + + protocol_formatter_async::sptr + protocol_formatter_async::make(const header_format_base::sptr &format) + { + return gnuradio::get_initial_sptr + (new protocol_formatter_async_impl(format)); + } + + protocol_formatter_async_impl::protocol_formatter_async_impl(const header_format_base::sptr &format) + : block("protocol_formatter_async", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)) + { + d_format = format; + + d_in_port = pmt::mp("in"); + d_hdr_port = pmt::mp("header"); + d_pld_port = pmt::mp("payload"); + + message_port_register_in(d_in_port); + message_port_register_out(d_hdr_port); + message_port_register_out(d_pld_port); + + set_msg_handler(d_in_port, + boost::bind(&protocol_formatter_async_impl::append, this ,_1) ); + } + + protocol_formatter_async_impl::~protocol_formatter_async_impl() + { + } + + void + protocol_formatter_async_impl::append(pmt::pmt_t msg) + { + // extract input pdu + pmt::pmt_t meta(pmt::car(msg)); + pmt::pmt_t input(pmt::cdr(msg)); + pmt::pmt_t header, output; + + size_t pkt_len = 0; + const uint8_t* bytes_in = pmt::u8vector_elements(input, pkt_len); + + // Pad the payload with 0's + uint8_t* payload = (uint8_t*)volk_malloc(pkt_len*sizeof(uint8_t), + volk_get_alignment()); + memcpy(payload, bytes_in, pkt_len*sizeof(uint8_t)); + output = pmt::init_u8vector(pkt_len, payload); + volk_free(payload); + + // Build the header from the input, metadata, and format + d_format->format(pkt_len, bytes_in, header, meta); + + // Package and publish + pmt::pmt_t hdr_pdu = pmt::cons(meta, header); + pmt::pmt_t pld_pdu = pmt::cons(meta, output); + message_port_pub(d_hdr_port, hdr_pdu); + message_port_pub(d_pld_port, pld_pdu); + } + + } /* namespace digital */ +} /* namespace gr */ |