Merge branch 'master' into usrp_e

Conflicts:
	host/CMakeLists.txt

1 files changed, 11 insertions, 10 deletions

diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp
index 451129ef5..1dc6e6e25 100644
--- a/host/lib/usrp/usrp1/usrp1_ctrl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_ctrl.cpp
@@ -249,45 +249,46 @@ public:
         unsigned char buf[ep0_size];
         int ret;
 
-        FILE *fp;
-        if ((fp = fopen(filename, "rb")) == NULL) {
+        std::ifstream file;
+        file.open(filename, std::ios::in | std::ios::binary);
+        if (not file.good()) {
             std::cerr << "cannot open fpga input file" << std::endl;
-            fclose(fp);
+            file.close();
             return -1;
         }
 
         if (usrp_control_write_cmd(VRQ_FPGA_LOAD, 0, FL_BEGIN) < 0) {
             std::cerr << "fpga load error" << std::endl;
-            fclose(fp);
+            file.close();
             return -1;
         }
 
         ssize_t n;
-        while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) {
+        while ((n = file.readsome((char *)buf, sizeof(buf))) > 0) {
             ret = usrp_control_write(VRQ_FPGA_LOAD, 0, FL_XFER,
                                      buf, n);
             if (ret != n) {
                 std::cerr << "fpga load error " << ret << std::endl;
-                fclose(fp);
+                file.close();
                 return -1;
             }
         }
  
         if (usrp_control_write_cmd(VRQ_FPGA_LOAD, 0, FL_END) < 0) {
             std::cerr << "fpga load error" << std::endl;
-            fclose(fp);
+            file.close();
             return -1;
         }
 
         usrp_set_fpga_hash(hash);
-        fclose(fp);
+        file.close();
         return 0; 
     }
 
     int usrp_load_eeprom(std::string filestring)
     {
         const char *filename = filestring.c_str();
-        const uint16_t i2c_addr = 0x50;
+        const boost::uint16_t i2c_addr = 0x50;
 
         //FIXME: verify types
         int len;
@@ -416,7 +417,7 @@ public:
     }
 
 
-    int usrp_control_write_cmd(uint8_t request, uint16_t value, uint16_t index)
+    int usrp_control_write_cmd(boost::uint8_t request, boost::uint16_t value, boost::uint16_t index)
     {
         return usrp_control_write(request, value, index, 0, 0);
     }