diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-10 12:15:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-10 12:15:04 -0800 |
| commit | 80be2ec57a0fada29d04bd5cd0c102c622fac7a6 (patch) | |
| tree | 54bf666d4f1f1906116f9e7a39bbdc7c09fa1652 /host/lib/usrp/usrp_e100/usrp_e100_iface.cpp | |
| parent | 1275c37b96953c04191e9a5dd8747766c723b7e1 (diff) | |
| parent | 206a70cb823da9c338dcb83855a22ad251bb9cb7 (diff) | |
| download | uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.gz uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.bz2 uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.zip | |
Merge branch 'usrp_e100_devel' into next
Conflicts:
host/lib/usrp/usrp_e100/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp_e100/usrp_e100_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e100/usrp_e100_iface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp index 40c7afabb..ad36dd97a 100644 --- a/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp +++ b/host/lib/usrp/usrp_e100/usrp_e100_iface.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010-2011 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -16,6 +16,7 @@ // #include "usrp_e100_iface.hpp" +#include "usrp_e100_regs.hpp" #include <uhd/utils/assert.hpp> #include <sys/ioctl.h> //ioctl #include <fcntl.h> //open, close @@ -108,6 +109,9 @@ public: throw std::runtime_error("Failed to open " + node); } + //very first thing, reset all the wishbone, always do first! + this->poke32(UE_REG_CLEAR_GLOBAL, 0); + mb_eeprom = mboard_eeprom_t(get_i2c_dev_iface(), mboard_eeprom_t::MAP_E100); } |