From 0f03f1c1d460d865aeff91b9538266b0b210a357 Mon Sep 17 00:00:00 2001
From: ttsou
Date: Mon, 14 Sep 2009 00:08:02 -0400
Subject: Combined additiona usrp_prims code

---
 usrp/host/include/usrp/usrp_prims.h.in | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'usrp/host/include')

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_ */
-- 
cgit