osmocom-sdr

osmocom-sdr@lists.osmocom.org

916 discussions

[PATCH] rtl-sdr/lib: normalize error return values
by Karl Semich 23 Sep '18

23 Sep '18

All library functions updated to return error codes with consistent value and meaning, selected from nine comprehensive conditions inferred from context. Bitwise combinations of return values changed to conditionals, to preserve meaning. --- include/rtl-sdr.h | 20 ++- include/tuner_fc2580.h | 23 +-- src/librtlsdr.c | 374 +++++++++++++++++++++++++---------------- src/tuner_e4k.c | 65 ++++---- src/tuner_fc0012.c | 24 ++- src/tuner_fc0013.c | 47 ++++-- src/tuner_fc2580.c | 445 ++++++++++++++++++++++++++++++------------------- src/tuner_r82xx.c | 29 ++-- 8 files changed, 626 insertions(+), 401 deletions(-) diff --git a/include/rtl-sdr.h b/include/rtl-sdr.h index 3ed13ae..52d67e6 100644 --- a/include/rtl-sdr.h +++ b/include/rtl-sdr.h @@ -24,6 +24,7 @@ extern "C" { #endif +#include <errno.h> #include <stdint.h> #include <rtl-sdr_export.h> @@ -34,6 +35,23 @@ RTLSDR_API uint32_t rtlsdr_get_device_count(void); RTLSDR_API const char* rtlsdr_get_device_name(uint32_t index); /*! + * Error codes. Most functions return 0 on success or one of these + * codes on failure. + */ +enum rtlsdr_error { + RTLSDR_SUCCESS = 0, /* Success (no error) */ + RTLSDR_ERROR_NULL = -1, /* Passed handle is null pointer */ + RTLSDR_ERROR_INVALID = -EINVAL, /* Invalid argument provided */ + RTLSDR_ERROR_NOTFOUND = -3, /* Device was not found */ + RTLSDR_ERROR_SHORT = -4, /* Less data transferred than requested */ + RTLSDR_ERROR_NOOP = -5, /* No action to take */ + RTLSDR_ERROR_DEVTYPE = -6, /* Function not available for device */ + RTLSDR_ERROR_STATE = -7, /* Device in wrong state for call */ + RTLSDR_ERROR_NOMEM = -8, /* Memory allocation failed */ + RTLSDR_ERROR_USB = -9 /* Error returned by libusb */ +}; + +/*! * Get USB device strings. * * NOTE: The string arguments must provide space for up to 256 bytes. @@ -261,7 +279,7 @@ RTLSDR_API int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int manual); * 225001 - 300000 Hz * 900001 - 3200000 Hz * sample loss is to be expected for rates > 2400000 - * \return 0 on success, -EINVAL on invalid rate + * \return 0 on success, RTLSDR_ERROR_INVALID on invalid rate */ RTLSDR_API int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t rate); diff --git a/include/tuner_fc2580.h b/include/tuner_fc2580.h index 9ebd935..72e9393 100644 --- a/include/tuner_fc2580.h +++ b/include/tuner_fc2580.h @@ -1,6 +1,8 @@ #ifndef __TUNER_FC2580_H #define __TUNER_FC2580_H +#include "rtl-sdr.h" + #define BORDER_FREQ 2600000 //2.6GHz : The border frequency which determines whether Low VCO or High VCO is used #define USE_EXT_CLK 0 //0 : Use internal XTAL Oscillator / 1 : Use External Clock input #define OFS_RSSI 57 @@ -16,21 +18,10 @@ typedef enum { FC2580_NO_BAND } fc2580_band_type; -typedef enum { - FC2580_FCI_FAIL, - FC2580_FCI_SUCCESS -} fc2580_fci_result_type; - -enum FUNCTION_STATUS -{ - FUNCTION_SUCCESS, - FUNCTION_ERROR, -}; - extern void fc2580_wait_msec(void *pTuner, int a); -fc2580_fci_result_type fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val); -fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data); +enum rtlsdr_error fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val); +enum rtlsdr_error fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data); /*============================================================================== fc2580 initial setting @@ -47,7 +38,7 @@ fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned 2 : Voltage Control Mode ==============================================================================*/ -fc2580_fci_result_type fc2580_set_init(void *pTuner, int ifagc_mode, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_init(void *pTuner, int ifagc_mode, unsigned int freq_xtal ); /*============================================================================== fc2580 frequency setting @@ -63,7 +54,7 @@ fc2580_fci_result_type fc2580_set_init(void *pTuner, int ifagc_mode, unsigned in ex) 2.6GHz = 2600000 ==============================================================================*/ -fc2580_fci_result_type fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned int freq_xtal ); /*============================================================================== @@ -83,7 +74,7 @@ fc2580_fci_result_type fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned ==============================================================================*/ -fc2580_fci_result_type fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ); // The following context is FC2580 tuner API source code // Definitions diff --git a/src/librtlsdr.c b/src/librtlsdr.c index 433ed5b..b83c54d 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -125,6 +125,7 @@ struct rtlsdr_dev { int dev_lost; int driver_active; unsigned int xfer_errors; + int libusb_err; }; void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val); @@ -164,16 +165,16 @@ int e4000_set_gain(void *dev, int gain) { #if 0 int enhgain = (gain - 420); #endif - if(e4k_set_lna_gain(&devt->e4k_s, min(300, gain - mixgain * 10)) == -EINVAL) - return -1; - if(e4k_mixer_gain_set(&devt->e4k_s, mixgain) == -EINVAL) - return -1; + if(e4k_set_lna_gain(&devt->e4k_s, min(300, gain - mixgain * 10)) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; + if(e4k_mixer_gain_set(&devt->e4k_s, mixgain) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; #if 0 /* enhanced mixer gain seems to have no effect */ if(enhgain >= 0) - if(e4k_set_enh_gain(&devt->e4k_s, enhgain) == -EINVAL) - return -1; + if(e4k_set_enh_gain(&devt->e4k_s, enhgain) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; #endif - return 0; + return RTLSDR_SUCCESS; } int e4000_set_if_gain(void *dev, int stage, int gain) { rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev; @@ -416,7 +417,12 @@ int rtlsdr_read_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t * if (r < 0) fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); #endif - return r; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return r; + } } int rtlsdr_write_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t *array, uint8_t len) @@ -429,7 +435,12 @@ int rtlsdr_write_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t if (r < 0) fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); #endif - return r; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return r; + } } int rtlsdr_i2c_write_reg(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t reg, uint8_t val) @@ -458,7 +469,7 @@ int rtlsdr_i2c_write(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int l uint16_t addr = i2c_addr; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_write_array(dev, IICB, addr, buffer, len); } @@ -468,12 +479,12 @@ int rtlsdr_i2c_read(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int le uint16_t addr = i2c_addr; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_read_array(dev, IICB, addr, buffer, len); } -uint16_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t len) +int32_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t len) { int r; unsigned char data[2]; @@ -482,8 +493,11 @@ uint16_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_ r = libusb_control_transfer(dev->devh, CTRL_IN, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { + dev->libusb_err = r; fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + return RTLSDR_ERROR_USB; + } reg = (data[1] << 8) | data[0]; @@ -506,13 +520,16 @@ int rtlsdr_write_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint16_t v r = libusb_control_transfer(dev->devh, CTRL_OUT, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); - - return r; + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return RTLSDR_SUCCESS; + } } -uint16_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint8_t len) +int32_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint8_t len) { int r; unsigned char data[2]; @@ -523,8 +540,11 @@ uint16_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, u r = libusb_control_transfer(dev->devh, CTRL_IN, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } reg = (data[1] << 8) | data[0]; @@ -547,12 +567,15 @@ int rtlsdr_demod_write_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint1 r = libusb_control_transfer(dev->devh, CTRL_OUT, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } rtlsdr_demod_read_reg(dev, 0x0a, 0x01, 1); - return (r == len) ? 0 : -1; + return (r == len) ? RTLSDR_SUCCESS : RTLSDR_ERROR_SHORT; } void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val) @@ -590,7 +613,7 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) for (i = 0; i < 8; ++i) { const int val = dev->fir[i]; if (val < -128 || val > 127) { - return -1; + return RTLSDR_ERROR_INVALID; } fir[i] = val; } @@ -599,7 +622,7 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) const int val0 = dev->fir[8+i]; const int val1 = dev->fir[8+i+1]; if (val0 < -2048 || val0 > 2047 || val1 < -2048 || val1 > 2047) { - return -1; + return RTLSDR_ERROR_INVALID; } fir[8+i*3/2] = val0 >> 4; fir[8+i*3/2+1] = (val0 << 4) | ((val1 >> 8) & 0x0f); @@ -607,11 +630,10 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) } for (i = 0; i < (int)sizeof(fir); i++) { - if (rtlsdr_demod_write_reg(dev, 1, 0x1c + i, fir[i], 1)) - return -1; + return rtlsdr_demod_write_reg(dev, 1, 0x1c + i, fir[i], 1); } - return 0; + return RTLSDR_SUCCESS; } void rtlsdr_init_baseband(rtlsdr_dev_t *dev) @@ -673,7 +695,7 @@ int rtlsdr_deinit_baseband(rtlsdr_dev_t *dev) int r = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner && dev->tuner->exit) { rtlsdr_set_i2c_repeater(dev, 1); @@ -693,57 +715,67 @@ static int rtlsdr_set_if_freq(rtlsdr_dev_t *dev, uint32_t freq) int32_t if_freq; uint8_t tmp; int r; + int rfin; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* read corrected clock value */ - if (rtlsdr_get_xtal_freq(dev, &rtl_xtal, NULL)) - return -2; + r = rtlsdr_get_xtal_freq(dev, &rtl_xtal, NULL); + if (r < 0) + return r; if_freq = ((freq * TWO_POW(22)) / rtl_xtal) * (-1); tmp = (if_freq >> 16) & 0x3f; - r = rtlsdr_demod_write_reg(dev, 1, 0x19, tmp, 1); + rfin = rtlsdr_demod_write_reg(dev, 1, 0x19, tmp, 1); tmp = (if_freq >> 8) & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x1a, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x1a, tmp, 1); + if (r) rfin = r; tmp = if_freq & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x1b, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x1b, tmp, 1); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_set_sample_freq_correction(rtlsdr_dev_t *dev, int ppm) { - int r = 0; + int r; + int rfin = 0; uint8_t tmp; int16_t offs = ppm * (-1) * TWO_POW(24) / 1000000; tmp = offs & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x3f, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x3f, tmp, 1); + if (r) rfin = r; tmp = (offs >> 8) & 0x3f; - r |= rtlsdr_demod_write_reg(dev, 1, 0x3e, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x3e, tmp, 1); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq, uint32_t tuner_freq) { - int r = 0; + int rfin = 0; + int r; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (rtl_freq > 0 && (rtl_freq < MIN_RTL_XTAL_FREQ || rtl_freq > MAX_RTL_XTAL_FREQ)) - return -2; + return RTLSDR_ERROR_INVALID; if (rtl_freq > 0 && dev->rtl_xtal != rtl_freq) { dev->rtl_xtal = rtl_freq; /* update xtal-dependent settings */ - if (dev->rate) + if (dev->rate) { r = rtlsdr_set_sample_rate(dev, dev->rate); + if (r) rfin = r; + } } if (dev->tun_xtal != tuner_freq) { @@ -753,22 +785,26 @@ int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq, uint32_t tuner_fr dev->tun_xtal = tuner_freq; /* read corrected clock value into e4k and r82xx structure */ - if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) || - rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal)) - return -3; + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc); + if (r == RTLSDR_SUCCESS) + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal); + if (r != RTLSDR_SUCCESS) + return r; /* update xtal-dependent settings */ - if (dev->freq) + if (dev->freq) { r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } } - return r; + return rfin; } int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq, uint32_t *tuner_freq) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; #define APPLY_PPM_CORR(val,ppm) (((val) * (1.0 + (ppm) / 1e6))) @@ -778,7 +814,7 @@ int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq, uint32_t *tuner_ if (tuner_freq) *tuner_freq = (uint32_t) APPLY_PPM_CORR(dev->tun_xtal, dev->corr); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, @@ -790,13 +826,15 @@ int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, int r = 0; if (!dev || !dev->devh) - return -1; + return RTLSDR_ERROR_NULL; device = libusb_get_device(dev->devh); r = libusb_get_device_descriptor(device, &dd); - if (r < 0) - return -1; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } if (manufact) { memset(manufact, 0, buf_max); @@ -819,7 +857,7 @@ int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, buf_max); } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_t len) @@ -829,10 +867,10 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 uint8_t cmd[2]; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((len + offset) > 256) - return -2; + return RTLSDR_ERROR_INVALID; for (i = 0; i < len; i++) { cmd[0] = i + offset; @@ -846,7 +884,7 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 cmd[1] = data[i]; r = rtlsdr_write_array(dev, IICB, EEPROM_ADDR, cmd, 2); if (r != sizeof(cmd)) - return -3; + return r < 0 ? r : RTLSDR_ERROR_SHORT; /* for some EEPROMs (e.g. ATC 240LC02) we need a delay * between write operations, otherwise they will fail */ @@ -857,7 +895,7 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 #endif } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_t len) @@ -866,20 +904,20 @@ int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_ int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((len + offset) > 256) - return -2; + return RTLSDR_ERROR_INVALID; r = rtlsdr_write_array(dev, IICB, EEPROM_ADDR, &offset, 1); if (r < 0) - return -3; + return r; for (i = 0; i < len; i++) { r = rtlsdr_read_array(dev, IICB, EEPROM_ADDR, data + i, 1); if (r < 0) - return -3; + return r; } return r; @@ -887,10 +925,10 @@ int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_ int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq) { - int r = -1; + int r; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->direct_sampling) { r = rtlsdr_set_if_freq(dev, freq); @@ -898,6 +936,8 @@ int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq) rtlsdr_set_i2c_repeater(dev, 1); r = dev->tuner->set_freq(dev, freq - dev->offs_freq); rtlsdr_set_i2c_repeater(dev, 0); + } else { + r = RTLSDR_ERROR_DEVTYPE; } if (!r) @@ -918,27 +958,33 @@ uint32_t rtlsdr_get_center_freq(rtlsdr_dev_t *dev) int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm) { - int r = 0; + int r; + int rfin; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->corr == ppm) - return -2; + return RTLSDR_ERROR_NOOP; dev->corr = ppm; - r |= rtlsdr_set_sample_freq_correction(dev, ppm); + rfin = rtlsdr_set_sample_freq_correction(dev, ppm); /* read corrected clock value into e4k and r82xx structure */ - if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) || - rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal)) - return -3; + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc); + if (r == RTLSDR_SUCCESS) + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal); + if (r != RTLSDR_SUCCESS) + return r; - if (dev->freq) /* retune to apply new correction value */ - r |= rtlsdr_set_center_freq(dev, dev->freq); + if (dev->freq) { + /* retune to apply new correction value */ + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } - return r; + return rfin; } int rtlsdr_get_freq_correction(rtlsdr_dev_t *dev) @@ -977,7 +1023,7 @@ int rtlsdr_get_tuner_gains(rtlsdr_dev_t *dev, int *gains) int len = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; switch (dev->tuner_type) { case RTLSDR_TUNER_E4000: @@ -1016,7 +1062,7 @@ int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_bw) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1034,7 +1080,7 @@ int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_gain) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1063,7 +1109,7 @@ int rtlsdr_set_tuner_if_gain(rtlsdr_dev_t *dev, int stage, int gain) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_if_gain) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1079,7 +1125,7 @@ int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int mode) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_gain_mode) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1092,19 +1138,20 @@ int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int mode) int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate) { - int r = 0; + int r; + int rfin = 0; uint16_t tmp; uint32_t rsamp_ratio, real_rsamp_ratio; double real_rate; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* check if the rate is supported by the resampler */ if ((samp_rate <= 225000) || (samp_rate > 3200000) || ((samp_rate > 300000) && (samp_rate <= 900000))) { fprintf(stderr, "Invalid sample rate: %u Hz\n", samp_rate); - return -EINVAL; + return RTLSDR_ERROR_INVALID; } rsamp_ratio = (dev->rtl_xtal * TWO_POW(22)) / samp_rate; @@ -1125,21 +1172,26 @@ int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate) } tmp = (rsamp_ratio >> 16); - r |= rtlsdr_demod_write_reg(dev, 1, 0x9f, tmp, 2); + r = rtlsdr_demod_write_reg(dev, 1, 0x9f, tmp, 2); + if (r) rfin = r; tmp = rsamp_ratio & 0xffff; - r |= rtlsdr_demod_write_reg(dev, 1, 0xa1, tmp, 2); + r = rtlsdr_demod_write_reg(dev, 1, 0xa1, tmp, 2); + if (r) rfin = r; - r |= rtlsdr_set_sample_freq_correction(dev, dev->corr); + r = rtlsdr_set_sample_freq_correction(dev, dev->corr); + if (r) rfin = r; /* reset demod (bit 3, soft_rst) */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x01, 0x14, 1); - r |= rtlsdr_demod_write_reg(dev, 1, 0x01, 0x10, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x01, 0x14, 1); + if (r) rfin = r; + r = rtlsdr_demod_write_reg(dev, 1, 0x01, 0x10, 1); + if (r) rfin = r; /* recalculate offset frequency if offset tuning is enabled */ if (dev->offs_freq) rtlsdr_set_offset_tuning(dev, 1); - return r; + return rfin; } uint32_t rtlsdr_get_sample_rate(rtlsdr_dev_t *dev) @@ -1153,7 +1205,7 @@ uint32_t rtlsdr_get_sample_rate(rtlsdr_dev_t *dev) int rtlsdr_set_testmode(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_demod_write_reg(dev, 0, 0x19, on ? 0x03 : 0x05, 1); } @@ -1161,17 +1213,18 @@ int rtlsdr_set_testmode(rtlsdr_dev_t *dev, int on) int rtlsdr_set_agc_mode(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_demod_write_reg(dev, 0, 0x19, on ? 0x25 : 0x05, 1); } int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on) { - int r = 0; + int r; + int rfin = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (on) { if (dev->tuner && dev->tuner->exit) { @@ -1181,80 +1234,93 @@ int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on) } /* disable Zero-IF mode */ - r |= rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1a, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1a, 1); + if (r) rfin = r; /* disable spectrum inversion */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x15, 0x00, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x15, 0x00, 1); + if (r) rfin = r; /* only enable In-phase ADC input */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x08, 0x4d, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x08, 0x4d, 1); + if (r) rfin = r; /* swap I and Q ADC, this allows to select between two inputs */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x06, (on > 1) ? 0x90 : 0x80, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x06, (on > 1) ? 0x90 : 0x80, 1); + if (r) rfin = r; fprintf(stderr, "Enabled direct sampling mode, input %i\n", on); dev->direct_sampling = on; } else { if (dev->tuner && dev->tuner->init) { rtlsdr_set_i2c_repeater(dev, 1); - r |= dev->tuner->init(dev); + r = dev->tuner->init(dev); + if (r) rfin = r; rtlsdr_set_i2c_repeater(dev, 0); } if ((dev->tuner_type == RTLSDR_TUNER_R820T) || (dev->tuner_type == RTLSDR_TUNER_R828D)) { - r |= rtlsdr_set_if_freq(dev, R82XX_IF_FREQ); + r = rtlsdr_set_if_freq(dev, R82XX_IF_FREQ); + if (r) rfin = r; /* enable spectrum inversion */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x15, 0x01, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x15, 0x01, 1); + if (r) rfin = r; } else { - r |= rtlsdr_set_if_freq(dev, 0); + r = rtlsdr_set_if_freq(dev, 0); + if (r) rfin = r; /* enable In-phase + Quadrature ADC input */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x08, 0xcd, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x08, 0xcd, 1); + if (r) rfin = r; /* Enable Zero-IF mode */ - r |= rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1b, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1b, 1); + if (r) rfin = r; } /* opt_adc_iq = 0, default ADC_I/ADC_Q datapath */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x06, 0x80, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x06, 0x80, 1); + if (r) rfin = r; fprintf(stderr, "Disabled direct sampling mode\n"); dev->direct_sampling = 0; } - r |= rtlsdr_set_center_freq(dev, dev->freq); + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_get_direct_sampling(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return dev->direct_sampling; } int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on) { - int r = 0; + int r; + int rfin = 0; int bw; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((dev->tuner_type == RTLSDR_TUNER_R820T) || (dev->tuner_type == RTLSDR_TUNER_R828D)) - return -2; + return RTLSDR_ERROR_DEVTYPE; if (dev->direct_sampling) - return -3; + return RTLSDR_ERROR_STATE; /* based on keenerds 1/f noise measurements */ dev->offs_freq = on ? ((dev->rate / 2) * 170 / 100) : 0; - r |= rtlsdr_set_if_freq(dev, dev->offs_freq); + rfin = rtlsdr_set_if_freq(dev, dev->offs_freq); if (dev->tuner && dev->tuner->set_bw) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1269,16 +1335,18 @@ int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on) rtlsdr_set_i2c_repeater(dev, 0); } - if (dev->freq > dev->offs_freq) - r |= rtlsdr_set_center_freq(dev, dev->freq); + if (dev->freq > dev->offs_freq) { + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } - return r; + return rfin; } int rtlsdr_get_offset_tuning(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return (dev->offs_freq) ? 1 : 0; } @@ -1369,7 +1437,7 @@ const char *rtlsdr_get_device_name(uint32_t index) int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact, char *product, char *serial) { - int r = -2; + int r; int i; libusb_context *ctx; libusb_device **list; @@ -1381,7 +1449,7 @@ int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact, r = libusb_init(&ctx); if(r < 0) - return r; + return RTLSDR_ERROR_USB; cnt = libusb_get_device_list(ctx, &list); @@ -1420,12 +1488,12 @@ int rtlsdr_get_index_by_serial(const char *serial) char str[256]; if (!serial) - return -1; + return RTLSDR_ERROR_NULL; cnt = rtlsdr_get_device_count(); if (!cnt) - return -2; + return RTLSDR_ERROR_NOTFOUND; for (i = 0; i < cnt; i++) { r = rtlsdr_get_device_usb_strings(i, NULL, NULL, str); @@ -1433,7 +1501,7 @@ int rtlsdr_get_index_by_serial(const char *serial) return i; } - return -3; + return RTLSDR_ERROR_NOTFOUND; } int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) @@ -1450,7 +1518,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) dev = malloc(sizeof(rtlsdr_dev_t)); if (NULL == dev) - return -ENOMEM; + return RTLSDR_ERROR_NOMEM; memset(dev, 0, sizeof(rtlsdr_dev_t)); memcpy(dev->fir, fir_default, sizeof(fir_default)); @@ -1458,7 +1526,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) r = libusb_init(&dev->ctx); if(r < 0){ free(dev); - return -1; + return RTLSDR_ERROR_USB; } dev->dev_lost = 1; @@ -1481,7 +1549,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) } if (!device) { - r = -1; + r = RTLSDR_ERROR_NOTFOUND; goto err; } @@ -1492,6 +1560,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) if(r == LIBUSB_ERROR_ACCESS) fprintf(stderr, "Please fix the device permissions, e.g. " "by installing the udev rules file rtl-sdr.rules\n"); + r = RTLSDR_ERROR_USB; goto err; } @@ -1505,6 +1574,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) fprintf(stderr, "Detached kernel driver\n"); } else { fprintf(stderr, "Detaching kernel driver failed!"); + r = RTLSDR_ERROR_USB; goto err; } #else @@ -1520,6 +1590,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) r = libusb_claim_interface(dev->devh, 0); if (r < 0) { fprintf(stderr, "usb_claim_interface error %d\n", r); + r = RTLSDR_ERROR_USB; goto err; } @@ -1625,7 +1696,7 @@ found: *out_dev = dev; - return 0; + return RTLSDR_SUCCESS; err: if (dev) { if (dev->ctx) @@ -1640,7 +1711,7 @@ err: int rtlsdr_close(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if(!dev->dev_lost) { /* block until all async operations have been completed (if any) */ @@ -1672,26 +1743,34 @@ int rtlsdr_close(rtlsdr_dev_t *dev) free(dev); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_reset_buffer(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; rtlsdr_write_reg(dev, USBB, USB_EPA_CTL, 0x1002, 2); rtlsdr_write_reg(dev, USBB, USB_EPA_CTL, 0x0000, 2); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_sync(rtlsdr_dev_t *dev, void *buf, int len, int *n_read) { + int r; + if (!dev) - return -1; + return RTLSDR_ERROR_NULL; - return libusb_bulk_transfer(dev->devh, 0x81, buf, len, n_read, BULK_TIMEOUT); + r = libusb_bulk_transfer(dev->devh, 0x81, buf, len, n_read, BULK_TIMEOUT); + if (r != 0) { + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; + } + + return r; } static void LIBUSB_CALL _libusb_callback(struct libusb_transfer *xfer) @@ -1732,7 +1811,7 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) unsigned int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (!dev->xfer) { dev->xfer = malloc(dev->xfer_buf_num * @@ -1743,7 +1822,7 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) } if (dev->xfer_buf) - return -2; + return RTLSDR_ERROR_STATE; dev->xfer_buf = malloc(dev->xfer_buf_num * sizeof(unsigned char *)); memset(dev->xfer_buf, 0, dev->xfer_buf_num * sizeof(unsigned char *)); @@ -1783,11 +1862,11 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) dev->xfer_buf[i] = malloc(dev->xfer_buf_len); if (!dev->xfer_buf[i]) - return -ENOMEM; + return RTLSDR_ERROR_NOMEM; } } - return 0; + return RTLSDR_SUCCESS; } static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) @@ -1795,7 +1874,7 @@ static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) unsigned int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->xfer) { for(i = 0; i < dev->xfer_buf_num; ++i) { @@ -1827,7 +1906,7 @@ static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) dev->xfer_buf = NULL; } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, @@ -1840,10 +1919,10 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, enum rtlsdr_async_status next_status = RTLSDR_INACTIVE; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (RTLSDR_INACTIVE != dev->async_status) - return -2; + return RTLSDR_ERROR_STATE; dev->async_status = RTLSDR_RUNNING; dev->async_cancel = 0; @@ -1882,6 +1961,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, "echo 0 > /sys/module/usbcore" "/parameters/usbfs_memory_mb\n", i); dev->async_status = RTLSDR_CANCELING; + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; break; } } @@ -1891,6 +1972,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, &dev->async_cancel); if (r < 0) { /*fprintf(stderr, "handle_events returned: %d\n", r);*/ + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; if (r == LIBUSB_ERROR_INTERRUPTED) /* stray signal */ continue; break; @@ -1914,8 +1997,11 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, * propagate */ libusb_handle_events_timeout_completed(dev->ctx, &zerotv, NULL); - if (r < 0) + if (r < 0) { + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; continue; + } next_status = RTLSDR_CANCELING; } @@ -1942,13 +2028,13 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, int rtlsdr_cancel_async(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* if streaming, try to cancel gracefully */ if (RTLSDR_RUNNING == dev->async_status) { dev->async_status = RTLSDR_CANCELING; dev->async_cancel = 1; - return 0; + return RTLSDR_SUCCESS; } /* if called while in pending state, change the state forcefully */ @@ -1958,7 +2044,7 @@ int rtlsdr_cancel_async(rtlsdr_dev_t *dev) return 0; } #endif - return -2; + return RTLSDR_ERROR_STATE; } uint32_t rtlsdr_get_tuner_clock(void *dev) @@ -1980,7 +2066,7 @@ int rtlsdr_i2c_write_fn(void *dev, uint8_t addr, uint8_t *buf, int len) if (dev) return rtlsdr_i2c_write(((rtlsdr_dev_t *)dev), addr, buf, len); - return -1; + return RTLSDR_ERROR_NULL; } int rtlsdr_i2c_read_fn(void *dev, uint8_t addr, uint8_t *buf, int len) @@ -1988,16 +2074,16 @@ int rtlsdr_i2c_read_fn(void *dev, uint8_t addr, uint8_t *buf, int len) if (dev) return rtlsdr_i2c_read(((rtlsdr_dev_t *)dev), addr, buf, len); - return -1; + return RTLSDR_ERROR_NULL; } int rtlsdr_set_bias_tee(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; rtlsdr_set_gpio_output(dev, 0); rtlsdr_set_gpio_bit(dev, 0, on); - return 0; + return RTLSDR_SUCCESS; } diff --git a/src/tuner_e4k.c b/src/tuner_e4k.c index 400e745..fc2c63b 100644 --- a/src/tuner_e4k.c +++ b/src/tuner_e4k.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdio.h> +#include <rtl-sdr.h> #include <reg_field.h> #include <tuner_e4k.h> #include <rtlsdr_i2c.h> @@ -70,7 +71,8 @@ static int e4k_reg_write(struct e4k_state *e4k, uint8_t reg, uint8_t val) data[1] = val; r = rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, data, 2); - return r == 2 ? 0 : -1; + if (r < 0) return r; + return r == 2 ? RTLSDR_SUCCESS : RTLSDR_ERROR_SHORT; } /*! \brief Read a register of the tuner chip @@ -81,12 +83,15 @@ static int e4k_reg_write(struct e4k_state *e4k, uint8_t reg, uint8_t val) static int e4k_reg_read(struct e4k_state *e4k, uint8_t reg) { uint8_t data = reg; + int r; - if (rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1) < 1) - return -1; + r = rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1); + if (r < 0) return r; + if (r < 1) return RTLSDR_ERROR_SHORT; - if (rtlsdr_i2c_read_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1) < 1) - return -1; + r = rtlsdr_i2c_read_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1); + if (r < 0) return r; + if (r < 1) return RTLSDR_ERROR_SHORT; return data; } @@ -104,7 +109,7 @@ static int e4k_reg_set_mask(struct e4k_state *e4k, uint8_t reg, uint8_t tmp = e4k_reg_read(e4k, reg); if ((tmp & mask) == val) - return 0; + return RTLSDR_SUCCESS; return e4k_reg_write(e4k, reg, (tmp & ~mask) | (val & mask)); } @@ -203,7 +208,7 @@ static int choose_rf_filter(enum e4k_band band, uint32_t freq) freq); break; default: - rc = -EINVAL; + rc = RTLSDR_ERROR_INVALID; break; } @@ -277,7 +282,7 @@ static const struct reg_field if_filter_fields[] = { static int find_if_bw(enum e4k_if_filter filter, uint32_t bw) { if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; return closest_arr_idx(if_filter_bw[filter], if_filter_bw_len[filter], bw); @@ -296,7 +301,7 @@ int e4k_if_filter_bw_set(struct e4k_state *e4k, enum e4k_if_filter filter, const struct reg_field *field; if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; bw_idx = find_if_bw(filter, bandwidth); @@ -323,7 +328,7 @@ int e4k_if_filter_bw_get(struct e4k_state *e4k, enum e4k_if_filter filter) const struct reg_field *field; if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; field = &if_filter_fields[filter]; @@ -443,7 +448,7 @@ static uint32_t compute_flo(uint32_t f_osc, uint8_t z, uint16_t x, uint8_t r) { uint64_t fvco = compute_fvco(f_osc, z, x); if (fvco == 0) - return -EINVAL; + return 0; return fvco / r; } @@ -579,7 +584,7 @@ int e4k_tune_freq(struct e4k_state *e4k, uint32_t freq) /* determine PLL parameters */ rc = e4k_compute_pll_params(&p, e4k->vco.fosc, freq); if (!rc) - return -EINVAL; + return RTLSDR_ERROR_INVALID; /* actually tune to those parameters */ rc = e4k_tune_params(e4k, &p); @@ -588,7 +593,7 @@ int e4k_tune_freq(struct e4k_state *e4k, uint32_t freq) rc = e4k_reg_read(e4k, E4K_REG_SYNTH1); if (!(rc & 0x01)) { fprintf(stderr, "[E4K] PLL not locked for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } return 0; @@ -672,7 +677,7 @@ int e4k_set_lna_gain(struct e4k_state *e4k, int32_t gain) return gain; } } - return -EINVAL; + return RTLSDR_ERROR_INVALID; } int e4k_set_enh_gain(struct e4k_state *e4k, int32_t gain) @@ -688,9 +693,9 @@ int e4k_set_enh_gain(struct e4k_state *e4k, int32_t gain) /* special case: 0 = off*/ if(0 == gain) - return 0; + return RTLSDR_SUCCESS; else - return -EINVAL; + return RTLSDR_ERROR_INVALID; } int e4k_enable_manual_gain(struct e4k_state *e4k, uint8_t manual) @@ -710,7 +715,7 @@ int e4k_enable_manual_gain(struct e4k_state *e4k, uint8_t manual) e4k_reg_set_mask(e4k, E4K_REG_AGC11, 0x7, 0); } - return 0; + return RTLSDR_SUCCESS; } static int find_stage_gain(uint8_t stage, int8_t val) @@ -719,7 +724,7 @@ static int find_stage_gain(uint8_t stage, int8_t val) int i; if (stage >= ARRAY_SIZE(if_stage_gain)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; arr = if_stage_gain[stage]; @@ -727,7 +732,7 @@ static int find_stage_gain(uint8_t stage, int8_t val) if (arr[i] == val) return i; } - return -EINVAL; + return RTLSDR_ERROR_INVALID; } /*! \brief Set the gain of one of the IF gain stages @@ -765,7 +770,7 @@ int e4k_mixer_gain_set(struct e4k_state *e4k, int8_t value) bit = 1; break; default: - return -EINVAL; + return RTLSDR_ERROR_INVALID; } return e4k_reg_set_mask(e4k, E4K_REG_GAIN2, 1, bit); @@ -774,9 +779,9 @@ int e4k_mixer_gain_set(struct e4k_state *e4k, int8_t value) int e4k_commonmode_set(struct e4k_state *e4k, int8_t value) { if(value < 0) - return -EINVAL; + return RTLSDR_ERROR_INVALID; else if(value > 7) - return -EINVAL; + return RTLSDR_ERROR_INVALID; return e4k_reg_set_mask(e4k, E4K_REG_DC7, 7, value); } @@ -789,13 +794,13 @@ int e4k_manual_dc_offset(struct e4k_state *e4k, int8_t iofs, int8_t irange, int8 int res; if((iofs < 0x00) || (iofs > 0x3f)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((irange < 0x00) || (irange > 0x03)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((qofs < 0x00) || (qofs > 0x3f)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((qrange < 0x00) || (qrange > 0x03)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; res = e4k_reg_set_mask(e4k, E4K_REG_DC2, 0x3f, iofs); if(res < 0) @@ -886,7 +891,7 @@ int e4k_dc_offset_gen_table(struct e4k_state *e4k) TO_LUT(offs_i, range_i)); } - return 0; + return RTLSDR_SUCCESS; } /*********************************************************************** @@ -899,7 +904,7 @@ int e4k_standby(struct e4k_state *e4k, int enable) e4k_reg_set_mask(e4k, E4K_REG_MASTER1, E4K_MASTER1_NORM_STBY, enable ? 0 : E4K_MASTER1_NORM_STBY); - return 0; + return RTLSDR_SUCCESS; } /*********************************************************************** @@ -916,7 +921,7 @@ static int magic_init(struct e4k_state *e4k) e4k_reg_write(e4k, 0x9f, 0x7f); e4k_reg_write(e4k, 0xa0, 0x07); - return 0; + return RTLSDR_SUCCESS; } /*! \brief Initialize the E4K tuner @@ -996,5 +1001,5 @@ int e4k_init(struct e4k_state *e4k) e4k_reg_set_mask(e4k, E4K_REG_DCTIME1, 0x03, 0); e4k_reg_set_mask(e4k, E4K_REG_DCTIME2, 0x03, 0); - return 0; + return RTLSDR_SUCCESS; } diff --git a/src/tuner_fc0012.c b/src/tuner_fc0012.c index 768cf1c..4378273 100644 --- a/src/tuner_fc0012.c +++ b/src/tuner_fc0012.c @@ -24,34 +24,40 @@ #include <stdint.h> #include <stdio.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc0012.h" static int fc0012_writereg(void *dev, uint8_t reg, uint8_t val) { + int r; uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, data, 2) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, data, 2); + if (r < 0) + return r; - return 0; + return RTLSDR_SUCCESS; } static int fc0012_readreg(void *dev, uint8_t reg, uint8_t *val) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(dev, FC0012_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_read_fn(dev, FC0012_I2C_ADDR, &data, 1); + if (r < 0) + return r; *val = data; - return 0; + return RTLSDR_SUCCESS; } /* Incomplete list of register settings: @@ -230,7 +236,7 @@ int fc0012_set_params(void *dev, uint32_t freq, uint32_t bandwidth) if ((reg[1] > 15) || (reg[2] < 0x0b)) { fprintf(stderr, "[FC0012] no valid PLL combination " "found for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } /* fix clock out */ diff --git a/src/tuner_fc0013.c b/src/tuner_fc0013.c index 78b696e..6df3afd 100644 --- a/src/tuner_fc0013.c +++ b/src/tuner_fc0013.c @@ -27,34 +27,40 @@ #include <stdint.h> #include <stdio.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc0013.h" static int fc0013_writereg(void *dev, uint8_t reg, uint8_t val) { + int r; uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, data, 2) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, data, 2); + if (r < 0) + return r; - return 0; + return RTLSDR_SUCCESS; } static int fc0013_readreg(void *dev, uint8_t reg, uint8_t *val) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(dev, FC0013_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_read_fn(dev, FC0013_I2C_ADDR, &data, 1); + if (r < 0) + return r; *val = data; - return 0; + return RTLSDR_SUCCESS; } int fc0013_init(void *dev) @@ -335,7 +341,7 @@ int fc0013_set_params(void *dev, uint32_t freq, uint32_t bandwidth) if ((reg[1] > 15) || (reg[2] < 0x0b)) { fprintf(stderr, "[FC0013] no valid PLL combination " "found for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } /* fix clock out */ @@ -428,22 +434,25 @@ exit: int fc0013_set_gain_mode(void *dev, int manual) { - int ret = 0; + int ret; + int fret = 0; uint8_t tmp = 0; - ret |= fc0013_readreg(dev, 0x0d, &tmp); + fret = fc0013_readreg(dev, 0x0d, &tmp); if (manual) tmp |= (1 << 3); else tmp &= ~(1 << 3); - ret |= fc0013_writereg(dev, 0x0d, tmp); + ret = fc0013_writereg(dev, 0x0d, tmp); + if (ret) fret = ret; /* set a fixed IF-gain for now */ - ret |= fc0013_writereg(dev, 0x13, 0x0a); + ret = fc0013_writereg(dev, 0x13, 0x0a); + if (ret) fret = ret; - return ret; + return fret; } int fc0013_lna_gains[] ={ @@ -477,11 +486,12 @@ int fc0013_lna_gains[] ={ int fc0013_set_lna_gain(void *dev, int gain) { - int ret = 0; + int ret; + int fret = 0; unsigned int i; uint8_t tmp = 0; - ret |= fc0013_readreg(dev, 0x14, &tmp); + fret = fc0013_readreg(dev, 0x14, &tmp); /* mask bits off */ tmp &= 0xe0; @@ -494,7 +504,8 @@ int fc0013_set_lna_gain(void *dev, int gain) } /* set gain */ - ret |= fc0013_writereg(dev, 0x14, tmp); + ret = fc0013_writereg(dev, 0x14, tmp); + if (ret) fret = ret; - return ret; + return fret; } diff --git a/src/tuner_fc2580.c b/src/tuner_fc2580.c index d2eeba5..9aa9ff7 100644 --- a/src/tuner_fc2580.c +++ b/src/tuner_fc2580.c @@ -8,6 +8,7 @@ #include <stdint.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc2580.h" @@ -16,32 +17,32 @@ /* glue functions to rtl-sdr code */ -fc2580_fci_result_type fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val) +enum rtlsdr_error fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val) { uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, data, 2) < 0) - return FC2580_FCI_FAIL; - - return FC2580_FCI_SUCCESS; + return rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, data, 2); } -fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data) +enum rtlsdr_error fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, &data, 1) < 0) - return FC2580_FCI_FAIL; + r = rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(pTuner, FC2580_I2C_ADDR, &data, 1) < 0) - return FC2580_FCI_FAIL; + r = rtlsdr_i2c_read_fn(pTuner, FC2580_I2C_ADDR, &data, 1); + if (r < 0) + return r; *read_data = data; - return FC2580_FCI_SUCCESS; + return RTLSDR_SUCCESS; } int @@ -59,15 +60,7 @@ fc2580_Initialize( // Note: CrystalFreqKhz = round(CrystalFreqHz / 1000) CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_init(pTuner, AgcMode, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_initialize_tuner; - - - return FUNCTION_SUCCESS; - - -error_status_initialize_tuner: - return FUNCTION_ERROR; + return fc2580_set_init(pTuner, AgcMode, CrystalFreqKhz); } int @@ -85,13 +78,7 @@ fc2580_SetRfFreqHz( RfFreqKhz = (unsigned int)((RfFreqHz + 500) / 1000); CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_freq(pTuner, RfFreqKhz, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_set_tuner_rf_frequency; - - return FUNCTION_SUCCESS; - -error_status_set_tuner_rf_frequency: - return FUNCTION_ERROR; + return fc2580_set_freq(pTuner, RfFreqKhz, CrystalFreqKhz); } /** @@ -111,14 +98,7 @@ fc2580_SetBandwidthMode( // Note: CrystalFreqKhz = round(CrystalFreqHz / 1000) CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_filter(pTuner, (unsigned char)BandwidthMode, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_set_tuner_bandwidth_mode; - - return FUNCTION_SUCCESS; - - -error_status_set_tuner_bandwidth_mode: - return FUNCTION_ERROR; + return fc2580_set_filter(pTuner, (unsigned char)BandwidthMode, CrystalFreqKhz); } void fc2580_wait_msec(void *pTuner, int a) @@ -143,37 +123,57 @@ void fc2580_wait_msec(void *pTuner, int a) 2 : Voltage Control Mode ==============================================================================*/ -fc2580_fci_result_type fc2580_set_init( void *pTuner, int ifagc_mode, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_init( void *pTuner, int ifagc_mode, unsigned int freq_xtal ) { - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; - - result &= fc2580_i2c_write(pTuner, 0x00, 0x00); /*** Confidential ***/ - result &= fc2580_i2c_write(pTuner, 0x12, 0x86); - result &= fc2580_i2c_write(pTuner, 0x14, 0x5C); - result &= fc2580_i2c_write(pTuner, 0x16, 0x3C); - result &= fc2580_i2c_write(pTuner, 0x1F, 0xD2); - result &= fc2580_i2c_write(pTuner, 0x09, 0xD7); - result &= fc2580_i2c_write(pTuner, 0x0B, 0xD5); - result &= fc2580_i2c_write(pTuner, 0x0C, 0x32); - result &= fc2580_i2c_write(pTuner, 0x0E, 0x43); - result &= fc2580_i2c_write(pTuner, 0x21, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x22, 0x82); + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; + + result = fc2580_i2c_write(pTuner, 0x00, 0x00); /*** Confidential ***/ + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x12, 0x86); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x14, 0x5C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x16, 0x3C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1F, 0xD2); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x09, 0xD7); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0B, 0xD5); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0C, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0E, 0x43); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x21, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x22, 0x82); + if (result) fresult = result; if( ifagc_mode == 1 ) { - result &= fc2580_i2c_write(pTuner, 0x45, 0x10); //internal AGC - result &= fc2580_i2c_write(pTuner, 0x4C, 0x00); //HOLD_AGC polarity + result = fc2580_i2c_write(pTuner, 0x45, 0x10); //internal AGC + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x4C, 0x00); //HOLD_AGC polarity + if (result) fresult = result; } else if( ifagc_mode == 2 ) { - result &= fc2580_i2c_write(pTuner, 0x45, 0x20); //Voltage Control Mode - result &= fc2580_i2c_write(pTuner, 0x4C, 0x02); //HOLD_AGC polarity + result = fc2580_i2c_write(pTuner, 0x45, 0x20); //Voltage Control Mode + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x4C, 0x02); //HOLD_AGC polarity + if (result) fresult = result; } - result &= fc2580_i2c_write(pTuner, 0x3F, 0x88); - result &= fc2580_i2c_write(pTuner, 0x02, 0x0E); - result &= fc2580_i2c_write(pTuner, 0x58, 0x14); - result &= fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz - - return result; + result = fc2580_i2c_write(pTuner, 0x3F, 0x88); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x02, 0x0E); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x58, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + if (result) fresult = result; + + return fresult; } @@ -192,7 +192,7 @@ fc2580_fci_result_type fc2580_set_init( void *pTuner, int ifagc_mode, unsigned i ex) 2.6GHz = 2600000 ==============================================================================*/ -fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigned int freq_xtal ) { unsigned int f_diff, f_diff_shifted, n_val, k_val; unsigned int f_vco, r_val, f_comp; @@ -202,7 +202,8 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne fc2580_band_type band = ( f_lo > 1000000 )? FC2580_L_BAND : ( f_lo > 400000 )? FC2580_UHF_BAND : FC2580_VHF_BAND; - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; f_vco = ( band == FC2580_UHF_BAND )? f_lo * 4 : (( band == FC2580_L_BAND )? f_lo * 2 : f_lo * 12); r_val = ( f_vco >= 2*76*freq_xtal )? 1 : ( f_vco >= 76*freq_xtal )? 2 : 4; @@ -227,102 +228,176 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne case FC2580_UHF_BAND: data_0x02 = (data_0x02 & 0x3F); - result &= fc2580_i2c_write(pTuner, 0x25, 0xF0); - result &= fc2580_i2c_write(pTuner, 0x27, 0x77); - result &= fc2580_i2c_write(pTuner, 0x28, 0x53); - result &= fc2580_i2c_write(pTuner, 0x29, 0x60); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); + result = fc2580_i2c_write(pTuner, 0x25, 0xF0); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x27, 0x77); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x28, 0x53); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x29, 0x60); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; if( f_lo < 538000 ) - result &= fc2580_i2c_write(pTuner, 0x5F, 0x13); + result = fc2580_i2c_write(pTuner, 0x5F, 0x13); else - result &= fc2580_i2c_write(pTuner, 0x5F, 0x15); + result = fc2580_i2c_write(pTuner, 0x5F, 0x15); + if (result) fresult = result; if( f_lo < 538000 ) { - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x06); - result &= fc2580_i2c_write(pTuner, 0x67, 0x06); - result &= fc2580_i2c_write(pTuner, 0x68, 0x08); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; } else if( f_lo < 794000 ) { - result &= fc2580_i2c_write(pTuner, 0x61, 0x03); - result &= fc2580_i2c_write(pTuner, 0x62, 0x03); - result &= fc2580_i2c_write(pTuner, 0x67, 0x03); //ACI improve - result &= fc2580_i2c_write(pTuner, 0x68, 0x05); //ACI improve - result &= fc2580_i2c_write(pTuner, 0x69, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x0E); + result = fc2580_i2c_write(pTuner, 0x61, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x03); //ACI improve + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x05); //ACI improve + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x0E); + if (result) fresult = result; } else { - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x06); - result &= fc2580_i2c_write(pTuner, 0x67, 0x07); - result &= fc2580_i2c_write(pTuner, 0x68, 0x09); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; } - result &= fc2580_i2c_write(pTuner, 0x63, 0x15); - - result &= fc2580_i2c_write(pTuner, 0x6B, 0x0B); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6D, 0x78); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x32); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x14); - result &= fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + result = fc2580_i2c_write(pTuner, 0x63, 0x15); + if (result) fresult = result; + + result = fc2580_i2c_write(pTuner, 0x6B, 0x0B); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0x78); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + if (result) fresult = result; break; case FC2580_VHF_BAND: data_0x02 = (data_0x02 & 0x3F) | 0x80; - result &= fc2580_i2c_write(pTuner, 0x27, 0x77); - result &= fc2580_i2c_write(pTuner, 0x28, 0x33); - result &= fc2580_i2c_write(pTuner, 0x29, 0x40); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); - result &= fc2580_i2c_write(pTuner, 0x5F, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x00); - result &= fc2580_i2c_write(pTuner, 0x63, 0x15); - result &= fc2580_i2c_write(pTuner, 0x67, 0x03); - result &= fc2580_i2c_write(pTuner, 0x68, 0x05); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); - result &= fc2580_i2c_write(pTuner, 0x6B, 0x08); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x6D, 0x78); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x32); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x54); - result &= fc2580_set_filter(pTuner, 7, freq_xtal); //BW = 6.8MHz + result = fc2580_i2c_write(pTuner, 0x27, 0x77); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x28, 0x33); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x29, 0x40); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x5F, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x63, 0x15); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x05); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6B, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0x78); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x54); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 7, freq_xtal); //BW = 6.8MHz + if (result) fresult = result; break; case FC2580_L_BAND: data_0x02 = (data_0x02 & 0x3F) | 0x40; - result &= fc2580_i2c_write(pTuner, 0x2B, 0x70); - result &= fc2580_i2c_write(pTuner, 0x2C, 0x37); - result &= fc2580_i2c_write(pTuner, 0x2D, 0xE7); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x44, 0x20); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); - result &= fc2580_i2c_write(pTuner, 0x5F, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x61, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x62, 0x00); - result &= fc2580_i2c_write(pTuner, 0x63, 0x13); - result &= fc2580_i2c_write(pTuner, 0x67, 0x00); - result &= fc2580_i2c_write(pTuner, 0x68, 0x02); - result &= fc2580_i2c_write(pTuner, 0x69, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x0E); - result &= fc2580_i2c_write(pTuner, 0x6B, 0x08); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x6D, 0xA0); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x50); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x14); - result &= fc2580_set_filter(pTuner, 1, freq_xtal); //BW = 1.53MHz + result = fc2580_i2c_write(pTuner, 0x2B, 0x70); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2C, 0x37); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2D, 0xE7); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x44, 0x20); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x5F, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x61, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x63, 0x13); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x02); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x0E); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6B, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0xA0); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 1, freq_xtal); //BW = 1.53MHz + if (result) fresult = result; break; default: break; @@ -331,23 +406,32 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne // } //A command about AGC clock's pre-divide ratio - if( freq_xtal >= 28000 ) - result &= fc2580_i2c_write(pTuner, 0x4B, 0x22 ); + if( freq_xtal >= 28000 ) { + result = fc2580_i2c_write(pTuner, 0x4B, 0x22 ); + if (result) fresult = result; + } //Commands about VCO Band and PLL setting. - result &= fc2580_i2c_write(pTuner, 0x02, data_0x02); + result = fc2580_i2c_write(pTuner, 0x02, data_0x02); + if (result) fresult = result; data_0x18 = ( ( r_val == 1 )? 0x00 : ( ( r_val == 2 )? 0x10 : 0x20 ) ) + (unsigned char)(k_val >> 16); - result &= fc2580_i2c_write(pTuner, 0x18, data_0x18); //Load 'R' value and high part of 'K' values - result &= fc2580_i2c_write(pTuner, 0x1A, (unsigned char)( k_val >> 8 ) ); //Load middle part of 'K' value - result &= fc2580_i2c_write(pTuner, 0x1B, (unsigned char)( k_val ) ); //Load lower part of 'K' value - result &= fc2580_i2c_write(pTuner, 0x1C, (unsigned char)( n_val ) ); //Load 'N' value + result = fc2580_i2c_write(pTuner, 0x18, data_0x18); //Load 'R' value and high part of 'K' values + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1A, (unsigned char)( k_val >> 8 ) ); //Load middle part of 'K' value + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1B, (unsigned char)( k_val ) ); //Load lower part of 'K' value + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1C, (unsigned char)( n_val ) ); //Load 'N' value + if (result) fresult = result; //A command about UHF LNA Load Cap - if( band == FC2580_UHF_BAND ) - result &= fc2580_i2c_write(pTuner, 0x2D, ( f_lo <= (unsigned int)794000 )? 0x9F : 0x8F ); //LNA_OUT_CAP + if( band == FC2580_UHF_BAND ) { + result = fc2580_i2c_write(pTuner, 0x2D, ( f_lo <= (unsigned int)794000 )? 0x9F : 0x8F ); //LNA_OUT_CAP + if (result) fresult = result; + } - return result; + return fresult; } @@ -369,57 +453,78 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne ==============================================================================*/ -fc2580_fci_result_type fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ) { unsigned char cal_mon = 0, i; - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; if(filter_bw == 1) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x1C); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4151*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x00); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x1C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4151*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } if(filter_bw == 6) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4400*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x00); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4400*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else if(filter_bw == 7) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3910*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x80); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3910*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x80); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else if(filter_bw == 8) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3300*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x80); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3300*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x80); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } for(i=0; i<5; i++) { fc2580_wait_msec(pTuner, 5);//wait 5ms - result &= fc2580_i2c_read(pTuner, 0x2F, &cal_mon); + result = fc2580_i2c_read(pTuner, 0x2F, &cal_mon); + if (result) fresult = result; if( (cal_mon & 0xC0) != 0xC0) { - result &= fc2580_i2c_write(pTuner, 0x2E, 0x01); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x2E, 0x01); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else break; } - result &= fc2580_i2c_write(pTuner, 0x2E, 0x01); + result = fc2580_i2c_write(pTuner, 0x2E, 0x01); + if (result) fresult = result; - return result; + return fresult; } /*============================================================================== diff --git a/src/tuner_r82xx.c b/src/tuner_r82xx.c index fe52bd9..9561c1f 100644 --- a/src/tuner_r82xx.c +++ b/src/tuner_r82xx.c @@ -26,6 +26,7 @@ #include <stdint.h> #include <string.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_r82xx.h" @@ -275,7 +276,7 @@ static int r82xx_write(struct r82xx_priv *priv, uint8_t reg, const uint8_t *val, __FUNCTION__, rc, reg, size); if (rc < 0) return rc; - return -1; + return RTLSDR_ERROR_SHORT; } reg += size; @@ -283,7 +284,7 @@ static int r82xx_write(struct r82xx_priv *priv, uint8_t reg, const uint8_t *val, pos += size; } while (len > 0); - return 0; + return RTLSDR_SUCCESS; } static int r82xx_write_reg(struct r82xx_priv *priv, uint8_t reg, uint8_t val) @@ -298,7 +299,7 @@ static int r82xx_read_cache_reg(struct r82xx_priv *priv, int reg) if (reg >= 0 && reg < NUM_REGS) return priv->regs[reg]; else - return -1; + return RTLSDR_ERROR_INVALID; } static int r82xx_write_reg_mask(struct r82xx_priv *priv, uint8_t reg, uint8_t val, @@ -330,8 +331,10 @@ static int r82xx_read(struct r82xx_priv *priv, uint8_t reg, uint8_t *val, int le priv->buf[0] = reg; rc = rtlsdr_i2c_write_fn(priv->rtl_dev, priv->cfg->i2c_addr, priv->buf, 1); - if (rc < 1) + if (rc < 0) return rc; + if (rc < 1) + return RTLSDR_ERROR_SHORT; rc = rtlsdr_i2c_read_fn(priv->rtl_dev, priv->cfg->i2c_addr, p, len); @@ -340,14 +343,14 @@ static int r82xx_read(struct r82xx_priv *priv, uint8_t reg, uint8_t *val, int le __FUNCTION__, rc, reg, len); if (rc < 0) return rc; - return -1; + return RTLSDR_ERROR_SHORT; } /* Copy data to the output buffer */ for (i = 0; i < len; i++) val[i] = r82xx_bitrev(p[i]); - return 0; + return RTLSDR_SUCCESS; } /* @@ -490,7 +493,7 @@ static int r82xx_set_pll(struct r82xx_priv *priv, uint32_t freq) if (nint > ((128 / vco_power_ref) - 1)) { fprintf(stderr, "[R82XX] No valid PLL values for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } ni = (nint - 13) / 4; @@ -549,7 +552,7 @@ static int r82xx_set_pll(struct r82xx_priv *priv, uint32_t freq) if (!(data[2] & 0x40)) { fprintf(stderr, "[R82XX] PLL not locked!\n"); priv->has_lock = 0; - return 0; + return RTLSDR_SUCCESS; } priv->has_lock = 1; @@ -754,7 +757,7 @@ static int r82xx_sysfreq_sel(struct r82xx_priv *priv, uint32_t freq, if (rc < 0) return rc; } - return 0; + return RTLSDR_SUCCESS; } static int r82xx_set_tv_standard(struct r82xx_priv *priv, @@ -911,7 +914,7 @@ static int r82xx_set_tv_standard(struct r82xx_priv *priv, priv->type = type; priv->bw = bw; - return 0; + return RTLSDR_SUCCESS; } static int r82xx_read_gain(struct r82xx_priv *priv) @@ -1010,7 +1013,7 @@ int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain) return rc; } - return 0; + return RTLSDR_SUCCESS; } /* Bandwidth contribution by low-pass filter. */ @@ -1131,7 +1134,7 @@ int r82xx_standby(struct r82xx_priv *priv) /* If device was not initialized yet, don't need to standby */ if (!priv->init_done) - return 0; + return RTLSDR_ERROR_NOOP; rc = r82xx_write_reg(priv, 0x06, 0xb1); if (rc < 0) @@ -1229,7 +1232,7 @@ static int r82xx_xtal_check(struct r82xx_priv *priv) } if (i == ARRAY_SIZE(r82xx_xtal_capacitor)) - return -1; + return RTLSDR_ERROR_INVALID; return r82xx_xtal_capacitor[i][1]; } -- 2.11.0

1 0

[PATCH] rtl-sdr/lib: take 2 manually releasing async buffers
by Karl Semich 21 Sep '18

21 Sep '18

New rtl-sdr manual buffer resubmission patch after discussion on IRC. This implementation uses the existing rtlsdr_read_async API and is more compartmentalized.

1 0

[PATCH} gr-osmosdr/rtl: overflow fixes
by Karl Semich 19 Sep '18

19 Sep '18

RTLSDR driver is amended to handle overflows in a robust way. Previous code appeared to have many issues: overflows were happening more than needed and could result in data corruption. Handling is changed to stop the stream when buffers are exhausted, and restart it when they have drained. I apologize that my patches are sent as attachments; I only have access to webmail at this time.

1 0

[PATCH] Add support for message commands
by Karl Semich 19 Sep '18

19 Sep '18

Hi, I've modified gr-osmosdr such that all devices respond to message commands ala USRP. I feel this is a really valuable addition, and I am happy to continue to work with it to meet any needs or desires. Please let me know that this e-mail was received. Thanks so much, Karl

1 0

[PATCH] Add support for message commands
by Karl 19 Sep '18

19 Sep '18

1 0

[PATCH] Add API for releasing zero-copy USB buffers
by Karl Semich 19 Sep '18

19 Sep '18

Hi, I was trying to take advantage of the async zero-copy buffer feature in librtlsdr, but I found that the automatic resubmission of them made it hard to make use of them safely. This patch adds a couple function to manage buffers in a more advanced manner, so that latency and reuse can be tracked precisely. I also added some documentation. I can occasionally make a lot of mistakes, so if anybody has time to take a brief glance through, it would be really great. Karl

1 0

[PATCH 0/3] Adds support for the AirspyHF+
by Kieren Rasmussen 23 Aug '18

23 Aug '18

This builds on the work started in gr-osmosdr-gqrx arispyhf branch by Alexandru Csete. Further adds support for all the gain stages within the Airspy. Kieren Rasmussen (3): - Added support for manual gain modes of AirspyHF+ - TODO support for AGC threshold level - Incorrect gain clipping when setting attenuation - Verified working with a git build of GQRX - Split the AirspyHF+ into a separate block in GRC with more relevant parameters exposed README | 1 + grc/CMakeLists.txt | 1 + grc/gen_airspyhf_blocks.py | 281 ++++++++++++++++++++++++++++++ grc/gen_osmosdr_blocks.py | 2 + lib/airspyhf/airspyhf_source_c.cc | 102 ++++++++++- lib/airspyhf/airspyhf_source_c.h | 9 + 6 files changed, 392 insertions(+), 4 deletions(-) create mode 100644 grc/gen_airspyhf_blocks.py -- 2.18.0

1 3

Re: [PATCH] gr-osmosdr Microtelecom Perseus HF receiver support (II)
by Andrea Montefusco IW0HDV 21 Aug '18

21 Aug '18

Hi Dimitri, >> could you please provide a signed-off patch with your latest changes ongithub and a proper commit message? >> Feel free to add information to AUTHORS, README and the grc/gen_osmosdr_blocks.py files just like we did for other radios and ideally include a link where libperseus is hosted (I understand this is https://github.com/Microtelecom/libperseus-sdr ?). I added the infor requested and even tested the module under GRC (non only under GQRX that is the reason I developed the patch at start). Below you find the patch as per git command. *am* IW0HDV --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/airspy/airspy_source_c.cc | 5 +- lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 507 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 120 +++++++++ lib/rtl/rtl_source_c.cc | 2 +- lib/source_impl.cc | 18 +- 11 files changed, 727 insertions(+), 4 deletions(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 50150e5..02fc6ab 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -350,9 +350,10 @@ osmosdr::meta_range_t airspy_source_c::get_sample_rates() { osmosdr::meta_range_t range; - for (size_t i = 0; i < _sample_rates.size(); i++) + for (size_t i = 0; i < _sample_rates.size(); i++) { + std::cerr << "SR: [" << i << "]: " << _sample_rates[i].first << std::endl; range += osmosdr::range_t( _sample_rates[i].first ); - + } return range; } diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..0720da4 --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,507 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +/* + * config.h is generated by configure. It contains the results + * of probing for features, options etc. It should be the first + * file included in your .cc file. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_source_c (args)); +} + +/* + * Specify constraints on number of input and output streams. + * This info is used to construct the input and output signatures + * (2nd & 3rd args to gr::block's constructor). The input and + * output signatures are used by the runtime system to + * check that a valid number and type of inputs and outputs + * are connected to this block. In this case, we accept + * only 0 input and 1 output. + */ +static const int MIN_IN = 0; // mininum number of input streams +static const int MAX_IN = 0; // maximum number of input streams +static const int MIN_OUT = 1; // minimum number of output streams +static const int MAX_OUT = 1; // maximum number of output streams + +/* + * The private constructor + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0) +{ + //int ret; + + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + //fprintf (stderr, "Revision: %s\n", git_revision); + //fprintf (stderr, "SAMPLE RATE: %d\n", sr); + //fprintf (stderr, "NBUF: %d BUF SIZE: %d TOTAL BUFFER LENGTH: %d\n", nb, bs, nb*bs); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, PERSEUS_ATT_0DB); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, true, false); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + + /* Push sample to the fifo */ + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_source_c::work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ) +{ + gr_complex *out = (gr_complex *)output_items[0]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + 1); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + return {}; +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return osmosdr::gain_range_t(); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_gain( double gain, size_t chan ) +{ + return gain; +} + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + return gain; +} + +double perseus_source_c::get_gain( size_t chan ) +{ + return 0.0; +} + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + return 0.0; +} + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += get_antenna( chan ); + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..9eda23d --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,120 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ +#ifndef INCLUDED_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + int work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ); + + static std::vector< std::string > get_devices(); + + size_t get_num_channels( void ); + + osmosdr::meta_range_t get_sample_rates( void ); + double set_sample_rate( double rate ); + double get_sample_rate( void ); + + osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); + double set_center_freq( double freq, size_t chan = 0 ); + double get_center_freq( size_t chan = 0 ); + double set_freq_corr( double ppm, size_t chan = 0 ); + double get_freq_corr( size_t chan = 0 ); + + std::vector<std::string> get_gain_names( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); + double set_gain( double gain, size_t chan = 0 ); + double set_gain( double gain, const std::string & name, size_t chan = 0 ); + double get_gain( size_t chan = 0 ); + double get_gain( const std::string & name, size_t chan = 0 ); + + std::vector< std::string > get_antennas( size_t chan = 0 ); + std::string set_antenna( const std::string & antenna, size_t chan = 0 ); + std::string get_antenna( size_t chan = 0 ); + + +private: + static int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..eb7042e 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -221,7 +221,7 @@ rtl_source_c::rtl_source_c (const std::string &args) throw std::runtime_error("Failed to enable offset tuning."); } - ret = rtlsdr_set_bias_tee(_dev, bias_tee); +// ret = rtlsdr_set_bias_tee(_dev, bias_tee); if (ret < 0) throw std::runtime_error("Failed to set bias tee."); diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1 >From 1b6cf50a7a6074754717b0270757931c379561bc Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Thu, 1 Feb 2018 17:33:39 +0100 Subject: [PATCH 2/6] More hardware controls added (attenuator, ADC preamp and dither, preselector) --- lib/perseus/perseus_source_c.cc | 136 ++++++++++++++++++++++++++++++++++++---- lib/perseus/perseus_source_c.h | 19 +++++- 2 files changed, 142 insertions(+), 13 deletions(-) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 0720da4..89674b1 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -89,7 +89,11 @@ perseus_source_c::perseus_source_c (const std::string &args) _center_freq(0), _freq_corr(0), _frun(false), - _cnt(0) + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) { //int ret; @@ -174,9 +178,9 @@ perseus_source_c::perseus_source_c (const std::string &args) PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - perseus_set_attenuator_in_db(_dev, PERSEUS_ATT_0DB); + perseus_set_attenuator_in_db(_dev, _att_value); // Enable ADC Dither, Disable ADC Preamp - perseus_set_adc(_dev, true, false); + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); // set the NCO frequency in the middle of the range allowed set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); set_sample_rate( get_sample_rates().start() ); @@ -425,7 +429,7 @@ double perseus_source_c::set_center_freq( double freq, size_t chan ) ret = perseus_set_ddc_center_freq(_dev, (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), - 1); + _preselector == true ? 1:0); if ( ret == PERSEUS_NOERROR ) { _center_freq = freq; } else { @@ -453,55 +457,165 @@ double perseus_source_c::get_freq_corr( size_t chan ) std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) { - return {}; + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; } +// +// FIXME +// osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) { - return osmosdr::gain_range_t(); + return get_gain_range( "Attenuator", chan ); } osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) { + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + return osmosdr::gain_range_t(); } -double perseus_source_c::set_gain( double gain, size_t chan ) +double perseus_source_c::set_attenuator( double gain, size_t chan ) { + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } return gain; } -double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +double perseus_source_c::set_adc_dither( double gain, size_t chan ) { + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } return gain; } -double perseus_source_c::get_gain( size_t chan ) +double perseus_source_c::get_attenuator( size_t chan ) { - return 0.0; + return _att_value; } +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + double perseus_source_c::get_gain( const std::string & name, size_t chan ) { + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } return 0.0; } + + std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) { std::vector< std::string > antennas; - antennas += get_antenna( chan ); + antennas += "RX"; + antennas += "RX+PRESELECTOR"; return antennas; } std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) { + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } return get_antenna( chan ); } std::string perseus_source_c::get_antenna( size_t chan ) { + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; return "RX"; } diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h index 9eda23d..934ff2b 100644 --- a/lib/perseus/perseus_source_c.h +++ b/lib/perseus/perseus_source_c.h @@ -87,9 +87,20 @@ public: std::vector<std::string> get_gain_names( size_t chan = 0 ); osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); - double set_gain( double gain, size_t chan = 0 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( size_t chan = 0 ); + double set_gain( double gain, const std::string & name, size_t chan = 0 ); - double get_gain( size_t chan = 0 ); double get_gain( const std::string & name, size_t chan = 0 ); std::vector< std::string > get_antennas( size_t chan = 0 ); @@ -115,6 +126,10 @@ private: bool _frun; int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; }; #endif /* INCLUDED_PERSEUS_SOURCE_C_H */ -- 1.9.1 >From ff520c9d98d0bdeb9cf59cc092a08d54ced76af1 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Sat, 3 Feb 2018 08:55:32 +0100 Subject: [PATCH 3/6] files not enclosed in patch restored --- lib/airspy/airspy_source_c.cc | 5 ++--- lib/rtl/rtl_source_c.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 02fc6ab..50150e5 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -350,10 +350,9 @@ osmosdr::meta_range_t airspy_source_c::get_sample_rates() { osmosdr::meta_range_t range; - for (size_t i = 0; i < _sample_rates.size(); i++) { - std::cerr << "SR: [" << i << "]: " << _sample_rates[i].first << std::endl; + for (size_t i = 0; i < _sample_rates.size(); i++) range += osmosdr::range_t( _sample_rates[i].first ); - } + return range; } diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index eb7042e..a371464 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -221,7 +221,7 @@ rtl_source_c::rtl_source_c (const std::string &args) throw std::runtime_error("Failed to enable offset tuning."); } -// ret = rtlsdr_set_bias_tee(_dev, bias_tee); + ret = rtlsdr_set_bias_tee(_dev, bias_tee); if (ret < 0) throw std::runtime_error("Failed to set bias tee."); -- 1.9.1 >From a195b8a7eb328ed7c0b31a1e4aa077e11789f648 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Sat, 3 Feb 2018 10:25:27 +0100 Subject: [PATCH 4/6] Microtelecom Perseus HF receiver support --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 613 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 135 ++++++++ lib/source_impl.cc | 18 +- 9 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..bf7c9be --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,613 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +/* + * config.h is generated by configure. It contains the results + * of probing for features, options etc. It should be the first + * file included in your .cc file. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_source_c (args)); +} + +/* + * Specify constraints on number of input and output streams. + * This info is used to construct the input and output signatures + * (2nd & 3rd args to gr::block's constructor). The input and + * output signatures are used by the runtime system to + * check that a valid number and type of inputs and outputs + * are connected to this block. In this case, we accept + * only 0 input and 1 output. + */ +static const int MIN_IN = 0; // mininum number of input streams +static const int MAX_IN = 0; // maximum number of input streams +static const int MIN_OUT = 1; // minimum number of output streams +static const int MAX_OUT = 1; // maximum number of output streams + +/* + * The private constructor + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) +{ + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, _att_value); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + // Push sample to the fifo + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_source_c::work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ) +{ + gr_complex *out = (gr_complex *)output_items[0]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + _preselector == true ? 1:0); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; +} + +// +// FIXME +// +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return get_gain_range( "Attenuator", chan ); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_attenuator( double gain, size_t chan ) +{ + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::set_adc_dither( double gain, size_t chan ) +{ + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::get_attenuator( size_t chan ) +{ + return _att_value; +} + +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } + return 0.0; +} + + + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += "RX"; + antennas += "RX+PRESELECTOR"; + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..55d3f89 --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,135 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ +#ifndef INCLUDED_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + int work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ); + + static std::vector< std::string > get_devices(); + + size_t get_num_channels( void ); + + osmosdr::meta_range_t get_sample_rates( void ); + double set_sample_rate( double rate ); + double get_sample_rate( void ); + + osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); + double set_center_freq( double freq, size_t chan = 0 ); + double get_center_freq( size_t chan = 0 ); + double set_freq_corr( double ppm, size_t chan = 0 ); + double get_freq_corr( size_t chan = 0 ); + + std::vector<std::string> get_gain_names( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( size_t chan = 0 ); + + double set_gain( double gain, const std::string & name, size_t chan = 0 ); + double get_gain( const std::string & name, size_t chan = 0 ); + + std::vector< std::string > get_antennas( size_t chan = 0 ); + std::string set_antenna( const std::string & antenna, size_t chan = 0 ); + std::string get_antenna( size_t chan = 0 ); + + +private: + static int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1 >From 9be9bfc531d793f0d3d728c361f0b7f520d5c991 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Tue, 27 Mar 2018 20:35:30 +0200 Subject: [PATCH 5/6] Avoid to throw exception when the new frequency is out of range; it happens when we are coming back to Perseus from wider range receivers --- lib/perseus/perseus_source_c.cc | 76 ++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 89674b1..faab51d 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -103,15 +103,15 @@ perseus_source_c::perseus_source_c (const std::string &args) // Set debug info dumped to stderr to the maximum verbose level perseus_set_debug(3); - + //fprintf (stderr, "Revision: %s\n", git_revision); //fprintf (stderr, "SAMPLE RATE: %d\n", sr); //fprintf (stderr, "NBUF: %d BUF SIZE: %d TOTAL BUFFER LENGTH: %d\n", nb, bs, nb*bs); - + // Check how many Perseus receivers are connected to the system int num_perseus = perseus_init(); std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; - + if (num_perseus==0) { perseus_exit(); PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); @@ -125,19 +125,19 @@ perseus_source_c::perseus_source_c (const std::string &args) if (int rc = perseus_firmware_download(_dev,NULL)<0) { PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); } - + // Dump some information about the receiver (S/N and HW rev) int flag; perseus_is_preserie(_dev, &flag); - if (flag != 0) + if (flag != 0) fprintf(stderr, "The device is a preserie unit"); else { eeprom_prodid prodid; - if (perseus_get_product_id(_dev,&prodid)<0) + if (perseus_get_product_id(_dev,&prodid)<0) fprintf(stderr, "get product id error: %s", perseus_errorstr()); else fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", - (uint16_t) prodid.sn, + (uint16_t) prodid.sn, (uint16_t) prodid.signature[5], (uint16_t) prodid.signature[4], (uint16_t) prodid.signature[3], @@ -146,18 +146,18 @@ perseus_source_c::perseus_source_c (const std::string &args) (uint16_t) prodid.signature[0], (uint16_t) prodid.hwrel, (uint16_t) prodid.hwver); - } + } // Printing all sampling rates available ..... { int buf[BUFSIZ]; - + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); } else { int i = 0; while (buf[i]) { fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); - + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); i++; } @@ -177,14 +177,14 @@ perseus_source_c::perseus_source_c (const std::string &args) std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - + perseus_set_attenuator_in_db(_dev, _att_value); // Enable ADC Dither, Disable ADC Preamp perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); // set the NCO frequency in the middle of the range allowed set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); set_sample_rate( get_sample_rates().start() ); - + _fifo = new boost::circular_buffer<gr_complex>(5000000); if (!_fifo) { throw std::runtime_error( std::string(__FUNCTION__) + " " + @@ -237,10 +237,10 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) size_t i, n_avail, to_copy, num_samples; uint8_t *samplebuf = (uint8_t*)buf; - + num_samples = buf_size/6; - if (buf_size % 6) + if (buf_size % 6) std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; iq_sample s; @@ -251,7 +251,7 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) to_copy = (n_avail < num_samples ? n_avail : num_samples); for (i = 0; i < to_copy; i++ ) { - + s.i1 = s.q1 = 0; s.i2 = *samplebuf++; s.i3 = *samplebuf++; @@ -259,16 +259,16 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) s.q2 = *samplebuf++; s.q3 = *samplebuf++; s.q4 = *samplebuf++; - + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range - + /* Push sample to the fifo */ _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); } // keep a counter of processed bytes _cnt += buf_size; - + _fifo_lock.unlock(); /* We have made some new samples available to the consumer in work() */ @@ -290,7 +290,7 @@ int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) perseus_source_c *obj = (perseus_source_c *)extra; return obj->perseus_rx_callback((float *)buf, buf_size); - + return 0; } @@ -301,8 +301,8 @@ bool perseus_source_c::start() if ( ! _dev ) return false; - - std::cerr << "***** START COUNTER: " << _cnt + + std::cerr << "***** START COUNTER: " << _cnt << " mod 6 " << (_cnt % 6) << std::endl; _frun = true; @@ -311,15 +311,15 @@ bool perseus_source_c::start() // re-set the sample rate each time the stream is started set_sample_rate( get_sample_rate() ); - ret = perseus_start_async_input(_dev, - 6 * 1024 * 2 /* buffer size */, + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, perseus_source_c::_perseus_rx_callback, (void *)this); if (ret != PERSEUS_NOERROR) { - std::cerr << "Failed to start RX streaming (" + std::cerr << "Failed to start RX streaming (" << ret << ")" << std::endl; - return false; - } else + return false; + } else return true; } @@ -330,15 +330,15 @@ bool perseus_source_c::stop() _frun = false; - std::cerr << "***** STOP COUNTER: " << _cnt + std::cerr << "***** STOP COUNTER: " << _cnt << " mod 6 " << (_cnt % 6) << std::endl; int ret = perseus_stop_async_input(_dev); if ( ret != PERSEUS_NOERROR ) { std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; - return false; - } else + return false; + } else return true; } @@ -375,7 +375,7 @@ std::vector<std::string> perseus_source_c::get_devices() std::string args = "perseus=0,label='Perseus'"; devices.push_back( args ); - + return devices; } @@ -390,7 +390,7 @@ osmosdr::meta_range_t perseus_source_c::get_sample_rates() for (size_t i = 0; i < _sample_rates.size(); i++) { range += osmosdr::range_t( _sample_rates[i].first ); - std::cerr << "SR: " << i << " : (" + std::cerr << "SR: " << i << " : (" << _sample_rates[i].first << ")" << std::endl; } return range; @@ -400,10 +400,10 @@ double perseus_source_c::set_sample_rate( double rate ) { int ret; if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { - PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); - } else + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else _sample_rate = rate; - + return get_sample_rate(); } @@ -426,9 +426,13 @@ double perseus_source_c::set_center_freq( double freq, size_t chan ) int ret; if (_dev) { - ret = + // avoid to crash when the frequency is out of range + if (freq > PERSEUS_DDC_FREQ_MAX) freq = PERSEUS_DDC_FREQ_MAX; + if (freq < PERSEUS_DDC_FREQ_MIN) freq = PERSEUS_DDC_FREQ_MIN; + + ret = perseus_set_ddc_center_freq(_dev, - (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), _preselector == true ? 1:0); if ( ret == PERSEUS_NOERROR ) { _center_freq = freq; -- 1.9.1 >From 38f121f6d823d7971262e0768ab2f8be9ec35e43 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Tue, 21 Aug 2018 13:49:17 +0200 Subject: [PATCH 6/6] perseus: gr-osmosdr Microtelecom Perseus HF receiver support --- AUTHORS | 1 + MANIFEST.md | 1 + README | 2 ++ grc/gen_osmosdr_blocks.py | 6 +++++ lib/perseus/perseus_source_c.cc | 57 ++++++++++++++++++++++++++--------------- 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2fd882c..fd51a22 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,3 +7,4 @@ SDRplay Ltd. Pavel Demin Marcus Müller Lukas Lao Beyer +Andrea Montefusco IW0HDV <andrew(a)montefusco.com> diff --git a/MANIFEST.md b/MANIFEST.md index 9e19f5f..ad33c82 100644 --- a/MANIFEST.md +++ b/MANIFEST.md @@ -10,6 +10,7 @@ tags: - sdrplay - uhd - osmocom + - perseus author: - Dimitri Stolnikov <horiz0n(a)gmx.net> copyright_owner: diff --git a/README b/README index 67fa475..9ff3d5c 100644 --- a/README +++ b/README @@ -18,6 +18,8 @@ as well supports: * Fairwaves UmTRX through Fairwaves' fork of UHD * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com) * FreeSRP through libfreesrp + * Microtelecom Perseus HF receiver through libperseus-sdr + available in https://github.com/Microtelecom/libperseus-sdr/ By using the OsmoSDR block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware. diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index d1f2b1a..b7e33ef 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -219,6 +219,8 @@ While primarily being developed for the OsmoSDR hardware, this block as well sup * gnuradio .cfile input through libgnuradio-blocks * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option) * AirSpy Wideband Receiver through libairspy + * Microtelecom Perseus HF Receiver through libperseus-sdr + available in https://github.com/Microtelecom/libperseus-sdr/ #end if #if $sourk == 'sink': * gnuradio .cfile output through libgnuradio-blocks @@ -260,6 +262,7 @@ Lines ending with ... mean it's possible to bind devices together by specifying cloudiq=127.0.0.1[:50000] sdr-iq=/dev/ttyUSB0 airspy=0[,bias=0|1][,linearity][,sensitivity] + perseus=0[,attenuator=0|-10|-20|-30][,wideband[0|1]][,adcpreamp=0|1][,adcdither=0|1] #end if #if $sourk == 'sink': file='/path/to/your file',rate=1e6[,freq=100e6][,append=true][,throttle=true] ... @@ -474,6 +477,9 @@ if __name__ == '__main__': elif tail.startswith('osmosdr'): title = 'osmocom' prefix = 'osmosdr' + elif tail.startswith('perseus'): + title = 'Perseus' + prefix = 'perseus' else: raise Exception, 'file %s has wrong syntax!'%tail if tail.endswith ('source.xml'): diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 3a388d5..4a8f12d 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -175,18 +175,36 @@ perseus_source_c::perseus_source_c (const std::string &args) PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - perseus_set_attenuator_in_db(_dev, _att_value); - // Enable ADC Dither, Disable ADC Preamp - perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); - // set the NCO frequency in the middle of the range allowed - set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); - set_sample_rate( get_sample_rates().start() ); - _fifo = new boost::circular_buffer<gr_complex>(5000000); if (!_fifo) { throw std::runtime_error( std::string(__FUNCTION__) + " " + "Failed to allocate a sample FIFO!" ); } + + int nav = -1; + //perseus=0[,attenuator=0|-10|-20|-30][,wideband[0|1]][,adcpreamp=0|1][,adcdither=0|1] + if ( dict.count( "attenuator" ) ) + nav = -(boost::lexical_cast< int >( dict["attenuator"] )); + if ( dict.count( "preselector" ) ) + _preselector = ( boost::lexical_cast< int > ( dict["preselector"] ) == 1 ); + if ( dict.count( "adcpreamp" ) ) + _adc_preamp = boost::lexical_cast< int >( dict["adcpreamp"] ); + if ( dict.count( "adcdither" ) ) + _adc_dither = boost::lexical_cast< int >( dict["adcdither"] ); + + + // attenuator + if (nav != -1) { + std::cerr << "perseus_set_attenuator_in_db: new value: " << nav << " old value: " << _att_value << std::endl; + perseus_set_attenuator_in_db(_dev, nav); + _att_value = nav; + } + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + // and, implicitly, the preselector status + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); } /* @@ -465,12 +483,9 @@ std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) return names; } -// -// FIXME -// osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) { - return get_gain_range( "Attenuator", chan ); + return osmosdr::gain_range_t( -30, +7, 1 ); } osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) @@ -491,16 +506,12 @@ osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name double perseus_source_c::set_attenuator( double gain, size_t chan ) { - int ret; - gain = - gain; if (_dev && _att_value != gain) { - ret = perseus_set_attenuator_in_db (_dev, gain); - - if ( PERSEUS_NOERROR == ret ) { + if ( PERSEUS_NOERROR == perseus_set_attenuator_in_db (_dev, gain) ) { _att_value = gain; } else { - std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + std::cerr << "ERROR: perseus_set_attenuator_in_db: new value was: " << gain << std::endl; } } @@ -600,21 +611,25 @@ std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) { + std::cerr << "perseus_source_c::set_antenna: preselector: " << _preselector << "ch: " << chan << std::endl; + if ( antenna == "RX" ) { _preselector = false; set_center_freq( get_center_freq() ); - return "RX"; + return get_antenna(chan); } if ( antenna == "RX+PRESELECTOR" ) { _preselector = true; set_center_freq( get_center_freq() ); - return "RX+PRESELECTOR"; + return get_antenna(chan); } - return get_antenna( chan ); + return get_antenna( chan ); } std::string perseus_source_c::get_antenna( size_t chan ) { std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; - return "RX"; + + if (_preselector == false ) return "RX"; + else return "RX+PRESELECTOR"; } -- 1.9.1

1 0

Non Graphical Use of gnuradio Tools
by Martin McCormick 19 Aug '18

19 Aug '18

If there is a better mailing list for the following question, I will gladly take it there. I want to use as much of the gnu radio project as practical but the graphical way to string various modules together isn't terribly useful for computer users who happen to be blind. Unix and to a lesser degree, DOS handled input and output logic elegantly with <, >, | and even tee when one sends output to multiple files and unix just turned 50 this Summer so it's doing something right. Is there any kind of text-based way to string those python GNU modules together to cause them to work as they do when connected using GRC? This could very well be a dumb question as I have only scratched at python a few years ago and what I am talking about may be similar to a Makefile which is what you use to refer to a bunch of C modules that might be in a program. Anyway, I sure hope there is something else out there that accomplishes the same job. I have played with the Realtek, RTL2838UHIDIR and it does surprisingly well on analog signals so it's time to string some of those modules together and try some digital decoding. Thanks for any and all constructive suggestions. Martin McCormick WB5AGZ

2 1

sdrplay2: Which changes to merge?
by horizon 18 Aug '18

18 Aug '18

trying to figure out what patches to merge for sdrplay2 suppoort. So far i've received the following sources: Frank's patch by email on 06/30/18 https://github.com/willcode/gr-osmosdr/tree/sdrplay2 <https://github.com/willcode/gr-osmosdr/tree/sdrplay2>https://github.com/SDRplay/gr-osmosdr/tree/sdrplay2 Could you please comment on whats the most recent and correct state to apply? Thanks a lot! Best regards, Dimitri

3 2

← Newer
1
...
22
23
24
25
26
27
28
...
92
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr