Revision 80fe3189

b/host/lib/usrp/usrp1/usrp1_impl.cpp
22 22
#include <uhd/transport/usb_control.hpp>
23 23
#include <uhd/usrp/device_props.hpp>
24 24
#include <uhd/usrp/mboard_props.hpp>
25
#include <uhd/utils/warning.hpp>
25 26
#include <uhd/utils/assert.hpp>
26 27
#include <uhd/utils/static.hpp>
27 28
#include <uhd/utils/images.hpp>
......
50 51
    if (hint.has_key("type") and hint["type"] != "usrp1") return usrp1_addrs;
51 52

  
52 53
    //extract the firmware path for the USRP1
53
    std::string usrp1_fw_image = find_image_path(
54
        hint.has_key("fw")? hint["fw"] : "usrp1_fw.ihx"
55
    );
54
    std::string usrp1_fw_image;
55
    try{
56
        usrp1_fw_image = find_image_path(
57
            hint.has_key("fw")? hint["fw"] : "usrp1_fw.ihx"
58
        );
59
    }
60
    catch(const std::exception &e){
61
        uhd::print_warning(
62
            "Could not locate USRP1 firmware.\n"
63
            "Please install the images package.\n"
64
        );
65
        return usrp1_addrs;
66
    }
56 67
    std::cout << "USRP1 firmware image: " << usrp1_fw_image << std::endl;
57 68

  
58 69
    //see what we got on the USB bus
b/images/README
18 18

  
19 19
The package generator types are described here:
20 20
    http://www.cmake.org/Wiki/CMake:CPackPackageGenerators
21

  
22
Fedora note:
23
    The sdcc binaries are prefixed with "sdcc-" which breaks the build.
24
    However, /usr/libexec/sdcc contains properly named sdcc binaries.
25
    export PATH=${PATH}:/usr/libexec/sdcc

Also available in: Unified diff