diff options
| -rw-r--r-- | grc/blocks/usrp2_sink_xxxx.xml | 21 | ||||
| -rw-r--r-- | grc/blocks/usrp2_source_xxxx.xml | 21 | ||||
| -rw-r--r-- | usrp2/firmware/lib/Makefile.am | 100 |
3 files changed, 61 insertions, 81 deletions
diff --git a/grc/blocks/usrp2_sink_xxxx.xml b/grc/blocks/usrp2_sink_xxxx.xml index 14586cc36..f9fb25361 100644 --- a/grc/blocks/usrp2_sink_xxxx.xml +++ b/grc/blocks/usrp2_sink_xxxx.xml @@ -21,7 +21,8 @@ self.$(id).set_interp($interpolation) self.$(id).set_lo_offset($lo_offset) #end if self.$(id).set_center_freq($frequency) -self.$(id).set_gain($gain)</make> +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src)</make> <callback>set_interp($interpolation)</callback> <callback>#if $lo_offset() != float('inf') self.$(id).set_lo_offset($lo_offset) @@ -84,6 +85,24 @@ self.$(id).set_center_freq($frequency)</callback> <value>0</value> <type>real</type> </param> + <param> + <name>Clock Source</name> + <key>usrp2_clock_src</key> + <value>usrp2.MC_WE_DONT_LOCK</value> + <type>enum</type> + <option> + <name>Internal</name> + <key>usrp2.MC_WE_DONT_LOCK</key> + </option> + <option> + <name>External SMA</name> + <key>usrp2.MC_WE_LOCK_TO_SMA</key> + </option> + <option> + <name>External MIMO</name> + <key>usrp2.MC_WE_LOCK_TO_MIMO</key> + </option> + </param> <sink> <name>in</name> <type>$type</type> diff --git a/grc/blocks/usrp2_source_xxxx.xml b/grc/blocks/usrp2_source_xxxx.xml index 0f297dfd1..584199798 100644 --- a/grc/blocks/usrp2_source_xxxx.xml +++ b/grc/blocks/usrp2_source_xxxx.xml @@ -21,7 +21,8 @@ self.$(id).set_decim($decimation) self.$(id).set_lo_offset($lo_offset) #end if self.$(id).set_center_freq($frequency) -self.$(id).set_gain($gain)</make> +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src)</make> <callback>set_decim($decimation)</callback> <callback>#if $lo_offset() != float('inf') self.$(id).set_lo_offset($lo_offset) @@ -84,6 +85,24 @@ self.$(id).set_center_freq($frequency)</callback> <value>0</value> <type>real</type> </param> + <param> + <name>Clock Source</name> + <key>usrp2_clock_src</key> + <value>usrp2.MC_WE_DONT_LOCK</value> + <type>enum</type> + <option> + <name>Internal</name> + <key>usrp2.MC_WE_DONT_LOCK</key> + </option> + <option> + <name>External SMA</name> + <key>usrp2.MC_WE_LOCK_TO_SMA</key> + </option> + <option> + <name>External MIMO</name> + <key>usrp2.MC_WE_LOCK_TO_MIMO</key> + </option> + </param> <source> <name>out</name> <type>$type</type> diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am index cd022c303..d6bb4edc3 100644 --- a/usrp2/firmware/lib/Makefile.am +++ b/usrp2/firmware/lib/Makefile.am @@ -22,8 +22,8 @@ noinst_LIBRARIES = \ libu2fw_wbx.a \ libu2fw_xcvr.a - -libu2fw_a_SOURCES = \ +U2FW_COMMON = \ + _exit.c \ abort.c \ ad9510.c \ ad9777.c \ @@ -31,16 +31,10 @@ libu2fw_a_SOURCES = \ buffer_pool.c \ clocks.c \ db_basic.c \ - db_bitshark_rx.c \ - db_dbsrx.c \ - db_rfx.c \ - db_tvrx.c \ - db_init.c \ dbsm.c \ eeprom.c \ - ethernet.c \ eth_mac.c \ - _exit.c \ + ethernet.c \ exit.c \ hal_io.c \ hal_uart.c \ @@ -52,89 +46,37 @@ libu2fw_a_SOURCES = \ memset_wa.c \ nonstdio.c \ pic.c \ + print_buffer.c \ + print_fxpt.c \ print_mac_addr.c \ print_rmon_regs.c \ - print_fxpt.c \ - print_buffer.c \ printf.c \ sd.c \ spi.c \ - u2_init.c + u2_init.c + +libu2fw_a_SOURCES = \ + $(U2FW_COMMON) \ + db_init.c \ + db_bitshark_rx.c \ + db_dbsrx.c \ + db_rfx.c \ + db_tvrx.c libu2fw_wbx_a_SOURCES = \ - abort.c \ - ad9510.c \ + $(U2FW_COMMON) \ + db_init_wbx.c \ adf4350.c \ adf4350_regs.c \ - ad9777.c \ - bsm12.c \ - buffer_pool.c \ - clocks.c \ - db_basic.c \ - db_wbxng.c \ - db_init_wbx.c \ - dbsm.c \ - eeprom.c \ - ethernet.c \ - eth_mac.c \ - _exit.c \ - exit.c \ - hal_io.c \ - hal_uart.c \ - i2c.c \ - lsadc.c \ - lsdac.c \ - mdelay.c \ - memcpy_wa.c \ - memset_wa.c \ - nonstdio.c \ - pic.c \ - print_mac_addr.c \ - print_rmon_regs.c \ - print_fxpt.c \ - print_buffer.c \ - printf.c \ - sd.c \ - spi.c \ - u2_init.c - + db_wbxng.c libu2fw_xcvr_a_SOURCES = \ - abort.c \ - ad9510.c \ + $(U2FW_COMMON) \ + db_init_xcvr.c \ adf4350.c \ adf4350_regs.c \ - ad9777.c \ - bsm12.c \ - buffer_pool.c \ - clocks.c \ - db_basic.c \ - db_xcvr2450.c \ - db_init_xcvr.c \ - dbsm.c \ - eeprom.c \ - ethernet.c \ - eth_mac.c \ - _exit.c \ - exit.c \ - hal_io.c \ - hal_uart.c \ - i2c.c \ - lsadc.c \ - lsdac.c \ - mdelay.c \ - memcpy_wa.c \ - memset_wa.c \ - nonstdio.c \ - pic.c \ - print_mac_addr.c \ - print_rmon_regs.c \ - print_fxpt.c \ - print_buffer.c \ - printf.c \ - sd.c \ - spi.c \ - u2_init.c + db_xcvr2450.c + noinst_HEADERS = \ ad9510.h \ |