Merge branch 'develop' into feature-43-doxygen

This commit is contained in:
Rohit Gupta
2016-02-02 13:06:31 +01:00
56 changed files with 4559 additions and 2342 deletions
@@ -570,6 +570,7 @@ int openair0_dev_init_usrp(openair0_device* device, openair0_config_t *openair0_
} else {
printf("Found USRP B200");
args += ",num_recv_frames=256" ;
s->usrp = uhd::usrp::multi_usrp::make(args);
// s->usrp->set_rx_subdev_spec(rx_subdev);