aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-08-01 14:49:12 -0700
committerMartin Braun <martin.braun@ettus.com>2019-11-26 11:49:34 -0800
commitb89c53c0691c6d70fb24561243a930bbcc32363b (patch)
treef98c821b5a86daff0addd79eaf9bc6c812f38946 /host/include
parent595fba47d534634432d4e114d31bbfa42cc00812 (diff)
downloaduhd-b89c53c0691c6d70fb24561243a930bbcc32363b.tar.gz
uhd-b89c53c0691c6d70fb24561243a930bbcc32363b.tar.bz2
uhd-b89c53c0691c6d70fb24561243a930bbcc32363b.zip
rfnoc: ctrlport: Separately validate and handle async messages
This introduces the concept of an async message validator, an optional callback for functions to check if an async message has a valid payload. After validation, the async message is ack'd. Then, the async message handler is executed. This makes sure that an async message is ack'd as soon as possible, rather than after the async message handling, which can itself have all sorts of communication going on to the device.
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/rfnoc/register_iface.hpp40
1 files changed, 38 insertions, 2 deletions
diff --git a/host/include/uhd/rfnoc/register_iface.hpp b/host/include/uhd/rfnoc/register_iface.hpp
index 3344b7c5e..23f24b242 100644
--- a/host/include/uhd/rfnoc/register_iface.hpp
+++ b/host/include/uhd/rfnoc/register_iface.hpp
@@ -32,11 +32,26 @@ public:
virtual ~register_iface() = default;
- /*! Callback function for an asynchronous message.
+ /*! Callback function for validating an asynchronous message.
+ *
* When a block in the FPGA sends an asynchronous message to the software,
- * the async message callback function is called. An async message can be
+ * the async message validator function is called. An async message can be
* modelled as a simple register write (key-value pair with addr/data) that
* is initiated by the FPGA.
+ * If this message returns true, the message is considered valid.
+ */
+ using async_msg_validator_t =
+ std::function<bool(uint32_t addr, const std::vector<uint32_t>& data)>;
+
+ /*! Callback function for acting upon an asynchronous message.
+ *
+ * When a block in the FPGA sends an asynchronous message to the software,
+ * and it has been validated, the async message callback function is called.
+ * An async message can be modelled as a simple register write (key-value
+ * pair with addr/data) that is initiated by the FPGA.
+ *
+ * When this message is called, the async message was previously verified
+ * by calling the async message validator callback.
*/
using async_msg_callback_t = std::function<void(
uint32_t addr, const std::vector<uint32_t>& data, boost::optional<uint64_t>)>;
@@ -245,6 +260,27 @@ public:
*/
virtual void sleep(time_spec_t duration, bool ack = false) = 0;
+ /*! Register a callback function to validate a received async message
+ *
+ * The purpose of this callback is to provide a method to the framework to
+ * make sure a received async message is valid. If this callback is
+ * provided, the framework will first pass the message to the validator for
+ * validation. If the validator returns true, the async message is ACK'd
+ * with a ctrl_status_t::CMD_OKAY response, and then the async message is
+ * executed. If the validator returns false, then the async message is ACK'd
+ * with a ctrl_status_t::CMD_CMDERR, and the async message handler is not
+ * excecuted.
+ *
+ * This callback may not communicate with the device, it can only look at
+ * the data and make a valid/not valid decision.
+ *
+ * Only one callback function can be registered. When calling this multiple
+ * times, only the last callback will be accepted.
+ *
+ * \param callback_f The function to call when an asynchronous message is received.
+ */
+ virtual void register_async_msg_validator(async_msg_validator_t callback_f) = 0;
+
/*! Register a callback function for when an async message is received
*
* Only one callback function can be registered. When calling this multiple