diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-18 15:12:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-18 15:12:04 -0700 |
| commit | 7051b32ba7892971d10768af0857a8c0e3d4dbfb (patch) | |
| tree | f75bb304b1a8500c499115fcb376b54af3803907 | |
| parent | 09df4536a909ef008ff5315799ea624e463dcf97 (diff) | |
| parent | 360681f26ffa5f1bea095291eeaf595b4e0aa447 (diff) | |
| download | uhd-7051b32ba7892971d10768af0857a8c0e3d4dbfb.tar.gz uhd-7051b32ba7892971d10768af0857a8c0e3d4dbfb.tar.bz2 uhd-7051b32ba7892971d10768af0857a8c0e3d4dbfb.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/include/uhd/usrp/dboard_iface.hpp | 4 | ||||
| -rwxr-xr-x | host/utils/usrp_n2xx_net_burner.py | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index ca5de5c2f..6a6a68321 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -213,7 +213,7 @@ public: * * \param unit which unit, rx or tx * \param config configuration settings - * \param data the bits to write LSB first + * \param data the bits to write MSB first * \param num_bits the number of bits in data */ virtual void write_spi( @@ -228,7 +228,7 @@ public: * * \param unit which unit, rx or tx * \param config configuration settings - * \param data the bits to write LSB first + * \param data the bits to write MSB first * \param num_bits the number of bits in data * \return the data that was read */ diff --git a/host/utils/usrp_n2xx_net_burner.py b/host/utils/usrp_n2xx_net_burner.py index ae6219524..6d1c02712 100755 --- a/host/utils/usrp_n2xx_net_burner.py +++ b/host/utils/usrp_n2xx_net_burner.py @@ -196,8 +196,10 @@ def win_get_interfaces(): adNode = a.ipAddressList while True: #convert ipAddr and ipMask into hex addrs that can be turned into a bcast addr - ipAddr = adNode.ipAddress.decode() - ipMask = adNode.ipMask.decode() + try: + ipAddr = adNode.ipAddress.decode() + ipMask = adNode.ipMask.decode() + except AttributeError: pass if ipAddr and ipMask: hexAddr = struct.unpack("<L", socket.inet_aton(ipAddr))[0] hexMask = struct.unpack("<L", socket.inet_aton(ipMask))[0] @@ -282,7 +284,7 @@ class burner_socket(object): (flash_size, sector_size) = self.get_flash_info() hw_rev = self.get_hw_rev() - if n2xx_revs.has_key(hw_rev): print("Hardware type: %s" % n2xx_revs[hw_rev][0]) + if hw_rev in n2xx_revs: print("Hardware type: %s" % n2xx_revs[hw_rev][0]) print("Flash size: %i\nSector size: %i\n" % (flash_size, sector_size)) if fpga: |