forked from sdr/rtl-sdr
1
0
Fork 0

Add pathes used in SatNOGS fork

This commit is contained in:
Fabian P. Schmidt 2024-02-16 17:44:00 +01:00
parent af33886796
commit 0af694721f
2 changed files with 53 additions and 0 deletions

View File

@ -0,0 +1,19 @@
Index: rtl-sdr-0.6/src/librtlsdr.c
===================================================================
--- rtl-sdr-0.6.orig/src/librtlsdr.c
+++ rtl-sdr-0.6/src/librtlsdr.c
@@ -1525,11 +1525,9 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev,
dev->rtl_xtal = DEF_RTL_XTAL_FREQ;
- /* perform a dummy write, if it fails, reset the device */
- if (rtlsdr_write_reg(dev, USBB, USB_SYSCTL, 0x09, 1) < 0) {
- fprintf(stderr, "Resetting device...\n");
- libusb_reset_device(dev->devh);
- }
+ /* Reset the device before initialization */
+ fprintf(stderr, "Resetting device...\n");
+ libusb_reset_device(dev->devh);
rtlsdr_init_baseband(dev);
dev->dev_lost = 0;

View File

@ -0,0 +1,34 @@
Index: rtl-sdr-0.6/src/librtlsdr.c
===================================================================
--- rtl-sdr-0.6.orig/src/librtlsdr.c
+++ rtl-sdr-0.6/src/librtlsdr.c
@@ -365,7 +365,7 @@ static rtlsdr_dongle_t known_devices[] =
#define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN)
#define CTRL_OUT (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT)
#define CTRL_TIMEOUT 300
-#define BULK_TIMEOUT 0
+#define BULK_TIMEOUT 10000
#define EEPROM_ADDR 0xa0
@@ -1654,6 +1654,10 @@ int rtlsdr_close(rtlsdr_dev_t *dev)
rtlsdr_deinit_baseband(dev);
}
+ else {
+ fprintf(stderr, "Resetting device...\n");
+ libusb_reset_device(dev->devh);
+ }
libusb_release_interface(dev->devh, 0);
@@ -1706,7 +1710,8 @@ static void LIBUSB_CALL _libusb_callback
dev->xfer_errors = 0;
} else if (LIBUSB_TRANSFER_CANCELLED != xfer->status) {
#ifndef _WIN32
- if (LIBUSB_TRANSFER_ERROR == xfer->status)
+ if (LIBUSB_TRANSFER_ERROR == xfer->status ||
+ LIBUSB_TRANSFER_TIMED_OUT == xfer->status)
dev->xfer_errors++;
if (dev->xfer_errors >= dev->xfer_buf_num ||