added librtsdr options vcocmin/vcocmax/vcoalgo for testing

* see #91
* vcocmin/vcocmax: sets VCO current for R820T/2
* added tuner internal caching for VCO current,
 that register isn't written when unnecessary
* added vcoalgo option:
- vcoalgo=2 allows to select/use r82xx_set_pll() from
 https://github.com/rtlsdrblog/rtl-sdr.git
- vcoalgo=1 is previous algorithm, just with higher vco_max=3.9GHz
- vcoalgo=0 is previous algorithm - the default:
 kept this until steve-m#10
 is measured
* rtl_test: added options -f and -e to define where to start and end
 the tuner range test .. for quicker testing if the new options
 change/extend the tuner's frequency range

Signed-off-by: hayati ayguen <[email protected]>

Author: hayguen

include/tuner_r82xx.h

@@ -68,6 +68,9 @@ enum r82xx_xtal_cap_value {
 
 struct r82xx_config {
 	uint8_t i2c_addr;
+	uint8_t vco_curr_min;  /* VCO min/max current for R18/0x12 bits [7:5] in 0 .. 7. use 0xff for default */
+	uint8_t vco_curr_max;  /* value is inverted: programmed is 7-value, that 0 is lowest current */
+	uint8_t vco_algo;
 	uint32_t xtal;
 	enum r82xx_chip rafael_chip;
 	unsigned int max_i2c_msg_len;
@@ -89,6 +92,7 @@ struct r82xx_priv {
 														 * on which the band center shall be positioned */
 	uint8_t						fil_cal_code;
 	uint8_t						input;
+	uint8_t						last_vco_curr;
 	int							has_lock;
 	int							init_done;
 	int							sideband;

src/librtlsdr.c

@@ -99,6 +99,8 @@
 #define LOG_API_SET_FREQ		0
 
 #define INIT_R820T_TUNER_GAIN	0
+#define ENABLE_VCO_OPTIONS		1
+
 
 /* activate/use RTL's IF AGC control .. from  https://github.com/old-dab/rtlsdr
  * purpose: make AGC more smooth .. and NOT freeze
@@ -379,6 +381,10 @@ int r820t_init(void *dev) {
 		devt->r82xx_c.rafael_chip = CHIP_R820T;
 	}
 
+	devt->r82xx_c.vco_curr_min = 0xff;  /* VCO min/max current for R18/0x12 bits [7:5] in 0 .. 7. use 0xff for default */
+	devt->r82xx_c.vco_curr_max = 0xff;  /* value is inverted: programmed is 7-value, that 0 is lowest current */
+	devt->r82xx_c.vco_algo = 0x00;
+
 	rtlsdr_get_xtal_freq(devt, NULL, &devt->r82xx_c.xtal);
 
 	devt->r82xx_c.max_i2c_msg_len = 8;
@@ -4184,6 +4190,11 @@ const char * rtlsdr_get_opt_help(int longInfo)
 		"\t\t                        0: use I & Q; 1: use I; 2: use Q; 3: use I below threshold frequency;\n"
 		"\t\t                        4: use Q below threshold frequency (=RTL-SDR v3)\n"
 		"\t\t                        other values set the threshold frequency\n"
+#if ENABLE_VCO_OPTIONS
+		"\t\tvcocmin=<current>     set R820T/2 VCO current min: 0..7: higher value is more current\n"
+		"\t\tvcocmax=<current>     set R820T/2 VCO current max: 0..7\n"
+		"\t\tvcoalgo=<algo>        set R820T/2 VCO algorithm. 0: default. 1: with vcomax=3.9G. 2: Youssef/Carl\n"
+#endif
 		"\t\tTp=<gpio_pin>         set GPIO pin for Bias T, default =0 for rtl-sdr.com compatible V3\n"
 		"\t\tT=<bias_tee>          1 activates power at antenna one some dongles, e.g. rtl-sdr.com's V3\n"
 #ifdef WITH_UDP_SERVER
@@ -4196,7 +4207,12 @@ const char * rtlsdr_get_opt_help(int longInfo)
 		"\t[-O\tset RTL options string seperated with ':', e.g. -O 'bc=30000:agc=0' ]\n"
 		"\t\tverbose:f=<freqHz>:bw=<bw_in_kHz>:bc=<if_in_Hz>:sb=<sideband>\n"
 		"\t\tagc=<tuner_gain_mode>:gain=<tenth_dB>:ifm=<tuner_if_mode>:dagc=<rtl_agc>\n"
+#if ENABLE_VCO_OPTIONS
+		"\t\tds=<direct_sampling>:dm=<ds_mode_thresh>:vcocmin=<c>:vcocmax=<c>:vcoalgo=<a>\n"
+		"\t\tT=<bias_tee>\n"
+#else
 		"\t\tds=<direct_sampling>:dm=<ds_mode_thresh>:T=<bias_tee>\n"
+#endif
 #ifdef WITH_UDP_SERVER
 		"\t\tport=<udp_port default with 1>\n"
 #endif
@@ -4314,6 +4330,47 @@ int rtlsdr_set_opt_string(rtlsdr_dev_t *dev, const char *opts, int verbose)
 				dev->direct_sampling_threshold = dm;
 			ret = rtlsdr_set_ds_mode(dev, dev->direct_sampling_mode, dev->direct_sampling_threshold);
 		}
+#if ENABLE_VCO_OPTIONS
+		else if (!strncmp(optPart, "vcocmin=", 8)) {
+			int current = atoi(optPart +8);
+			if ( 0 <= current && current <= 7 )
+			{
+				dev->r82xx_c.vco_curr_min = 7 - current;
+				ret = 0;
+				if (verbose)
+					fprintf(stderr, "\nrtlsdr_set_opt_string(): parsed vcocmin config %d\n", current);
+			} else if (verbose) {
+				fprintf(stderr, "\nrtlsdr_set_opt_string(): error parsing vcocmin config: valid range 0 .. 7\n");
+				ret = 1;
+			}
+		}
+		else if (!strncmp(optPart, "vcocmax=", 8)) {
+			int current = atoi(optPart +8);
+			if ( 0 <= current && current <= 7 )
+			{
+				dev->r82xx_c.vco_curr_max = 7 - current;
+				ret = 0;
+				if (verbose)
+					fprintf(stderr, "\nrtlsdr_set_opt_string(): parsed vcocmax config %d\n", current);
+			} else if (verbose) {
+				fprintf(stderr, "\nrtlsdr_set_opt_string(): error parsing vcocmax config: valid range 0 .. 7\n");
+				ret = 1;
+			}
+		}
+		else if (!strncmp(optPart, "vcoalgo=", 8)) {
+			int algo = atoi(optPart +8);
+			if ( 0 <= algo && algo <= 2 )
+			{
+				dev->r82xx_c.vco_curr_max = algo;
+				ret = 0;
+				if (verbose)
+					fprintf(stderr, "\nrtlsdr_set_opt_string(): parsed vcoalgo config %d\n", algo);
+			} else if (verbose) {
+				fprintf(stderr, "\nrtlsdr_set_opt_string(): error parsing vcoalgo config: valid range 0 .. 2\n");
+				ret = 1;
+			}
+		}
+#endif
 		else if (!strncmp(optPart, "tp=", 3) || !strncmp(optPart, "Tp=", 3) || !strncmp(optPart, "TP=", 3) ) {
 			int gpio_pin_no = atoi(optPart +3);
 			if (verbose)

src/rtl_test.c

@@ -107,6 +107,8 @@ void usage(void)
 		"\t[-d device_index or serial (default: 0)]\n"
 		"%s"
 		"\t[-t enable tuner range benchmark]\n"
+		"\t[-f first/begin frequency for tuner range benchmark, default: 0]\n"
+		"\t[-e end frequency for tuner range benchmark, default: 3e9 = 3G ]\n"
 #ifndef _WIN32
 		"\t[-p[seconds] enable PPM error measurement (default: 10 seconds)]\n"
 #endif
@@ -338,9 +340,9 @@ static int set_center_freq_wait(rtlsdr_dev_t *dev, uint32_t freq, const char * s
 }
 
 
-void tuner_benchmark(void)
+void tuner_benchmark(uint32_t beg_freq, uint32_t end_freq)
 {
-	uint32_t current = max_step(0);
+	uint32_t current = beg_freq; /* max_step(0); */
 	uint32_t band_start = 0;
 	uint32_t low_bound = 0, high_bound = 0;
 	int rc;
@@ -357,16 +359,16 @@ void tuner_benchmark(void)
 	 */
 
 	/* handle bands starting at 0Hz */
-	rc = set_center_freq_wait(dev, 0, "FIND_START");
+	rc = set_center_freq_wait(dev, current, "FIND_START");
 	if (rc < 0)
 		state = FIND_START;
 	else {
-		band_start = 0;
+		band_start = current;
 		report_band_start(band_start);
 		state = FIND_END;
 	}
 
-	while (current < 3e9 && !do_exit) {
+	while (current < end_freq && !do_exit) {
 		switch (state) {
 		case FIND_START:
 			/* scanning for the start of a new band */
@@ -508,10 +510,12 @@ int main(int argc, char **argv)
 	int dev_index = 0;
 	int dev_given = 0;
 	uint32_t out_block_size = DEFAULT_BUF_LENGTH;
+	uint32_t tuner_bench_beg_freq = 0;
+	uint32_t tuner_bench_end_freq = 0;
 	int count;
 	int gains[100];
 
-	while ((opt = getopt(argc, argv, "d:s:b:O:tp::Sh")) != -1) {
+	while ((opt = getopt(argc, argv, "d:s:b:O:tf:e:p::Sh")) != -1) {
 		switch (opt) {
 		case 'd':
 			dev_index = verbose_device_search(optarg);
@@ -529,6 +533,12 @@ int main(int argc, char **argv)
 		case 't':
 			test_mode = TUNER_BENCHMARK;
 			break;
+		case 'f':
+			tuner_bench_beg_freq = (uint32_t)atofs(optarg);
+			break;
+		case 'e':
+			tuner_bench_end_freq = (uint32_t)atofs(optarg);
+			break;
 		case 'p':
 			test_mode = PPM_BENCHMARK;
 			if (optarg)
@@ -598,7 +608,7 @@ int main(int argc, char **argv)
 	}
 
 	if (test_mode == TUNER_BENCHMARK) {
-		tuner_benchmark();
+		tuner_benchmark(tuner_bench_beg_freq, tuner_bench_end_freq);
 		goto exit;
 	}