Merge pull request #1 from librtlsdr/BWChanges

Bandwidth Changes

Author: racerxdl

.gitignore

@@ -41,4 +41,13 @@ CMakeFiles
 *.cmake
 build
 
+**/*.o
+**/*.so*
+**/*.a
+src/rtl_adsb
+src/rtl_eeprom
+src/rtl_fm
+src/rtl_power
+src/rtl_test
+
 debianize/*.deb

include/rtl-sdr.h

@@ -26,6 +26,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <rtl-sdr_export.h>
+#include <rtl_tcp.h>
 
 typedef struct rtlsdr_dev rtlsdr_dev_t;
 
@@ -220,9 +221,14 @@ RTLSDR_API int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain);
  *
  * \param dev the device handle given by rtlsdr_open()
  * \param bw bandwidth in Hz. Zero means automatic BW selection.
+ * \param applied_bw is applied bandwidth in Hz, or 0 if unknown
+ * \param apply_bw: 1 to really apply configure the tuner chip; 0 for just returning applied_bw
  * \return 0 on success
  */
-RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw);
+RTLSDR_API int rtlsdr_set_and_get_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw, uint32_t *applied_bw, int apply_bw );
+
+RTLSDR_API int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw );
+
 
 /*!
  * Get actual gain the device is configured to.

include/rtl_tcp.h

@@ -0,0 +1,51 @@
+/*
+ * rtl-sdr, turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+ * Copyright (C) 2012-2013 by Steve Markgraf <[email protected]>
+ * Copyright (C) 2012 by Dimitri Stolnikov <[email protected]>
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RTL_TCP_H
+#define __RTL_TCP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * This enum defines the possible commands in rtl_tcp
+ */
+enum RTL_TCP_COMMANDS {
+    SET_FREQUENCY             = 0x01,
+    SET_SAMPLE_RATE           = 0x02,
+    SET_GAIN_MODE             = 0x03,
+    SET_GAIN                  = 0x04,
+    SET_FREQUENCY_CORRECTION  = 0x05,
+    SET_IF_STAGE              = 0x06,
+    SET_TEST_MODE             = 0x07,
+    SET_AGC_MODE              = 0x08,
+    SET_DIRECT_SAMPLING       = 0x09,
+    SET_OFFSET_TUNING         = 0x0A,
+    SET_RTL_CRYSTAL           = 0x0B,
+    SET_TUNER_CRYSTAL         = 0x0C,
+    SET_TUNER_GAIN_BY_INDEX   = 0x0D,
+    SET_TUNER_BANDWIDTH       = 0x0E
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/tuner_r82xx.h

@@ -115,6 +115,6 @@ int r82xx_set_freq(struct r82xx_priv *priv, uint32_t freq);
 //int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain);
 int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain, int extended_mode, int lna_gain, int mixer_gain, int vga_gain);
 
-int r82xx_set_bandwidth(struct r82xx_priv *priv, int bandwidth,  uint32_t rate);
+int r82xx_set_bandwidth(struct r82xx_priv *priv, int bandwidth,  uint32_t rate, uint32_t * applied_bw, int apply);
 
 #endif

src/convenience/convenience.c

@@ -160,6 +160,22 @@ int verbose_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate)
 	return r;
 }
 
+int verbose_set_bandwidth(rtlsdr_dev_t *dev, uint32_t bandwidth)
+{
+  int r;
+  uint32_t applied_bw = 0;
+  /* r = rtlsdr_set_tuner_bandwidth(dev, bandwidth); */
+  r = rtlsdr_set_and_get_tuner_bandwidth(dev, bandwidth, &applied_bw, 1 /* =apply_bw */);
+  if (r < 0) {
+    fprintf(stderr, "WARNING: Failed to set bandwidth.\n");
+  } else if (bandwidth > 0) {
+    fprintf(stderr, "Bandwidth set to %u Hz resulted in %u Hz.\n", bandwidth, applied_bw);
+  } else {
+    fprintf(stderr, "Bandwidth set to automatic resulted in %u Hz.\n", applied_bw);
+  }
+  return r;
+}
+
 int verbose_direct_sampling(rtlsdr_dev_t *dev, int on)
 {
 	int r;

src/convenience/convenience.h

@@ -77,6 +77,17 @@ int verbose_set_frequency(rtlsdr_dev_t *dev, uint32_t frequency);
 
 int verbose_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate);
 
+/*!
+ * Set device bandwidth and report status on stderr
+ *
+ * \param dev the device handle given by rtlsdr_open()
+ * \param frequency in Hz
+ * \return 0 on success
+ */
+
+int verbose_set_bandwidth(rtlsdr_dev_t *dev, uint32_t bandwidth);
+
+
 /*!
  * Enable or disable the direct sampling mode and report status on stderr
  *