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

4 files changed, 80 insertions, 5 deletions

diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt
index 4d3269543..c649dbb61 100644
--- a/host/docs/CMakeLists.txt
+++ b/host/docs/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(manual_sources
     images.rst
     transport.rst
     usrp1.rst
-    usrp2.rst
+    usrp_nxxx.rst
 )
 
 ########################################################################
diff --git a/host/docs/dboards.rst b/host/docs/dboards.rst
index b39c587f6..7f205c404 100644
--- a/host/docs/dboards.rst
+++ b/host/docs/dboards.rst
@@ -157,7 +157,7 @@ Modification usually involves moving/removing a SMT component
 and burning a new daughterboard id into the eeprom.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-DBSRX
+DBSRX - Mod
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Due to different clocking capabilities,
@@ -187,3 +187,45 @@ With the daughterboard plugged-in, run the following commands:
 
 * <args> are device address arguments (optional if only one USRP is on your machine)
 * <slot> is the name of the daughterboard slot (optional if the USRP has only one slot)
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+RFX - Mod
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Older RFX boards require modifications to use the motherboard oscillator.
+If this is the case, UHD will print a warning about the modification.
+Please follow the modification procedures below:
+
+**Step 1: Disable the daughterboard clocks**
+
+Move R64 to R84, Move R142 to R153
+
+**Step 2: Connect the motherboard blocks**
+
+Move R35 to R36, Move R117 to R115
+These are all 0-ohm, so if you lose one, just short across the appropriate pads
+
+**Step 3: Burn the appropriate daughterboard id into the EEPROM**
+
+With the daughterboard plugged-in, run the following commands:
+::
+
+    cd <prefix>/share/uhd/utils
+    ./usrp_burn_db_eeprom --id=<rx_id> --unit=RX --args=<args> --slot=<slot>
+    ./usrp_burn_db_eeprom --id=<tx_id> --unit=TX --args=<args> --slot=<slot>
+
+* <rx_id> choose the appropriate RX ID for your daughterboard
+
+  * **RFX400:** 0x0024
+  * **RFX900:** 0x0025
+  * **RFX1800:** 0x0034
+  * **RFX1200:** 0x0026
+  * **RFX2400:** 0x0027
+* <tx_id> choose the appropriate TX ID for your daughterboard
+
+  * **RFX400:** 0x0028
+  * **RFX900:** 0x0029
+  * **RFX1800:** 0x0035
+  * **RFX1200:** 0x002a
+  * **RFX2400:** 0x002b
+* <args> are device address arguments (optional if only one USRP is on your machine)
+* <slot> is the name of the daughterboard slot (optional if the USRP has only one slot)
diff --git a/host/docs/index.rst b/host/docs/index.rst
index 9d6d14d0f..c491c5da6 100644
--- a/host/docs/index.rst
+++ b/host/docs/index.rst
@@ -24,7 +24,7 @@ Application Notes
 * `Device Identification Notes <./identification.html>`_
 * `Firmware and FPGA Image Notes <./images.html>`_
 * `USRP1 Application Notes <./usrp1.html>`_
-* `USRP2 Application Notes <./usrp2.html>`_
+* `USRP2 and USRP-N Series Application Notes <./usrp_nxxx.html>`_
 * `Daughterboard Application Notes <./dboards.html>`_
 * `Transport Application Notes <./transport.html>`_
 
diff --git a/host/docs/usrp2.rst b/host/docs/usrp_nxxx.rst
index dbb11676b..1c270df08 100644
--- a/host/docs/usrp2.rst
+++ b/host/docs/usrp_nxxx.rst
@@ -1,11 +1,11 @@
 ========================================================================
-UHD - USRP2 Application Notes
+UHD - USRP2 and USRP-N Series Application Notes
 ========================================================================
 
 .. contents:: Table of Contents
 
 ------------------------------------------------------------------------
-Load the images onto the SD card
+Load the images onto the SD card (USRP2 only)
 ------------------------------------------------------------------------
 **Warning!**
 Use the usrp2_card_burner.py with caution. If you specify the wrong device node,
@@ -46,6 +46,39 @@ Use the card burner tool (windows)
 
 
 ------------------------------------------------------------------------
+Load the images onto the on-board flash (USRP-N Series only)
+------------------------------------------------------------------------
+The USRP-N Series can be reprogrammed over the network
+to update or change the firmware and FPGA images.
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Use the net burner tool (unix)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+::
+
+    cd <prefix>/share/uhd/utils
+    ./usrp_n2xx_net_burner.py --ip=<ip address> --fw=<path for firmware image>
+    ./usrp_n2xx_net_burner.py --ip=<ip address> --fpga=<path to FPGA image>
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Use the net burner tool (Windows)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+::
+
+    <path_to_python.exe> <prefix>/share/uhd/utils/usrp_n2xx_net_burner.py --ip=<ip address> --fw=<path for firmware image>
+    <path_to_python.exe> <prefix>/share/uhd/utils/usrp_n2xx_net_burner.py --ip=<ip address> --fpga=<path to FPGA image>
+
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Device recovery and bricking
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Its possible to put the device into an unusable state by loading bad images.
+Fortunately, the USRP-N Series can be booted into a safe (read-only) image.
+Once booted into the safe image, the user can once again load images onto the device.
+
+To boot into the safe image, hold down the reset button while power-cycling the device.
+The reset button is a pushbutton switch (S2) located inside the enclosure.
+
+------------------------------------------------------------------------
 Setup networking
 ------------------------------------------------------------------------
 The USRP2 only supports gigabit ethernet,