Revision e7df6384 host/lib/usrp/b100/b100_impl.cpp

b/host/lib/usrp/b100/b100_impl.cpp
35 35
#include <boost/lexical_cast.hpp>
36 36
#include "b100_regs.hpp"
37 37
#include <cstdio>
38
#include <iostream>
38 39

  
39 40
using namespace uhd;
40 41
using namespace uhd::usrp;
......
85 86
            b100_fw_image = find_image_path(hint.get("fw", B100_FW_FILE_NAME));
86 87
        }
87 88
        catch(...){
88
            UHD_MSG(warning) << boost::format(
89
                "Could not locate B100 firmware.\n"
90
                "Please install the images package.\n"
91
            );
89
            UHD_MSG(warning) << boost::format("Could not locate B100 firmware. %s\n") % print_images_error();
92 90
            return b100_addrs;
93 91
        }
94
        UHD_LOG << "the  firmware image: " << b100_fw_image << std::endl;
92
        UHD_LOG << "the firmware image: " << b100_fw_image << std::endl;
95 93

  
96 94
        usb_control::sptr control;
97 95
        try{control = usb_control::make(handle, 0);}
......
497 495
    if (fw_compat_num != B100_FW_COMPAT_NUM){
498 496
        throw uhd::runtime_error(str(boost::format(
499 497
            "Expected firmware compatibility number 0x%x, but got 0x%x:\n"
500
            "The firmware build is not compatible with the host code build."
501
        ) % B100_FW_COMPAT_NUM % fw_compat_num));
498
            "The firmware build is not compatible with the host code build.\n"
499
            "%s"
500
        ) % B100_FW_COMPAT_NUM % fw_compat_num % print_images_error()));
502 501
    }
503 502
}
504 503

  
......
513 512
        throw uhd::runtime_error(str(boost::format(
514 513
            "Expected FPGA compatibility number %d, but got %d:\n"
515 514
            "The FPGA build is not compatible with the host code build."
516
        ) % int(B100_FPGA_COMPAT_NUM) % fpga_major));
515
            "%s"
516
        ) % int(B100_FPGA_COMPAT_NUM) % fpga_major % print_images_error()));
517 517
    }
518 518
    _tree->create<std::string>("/mboards/0/fpga_version").set(str(boost::format("%u.%u") % fpga_major % fpga_minor));
519 519
}

Also available in: Unified diff