uhd: Move internal headers to uhdlib/

To avoid the proliferation of additional include directories and
multiple ways of including project-local headers, we now default to
moving all headers that are used across UHD into the uhdlib/
subdirectory.

Some #include statements were also reordered as they were modified for
closer compliance with the coding guidelines.

Internal cpp source files should now include files like this:

    #include <uhdlib/rfnoc/ctrl_iface.hpp>

Reviewed-by: Ashish Chaudhari <ashish.chaudhari@ettus.com>

1 files changed, 0 insertions, 138 deletions

diff --git a/host/lib/usrp/common/fx2_ctrl.hpp b/host/lib/usrp/common/fx2_ctrl.hpp
deleted file mode 100644
index 258aa7d04..000000000
--- a/host/lib/usrp/common/fx2_ctrl.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright 2010-2012 Ettus Research LLC
-// Copyright 2018 Ettus Research, a National Instruments Company
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-
-#ifndef INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP
-#define INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP
-
-#include <uhd/transport/usb_control.hpp>
-#include <uhd/types/serial.hpp> //i2c iface
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-
-#define FL_BEGIN               0
-#define FL_END                 2
-#define FL_XFER                1
-#define USRP_HASH_SLOT_0_ADDR  0xe1e0
-#define USRP_HASH_SLOT_1_ADDR  0xe1f0
-#define VRQ_FPGA_LOAD          0x02
-#define VRQ_FPGA_SET_RESET     0x04
-#define VRQ_FPGA_SET_TX_ENABLE 0x05
-#define VRQ_FPGA_SET_RX_ENABLE 0x06
-#define VRQ_FPGA_SET_TX_RESET  0x0a
-#define VRQ_FPGA_SET_RX_RESET  0x0b
-#define VRQ_I2C_READ           0x81
-#define VRQ_I2C_WRITE          0x08
-#define VRQ_SET_LED            0x01
-#define VRT_VENDOR_IN          0xC0
-#define VRT_VENDOR_OUT         0x40
-
-namespace uhd{ namespace usrp{
-
-class fx2_ctrl : boost::noncopyable, public uhd::i2c_iface{
-public:
-    typedef boost::shared_ptr<fx2_ctrl> sptr;
-
-    /*!
-     * Make a usrp control object from a control transport
-     * \param ctrl_transport a USB control transport
-     * \return a new usrp control object
-     */
-    static sptr make(uhd::transport::usb_control::sptr ctrl_transport);
-
-    //! Call init after the fpga is loaded
-    virtual void usrp_init(void) = 0;
-
-    //! For emergency situations
-    virtual void usrp_fx2_reset(void) = 0;
-
-    /*!
-     * Load firmware in Intel HEX Format onto device
-     * \param filename name of firmware file
-     * \param force reload firmware if already loaded
-     */
-    virtual void usrp_load_firmware(std::string filename,
-                                   bool force = false) = 0;
-
-    /*!
-     * Load fpga file onto usrp
-     * \param filename name of fpga image
-     */
-    virtual void usrp_load_fpga(std::string filename) = 0;
-
-    /*!
-     * Load USB descriptor file in Intel HEX format into EEPROM
-     * \param filestring name of EEPROM image
-     */
-    virtual void usrp_load_eeprom(std::string filestring) = 0;
-
-    /*!
-     * Submit an IN transfer
-     * \param request device specific request
-     * \param value device specific field
-     * \param index device specific field
-     * \param buff buffer to place data
-     * \param length length of buffer
-     * \return number of bytes read or error
-     */
-    virtual int usrp_control_read(uint8_t request,
-                                  uint16_t value,
-                                  uint16_t index,
-                                  unsigned char *buff,
-                                  uint16_t length) = 0;
-
-    /*!
-     * Submit an OUT transfer
-     * \param request device specific request
-     * \param value device specific field
-     * \param index device specific field
-     * \param buff buffer of data to be sent
-     * \param length length of buffer
-     * \return number of bytes written or error
-     */
-    virtual int usrp_control_write(uint8_t request,
-                                   uint16_t value,
-                                   uint16_t index,
-                                   unsigned char *buff,
-                                   uint16_t length) = 0;
-
-    /*!
-     * Perform an I2C write
-     * \param i2c_addr I2C device address
-     * \param buf data to be written
-     * \param len length of data in bytes
-     * \return number of bytes written or error
-     */
-
-    virtual int usrp_i2c_write(uint16_t i2c_addr,
-                               unsigned char *buf,
-                               uint16_t len) = 0;
-
-    /*!
-     * Perform an I2C read
-     * \param i2c_addr I2C device address
-     * \param buf data to be read
-     * \param len length of data in bytes
-     * \return number of bytes read or error
-     */
-
-    virtual int usrp_i2c_read(uint16_t i2c_addr,
-                               unsigned char *buf,
-                               uint16_t len) = 0;
-
-    //! enable/disable the rx path
-    virtual void usrp_rx_enable(bool on) = 0;
-
-    //! enable/disable the tx path
-    virtual void usrp_tx_enable(bool on) = 0;
-
-    //! reset the fpga
-    virtual void usrp_fpga_reset(bool on) = 0;
-};
-
-}} //namespace uhd::usrp
-
-#endif /* INCLUDED_LIBUHD_USRP_COMMON_FX2_CTRL_HPP */