From e3483c7451d20b7ed1d8d4865e15751f18cdef78 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 21 Jan 2010 15:30:34 -0800
Subject: Added a usrp device abstration that creates usrp mboards. Added a
 usrp mboard named test, its empty for now.

---
 include/usrp_uhd/device_addr.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'include/usrp_uhd/device_addr.hpp')

diff --git a/include/usrp_uhd/device_addr.hpp b/include/usrp_uhd/device_addr.hpp
index c082d9f84..38c6c32dd 100644
--- a/include/usrp_uhd/device_addr.hpp
+++ b/include/usrp_uhd/device_addr.hpp
@@ -60,15 +60,20 @@ namespace usrp_uhd{
         } usb_args;
         struct{
             std::string ifc;
-            mac_addr_t mac_addr;
+            std::string mac_addr;
         } eth_args;
         struct{
-            ip_addr_t ip_addr;
+            std::string addr;
         } udp_args;
         struct{
             //TODO unknown for now
         } gpmc_args;
 
+        //the discovery args are filled in by the discovery routine
+        struct{
+            uint16_t mboard_id;
+        } discovery_args;
+
         /*!
          * \brief Convert a usrp device_addr_t into a string representation
          */
-- 
cgit v1.2.3