summaryrefslogtreecommitdiff
path: root/usrp/host/include
diff options
context:
space:
mode:
authorttsou2009-09-14 00:08:02 -0400
committerttsou2009-09-16 17:08:52 -0400
commit0f03f1c1d460d865aeff91b9538266b0b210a357 (patch)
tree12d6281362c71538c6be8a1adc52774021e2af2f /usrp/host/include
parent2c30dff7d519987a0f239f29f09e340d203c0148 (diff)
downloadgnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.tar.gz
gnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.tar.bz2
gnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.zip
Combined additiona usrp_prims code
Diffstat (limited to 'usrp/host/include')
-rw-r--r--usrp/host/include/usrp/usrp_prims.h.in17
1 files changed, 10 insertions, 7 deletions
diff --git a/usrp/host/include/usrp/usrp_prims.h.in b/usrp/host/include/usrp/usrp_prims.h.in
index 69f41e57d..ae12bbe65 100644
--- a/usrp/host/include/usrp/usrp_prims.h.in
+++ b/usrp/host/include/usrp/usrp_prims.h.in
@@ -260,19 +260,22 @@ std::string usrp_serial_number(libusb_device_handle *udh);
* Internal functions
*/
-bool _usrp_configured_p (libusb_device *q);
-
libusb_device_handle *usrp_open_interface(libusb_device *dev,
int interface,
int altinterface);
-bool write_internal_ram (libusb_device_handle *udh, unsigned char *buf,
- int start_addr, size_t len);
-
int write_cmd (libusb_device_handle *udh, int request, int value,
int index, unsigned char *bytes, int len);
-bool usrp1_fpga_write (libusb_device_handle *udh, int regno, int value);
-bool usrp1_fpga_read (libusb_device_handle *udh, int regno, int *value);
+libusb_device_descriptor get_usb_device_descriptor (libusb_device *q);
+
+libusb_device *get_usb_device (libusb_device_handle *udh);
+
+int usb_control_transfer (struct usb_dev_handle *udh, int request_type,
+ int request, int value, int index,
+ unsigned char *data, int length,
+ unsigned int timeout);
+}
+
#endif /* _USRP_PRIMS_H_ */