sdr
/
libusrp
mirror of https://gerrit.osmocom.org/libusrp
8
0
Fork 0
Code Releases Activity

Modify apps and swig to reflect libusb_context use

This commit is contained in:
ttsou 2009-08-26 10:46:56 -04:00
parent 14d375c3c5
commit b9a28b9e3e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
host/apps/usrper.cc
View File

@ -191,10 +191,10 @@ main (int argc, char **argv)
const char *cmd = argv[optind++];
nopts--;
usrp_one_time_init ();
libusb_context *ctx = usrp_one_time_init (true);
struct libusb_device *udev = usrp_find_device (which_board, fx2_ok_p);
struct libusb_device *udev = usrp_find_device (which_board, fx2_ok_p, ctx);
if (udev == 0){
fprintf (stderr, "%s: failed to find usrp[%d]\n", prog_name, which_board);
exit (1);

6
host/swig/usrp_prims.i
View File

@ -49,7 +49,7 @@ struct libusb_device;
* \brief initialize libusb; probe busses and devices.
* Safe to call more than once.
*/
void usrp_one_time_init ();
struct libusb_context *usrp_one_time_init (bool new_context);
void usrp_rescan ();
@ -63,7 +63,7 @@ void usrp_rescan ();
* configured USRP (firmware loaded)
* unconfigured Cypress FX2 (only if fx2_ok_p is true)
*/
struct libusb_device *usrp_find_device (int nth, bool fx2_ok_p = false);
struct libusb_device *usrp_find_device (int nth, bool fx2_ok_p = false, struct libusb_context *ctx);
bool usrp_usrp_p (struct libusb_device *q); //< is this a USRP
bool usrp_usrp0_p (struct libusb_device *q); //< is this a USRP Rev 0
@ -116,7 +116,7 @@ usrp_load_firmware (struct libusb_device_handle *udh, const char *filename, bool
* then rescans the busses and devices.
*/
usrp_load_status_t
usrp_load_firmware_nth (int nth, const char *filename, bool force);
usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_context *ctx);
/*!
* \brief load fpga configuration bitstream