Package: bladerf / 0.2017.12~rc1-2

0006-host-libbladeRF-fix-line-endings-on-libusb.c-log-msg.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
From 8b420ebccc78aebcf721195382f1bfc4a20ab1d2 Mon Sep 17 00:00:00 2001
From: Rey Tucker <rey.tucker@nuand.com>
Date: Wed, 13 Dec 2017 14:08:30 -0500
Subject: [PATCH 06/15] host: libbladeRF: fix line endings on libusb.c log msgs

---
 host/libraries/libbladeRF/src/backend/usb/libusb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/host/libraries/libbladeRF/src/backend/usb/libusb.c b/host/libraries/libbladeRF/src/backend/usb/libusb.c
index 3a58cec5..ca447205 100644
--- a/host/libraries/libbladeRF/src/backend/usb/libusb.c
+++ b/host/libraries/libbladeRF/src/backend/usb/libusb.c
@@ -931,7 +931,7 @@ static inline void cancel_all_transfers(struct bladerf_stream *stream)
 
             status = libusb_cancel_transfer(stream_data->transfers[i]);
             if (status < 0 && status != LIBUSB_ERROR_NOT_FOUND) {
-                log_error("Error canceling transfer (%d): %s\r\n",
+                log_error("Error canceling transfer (%d): %s\n",
                         status, libusb_error_name(status));
             } else {
                 stream_data->transfer_status[i] = TRANSFER_CANCEL_PENDING;
@@ -973,7 +973,7 @@ static void LIBUSB_CALL lusb_stream_cb(struct libusb_transfer *transfer)
            stream_data->transfer_status[transfer_i] == TRANSFER_CANCEL_PENDING);
 
     if (transfer_i >= stream_data->num_transfers) {
-        log_error("Unable to find transfer");
+        log_error("Unable to find transfer\n");
         stream->state = STREAM_SHUTTING_DOWN;
     } else {
         stream_data->transfer_status[transfer_i] = TRANSFER_AVAIL;
@@ -1083,7 +1083,7 @@ get_next_available_transfer(struct lusb_stream_data *stream_data)
                 stream_data->out_of_order_event == false) {
 
                 log_warning("Transfer callback occurred out of order. "
-                            "(Warning only this time.)\r\n");
+                            "(Warning only this time.)\n");
                 stream_data->out_of_order_event = true;
             }
 
@@ -1336,7 +1336,7 @@ int lusb_submit_stream_buffer(void *driver, struct bladerf_stream *stream,
     if (stream_data->num_avail == 0) {
         if (nonblock) {
             log_debug("Non-blocking buffer submission requested, but no "
-                      "transfers are currently available.");
+                      "transfers are currently available.\n");
 
             return BLADERF_ERR_WOULD_BLOCK;
         }
-- 
2.11.0