diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
| commit | 95cf7753c175e868d1aacaad378bfe74d9454200 (patch) | |
| tree | 2eef9c811655d7a1b4d0fb020db7fa5125a2adc7 /firmware/microblaze/lib/u2_init.c | |
| parent | 81c9f77306dc82f250bfb2871b8bd7db67a40085 (diff) | |
| parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
| download | uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.gz uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.bz2 uhd-95cf7753c175e868d1aacaad378bfe74d9454200.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
Conflicts:
host/lib/transport/udp_simple.cpp
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'firmware/microblaze/lib/u2_init.c')
| -rw-r--r-- | firmware/microblaze/lib/u2_init.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/firmware/microblaze/lib/u2_init.c b/firmware/microblaze/lib/u2_init.c index c9b4beb2b..4a553a713 100644 --- a/firmware/microblaze/lib/u2_init.c +++ b/firmware/microblaze/lib/u2_init.c @@ -23,11 +23,22 @@ #include "buffer_pool.h" #include "hal_uart.h" #include "i2c.h" +#include "i2c_async.h" #include "mdelay.h" #include "clocks.h" #include "usrp2/fw_common.h" #include "nonstdio.h" +unsigned char u2_hw_rev_major; +unsigned char u2_hw_rev_minor; + +static inline void +get_hw_rev(void) +{ + bool ok = eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV, &u2_hw_rev_minor, 1); + ok &= eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV+1, &u2_hw_rev_major, 1); +} + /* * We ought to arrange for this to be called before main, but for now, * we require that the user's main call u2_init as the first thing... @@ -49,6 +60,7 @@ u2_init(void) // init i2c so we can read our rev pic_init(); // progammable interrupt controller i2c_init(); + i2c_register_handler(); //for using async I2C hal_enable_ints(); bp_init(); // buffer pool |