Osmocom Open Build Service

commit_1261fbb285297da08f4620b18871b6d6d9ec2a7b.txt Deleted

commit_2f28c0f49852d62ab2a901a85d5de6f250c84033.txt Added

rtl-sdr_0.5.4.46.1261.dsc -> rtl-sdr_0.6.dsc Changed

rtl-sdr_0.5.4.46.1261.tar.xz/.tarball-version -> rtl-sdr_0.6.tar.xz/.tarball-version Changed

rtl-sdr_0.5.4.46.1261.tar.xz/debian/changelog -> rtl-sdr_0.6.tar.xz/debian/changelog Changed

rtl-sdr_0.5.4.46.1261.tar.xz/include/rtlsdr_i2c.h -> rtl-sdr_0.6.tar.xz/include/rtlsdr_i2c.h Changed

rtl-sdr_0.5.4.46.1261.tar.xz/src/rtl_sdr.c -> rtl-sdr_0.6.tar.xz/src/rtl_sdr.c Changed

@@ -55,6 +55,7 @@
 		"\t-b output_block_size (default: 16 * 16384)\n"
 		"\t-n number of samples to read (default: 0, infinite)\n"
 		"\t-S force sync output (default: async)\n"
+		"\t-D enable direct sampling (default: off)\n"
 		"\tfilename (a '-' dumps samples to stdout)\n\n");
 	exit(1);
 }
@@ -113,6 +114,7 @@
 	int r, opt;
 	int gain = 0;
 	int ppm_error = 0;
+	int direct_sampling = 0;
 	int sync_mode = 0;
 	FILE *file;
 	uint8_t *buffer;
@@ -122,7 +124,7 @@
 	uint32_t samp_rate = DEFAULT_SAMPLE_RATE;
 	uint32_t out_block_size = DEFAULT_BUF_LENGTH;
 
-	while ((opt = getopt(argc, argv, "d:f:g:s:b:n:p:S")) != -1) {
+	while ((opt = getopt(argc, argv, "d:f:g:s:b:n:p:SD")) != -1) {
 		switch (opt) {
 		case 'd':
 			dev_index = verbose_device_search(optarg);
@@ -149,6 +151,9 @@
 		case 'S':
 			sync_mode = 1;
 			break;
+		case 'D':
+			direct_sampling = 1;
+			break;
 		default:
 			usage();
 			break;
@@ -198,6 +203,11 @@
 #else
 	SetConsoleCtrlHandler( (PHANDLER_ROUTINE) sighandler, TRUE );
 #endif
+
+	/* Set direct sampling */
+        if (direct_sampling)
+                verbose_direct_sampling(dev, 2);
+
 	/* Set the sample rate */
 	verbose_set_sample_rate(dev, samp_rate);

rtl-sdr_0.5.4.46.1261.tar.xz/src/rtl_tcp.c -> rtl-sdr_0.6.tar.xz/src/rtl_tcp.c Changed

@@ -105,6 +105,7 @@
 	printf("\t-d device index (default: 0)\n");
 	printf("\t-P ppm_error (default: 0)\n");
 	printf("\t-T enable bias-T on GPIO PIN 0 (works for rtl-sdr.com v3 dongles)\n");
+	printf("\t-D enable direct sampling (default: off)\n");
 	exit(1);
 }
 
@@ -385,7 +386,7 @@
 	struct sockaddr_storage local, remote;
 	struct addrinfo *ai;
 	struct addrinfo *aiHead;
-	struct addrinfo  hints;
+	struct addrinfo  hints = { 0 };
 	char hostinfoNI_MAXHOST;
 	char portinfoNI_MAXSERV;
 	char remhostinfoNI_MAXHOST;
@@ -396,6 +397,7 @@
 	int dev_given = 0;
 	int gain = 0;
 	int ppm_error = 0;
+	int direct_sampling = 0;
 	struct llist *curelem,*prev;
 	pthread_attr_t attr;
 	void *status;
@@ -413,7 +415,7 @@
 	struct sigaction sigact, sigign;
 #endif
 
-	while ((opt = getopt(argc, argv, "a:p:f:g:s:b:n:d:P:T")) != -1) {
+	while ((opt = getopt(argc, argv, "a:p:f:g:s:b:n:d:P:TD")) != -1) {
 		switch (opt) {
 		case 'd':
 			dev_index = verbose_device_search(optarg);
@@ -446,6 +448,9 @@
 		case 'T':
 			enable_biastee = 1;
 			break;
+		case 'D':
+			direct_sampling = 1;
+			break;
 		default:
 			usage();
 			break;
@@ -482,6 +487,10 @@
 	SetConsoleCtrlHandler( (PHANDLER_ROUTINE) sighandler, TRUE );
 #endif
 
+	/* Set direct sampling */
+        if (direct_sampling)
+                verbose_direct_sampling(dev, 2);
+
 	/* Set the tuner error */
 	verbose_ppm_set(dev, ppm_error);
 
@@ -562,7 +571,7 @@
 		setsockopt(listensocket, SOL_SOCKET, SO_REUSEADDR, (char *)&r, sizeof(int));
 		setsockopt(listensocket, SOL_SOCKET, SO_LINGER, (char *)&ling, sizeof(ling));
 
-		if (bind(listensocket, (struct sockaddr *)&local, sizeof(local)))
+		if (bind(listensocket, (struct sockaddr *)&local, aiHead->ai_addrlen))
 			fprintf(stderr, "rtl_tcp bind error: %s", strerror(errno));
 		else
 			break;

rtl-sdr_0.5.4.46.1261.tar.xz/src/tuner_r82xx.c -> rtl-sdr_0.6.tar.xz/src/tuner_r82xx.c Changed

Changes of Revision 4