summaryrefslogtreecommitdiff
path: root/usrp/host/include
diff options
context:
space:
mode:
Diffstat (limited to 'usrp/host/include')
-rw-r--r--usrp/host/include/usrp/usrp_basic.h12
-rw-r--r--usrp/host/include/usrp/usrp_prims.h96
2 files changed, 63 insertions, 45 deletions
diff --git a/usrp/host/include/usrp/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h
index 2430ff5c4..3ec734113 100644
--- a/usrp/host/include/usrp/usrp_basic.h
+++ b/usrp/host/include/usrp/usrp_basic.h
@@ -46,7 +46,15 @@
#include <boost/utility.hpp>
#include <usrp/usrp_subdev_spec.h>
+#if 1
+struct usb_dev_handle;
+struct usb_device;
+typedef struct usb_dev_handle libusb_device_handle;
+typedef struct usb_device libusb_device;
+#else
struct libusb_device_handle;
+#endif
+
class fusb_devhandle;
class fusb_ephandle;
@@ -65,7 +73,7 @@ protected:
void shutdown_daughterboards();
protected:
- struct libusb_device_handle *d_udh;
+ libusb_device_handle *d_udh;
struct libusb_context *d_ctx;
int d_usb_data_rate; // bytes/sec
int d_bytes_per_poll; // how often to poll for overruns
@@ -92,7 +100,7 @@ protected:
usrp_basic (int which_board,
- struct libusb_device_handle *open_interface (struct libusb_device *dev),
+ libusb_device_handle *open_interface (libusb_device *dev),
const std::string fpga_filename = "",
const std::string firmware_filename = "");
diff --git a/usrp/host/include/usrp/usrp_prims.h b/usrp/host/include/usrp/usrp_prims.h
index 05ad0046e..bd7779b64 100644
--- a/usrp/host/include/usrp/usrp_prims.h
+++ b/usrp/host/include/usrp/usrp_prims.h
@@ -41,8 +41,16 @@ static const int USRP_HASH_SIZE = 16;
enum usrp_load_status_t { ULS_ERROR = 0, ULS_OK, ULS_ALREADY_LOADED };
+#if 1
+struct usb_dev_handle;
+struct usb_device;
+typedef struct usb_dev_handle libusb_device_handle;
+typedef struct usb_device libusb_device;
+#else
struct libusb_device_handle;
struct libusb_device;
+#endif
+
struct libusb_context;
/*!
@@ -54,6 +62,8 @@ struct libusb_context;
*/
libusb_context* usrp_one_time_init (bool new_context);
+void usrp_one_time_init ();
+
/*
* force a rescan of the buses and devices
*/
@@ -69,18 +79,18 @@ 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, libusb_context *ctx = NULL);
+libusb_device *usrp_find_device (int nth, bool fx2_ok_p = false, libusb_context *ctx = NULL);
-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
-bool usrp_usrp1_p (struct libusb_device *q); //< is this a USRP Rev 1
-bool usrp_usrp2_p (struct libusb_device *q); //< is this a USRP Rev 2
-int usrp_hw_rev (struct libusb_device *q); //< return h/w rev code
+bool usrp_usrp_p (libusb_device *q); //< is this a USRP
+bool usrp_usrp0_p (libusb_device *q); //< is this a USRP Rev 0
+bool usrp_usrp1_p (libusb_device *q); //< is this a USRP Rev 1
+bool usrp_usrp2_p (libusb_device *q); //< is this a USRP Rev 2
+int usrp_hw_rev (libusb_device *q); //< return h/w rev code
-bool usrp_fx2_p (struct libusb_device *q); //< is this an unconfigured Cypress FX2
+bool usrp_fx2_p (libusb_device *q); //< is this an unconfigured Cypress FX2
-bool usrp_unconfigured_usrp_p (struct libusb_device *q); //< some kind of unconfigured USRP
-bool usrp_configured_usrp_p (struct libusb_device *q); //< some kind of configured USRP
+bool usrp_unconfigured_usrp_p (libusb_device *q); //< some kind of unconfigured USRP
+bool usrp_configured_usrp_p (libusb_device *q); //< some kind of configured USRP
/*!
* \brief given a libusb_device return an instance of the appropriate libusb_device_handle
@@ -91,14 +101,14 @@ bool usrp_configured_usrp_p (struct libusb_device *q); //< some kind of configur
* If interface can't be opened, or is already claimed by some other
* process, 0 is returned.
*/
-struct libusb_device_handle *usrp_open_cmd_interface (struct libusb_device *dev);
-struct libusb_device_handle *usrp_open_rx_interface (struct libusb_device *dev);
-struct libusb_device_handle *usrp_open_tx_interface (struct libusb_device *dev);
+libusb_device_handle *usrp_open_cmd_interface (libusb_device *dev);
+libusb_device_handle *usrp_open_rx_interface (libusb_device *dev);
+libusb_device_handle *usrp_open_tx_interface (libusb_device *dev);
/*!
* \brief close interface.
*/
-bool usrp_close_interface (struct libusb_device_handle *udh);
+bool usrp_close_interface (libusb_device_handle *udh);
/*!
* \brief load intel hex format file into USRP/Cypress FX2 (8051).
@@ -110,7 +120,7 @@ bool usrp_close_interface (struct libusb_device_handle *udh);
*/
usrp_load_status_t
-usrp_load_firmware (struct libusb_device_handle *udh, const char *filename, bool force);
+usrp_load_firmware (libusb_device_handle *udh, const char *filename, bool force);
/*!
* \brief load intel hex format file into USRP FX2 (8051).
@@ -123,13 +133,13 @@ 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, libusb_context *ctx);
+usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_context *ctx = NULL);
/*!
* \brief load fpga configuration bitstream
*/
usrp_load_status_t
-usrp_load_fpga (struct libusb_device_handle *udh, const char *filename, bool force);
+usrp_load_fpga (libusb_device_handle *udh, const char *filename, bool force);
/*!
* \brief load the regular firmware and fpga bitstream in the Nth USRP.
@@ -145,54 +155,54 @@ bool usrp_load_standard_bits (int nth, bool force,
* \brief copy the given \p hash into the USRP hash slot \p which.
* The usrp implements two hash slots, 0 and 1.
*/
-bool usrp_set_hash (struct libusb_device_handle *udh, int which,
+bool usrp_set_hash (libusb_device_handle *udh, int which,
const unsigned char hash[USRP_HASH_SIZE]);
/*!
* \brief retrieve the \p hash from the USRP hash slot \p which.
* The usrp implements two hash slots, 0 and 1.
*/
-bool usrp_get_hash (struct libusb_device_handle *udh, int which,
+bool usrp_get_hash (libusb_device_handle *udh, int which,
unsigned char hash[USRP_HASH_SIZE]);
-bool usrp_write_fpga_reg (struct libusb_device_handle *udh, int reg, int value);
-bool usrp_read_fpga_reg (struct libusb_device_handle *udh, int reg, int *value);
-bool usrp_set_fpga_reset (struct libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_enable (struct libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_enable (struct libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_reset (struct libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_reset (struct libusb_device_handle *udh, bool on);
-bool usrp_set_led (struct libusb_device_handle *udh, int which, bool on);
+bool usrp_write_fpga_reg (libusb_device_handle *udh, int reg, int value);
+bool usrp_read_fpga_reg (libusb_device_handle *udh, int reg, int *value);
+bool usrp_set_fpga_reset (libusb_device_handle *udh, bool on);
+bool usrp_set_fpga_tx_enable (libusb_device_handle *udh, bool on);
+bool usrp_set_fpga_rx_enable (libusb_device_handle *udh, bool on);
+bool usrp_set_fpga_tx_reset (libusb_device_handle *udh, bool on);
+bool usrp_set_fpga_rx_reset (libusb_device_handle *udh, bool on);
+bool usrp_set_led (libusb_device_handle *udh, int which, bool on);
-bool usrp_check_rx_overrun (struct libusb_device_handle *udh, bool *overrun_p);
-bool usrp_check_tx_underrun (struct libusb_device_handle *udh, bool *underrun_p);
+bool usrp_check_rx_overrun (libusb_device_handle *udh, bool *overrun_p);
+bool usrp_check_tx_underrun (libusb_device_handle *udh, bool *underrun_p);
// i2c_read and i2c_write are limited to a maximum len of 64 bytes.
-bool usrp_i2c_write (struct libusb_device_handle *udh, int i2c_addr,
+bool usrp_i2c_write (libusb_device_handle *udh, int i2c_addr,
const void *buf, int len);
-bool usrp_i2c_read (struct libusb_device_handle *udh, int i2c_addr,
+bool usrp_i2c_read (libusb_device_handle *udh, int i2c_addr,
void *buf, int len);
// spi_read and spi_write are limited to a maximum of 64 bytes
// See usrp_spi_defs.h for more info
-bool usrp_spi_write (struct libusb_device_handle *udh,
+bool usrp_spi_write (libusb_device_handle *udh,
int optional_header, int enables, int format,
const void *buf, int len);
-bool usrp_spi_read (struct libusb_device_handle *udh,
+bool usrp_spi_read (libusb_device_handle *udh,
int optional_header, int enables, int format,
void *buf, int len);
-bool usrp_9862_write (struct libusb_device_handle *udh,
+bool usrp_9862_write (libusb_device_handle *udh,
int which_codec, // [0, 1]
int regno, // [0, 63]
int value); // [0, 255]
-bool usrp_9862_read (struct libusb_device_handle *udh,
+bool usrp_9862_read (libusb_device_handle *udh,
int which_codec, // [0, 1]
int regno, // [0, 63]
unsigned char *value); // [0, 255]
@@ -203,28 +213,28 @@ bool usrp_9862_read (struct libusb_device_handle *udh,
* \p buf contains alternating register_number, register_value pairs.
* \p len must be even and is the length of buf in bytes.
*/
-bool usrp_9862_write_many (struct libusb_device_handle *udh, int which_codec,
+bool usrp_9862_write_many (libusb_device_handle *udh, int which_codec,
const unsigned char *buf, int len);
/*!
* \brief write specified regs to all 9862's in the system
*/
-bool usrp_9862_write_many_all (struct libusb_device_handle *udh,
+bool usrp_9862_write_many_all (libusb_device_handle *udh,
const unsigned char *buf, int len);
// Write 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
// Which EEPROM is determined by i2c_addr. See i2c_addr.h
-bool usrp_eeprom_write (struct libusb_device_handle *udh, int i2c_addr,
+bool usrp_eeprom_write (libusb_device_handle *udh, int i2c_addr,
int eeprom_offset, const void *buf, int len);
// Read 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
// Which EEPROM is determined by i2c_addr. See i2c_addr.h
-bool usrp_eeprom_read (struct libusb_device_handle *udh, int i2c_addr,
+bool usrp_eeprom_read (libusb_device_handle *udh, int i2c_addr,
int eeprom_offset, void *buf, int len);
@@ -246,7 +256,7 @@ bool usrp_eeprom_read (struct libusb_device_handle *udh, int i2c_addr,
* binary values. Although dacs 0, 1 and 2 are 8-bit and dac 3 is 12-bit,
* the interface is in terms of 12-bit values [0,4095]
*/
-bool usrp_write_aux_dac (struct libusb_device_handle *uhd, int slot,
+bool usrp_write_aux_dac (libusb_device_handle *uhd, int slot,
int which_dac, int value);
/*!
@@ -256,7 +266,7 @@ bool usrp_write_aux_dac (struct libusb_device_handle *uhd, int slot,
* \p which_adc: [0,1] which of the two adcs to read
* \p *value: return value, 12-bit straight binary.
*/
-bool usrp_read_aux_adc (struct libusb_device_handle *udh, int slot,
+bool usrp_read_aux_adc (libusb_device_handle *udh, int slot,
int which_adc, int *value);
@@ -279,13 +289,13 @@ struct usrp_dboard_eeprom {
* \brief Read and return parsed daughterboard eeprom
*/
usrp_dbeeprom_status_t
-usrp_read_dboard_eeprom (struct libusb_device_handle *udh,
+usrp_read_dboard_eeprom (libusb_device_handle *udh,
int slot_id, usrp_dboard_eeprom *eeprom);
/*!
* \brief write ADC/DAC offset calibration constants to d'board eeprom
*/
-bool usrp_write_dboard_offsets (struct libusb_device_handle *udh, int slot_id,
+bool usrp_write_dboard_offsets (libusb_device_handle *udh, int slot_id,
short offset0, short offset1);
/*!
@@ -294,6 +304,6 @@ bool usrp_write_dboard_offsets (struct libusb_device_handle *udh, int slot_id,
* Note that this only works on a configured usrp.
* \returns non-zero length string iff successful.
*/
-std::string usrp_serial_number(struct libusb_device_handle *udh);
+std::string usrp_serial_number(libusb_device_handle *udh);
#endif /* _USRP_PRIMS_H_ */
generated by cgit (git 2.34.1) at 2024-12-20 22:01:05 +0000