From c62085a66bd97f389f49167492f7dccfb0b02976 Mon Sep 17 00:00:00 2001
From: ttsou
Date: Thu, 27 Aug 2009 18:13:54 -0400
Subject: first shot at re-adding libusb-0.12 support

---
 usrp/host/lib/fusb_sysconfig_linux.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'usrp/host/lib/fusb_sysconfig_linux.cc')

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index 3c2f59375..8f56f61e2 100644
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -33,6 +33,12 @@ fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
   return new fusb_devhandle_linux (udh);
 }
 
+fusb_devhandle *
+fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
+{
+  return new fusb_devhandle_linux (udh);
+}
+
 int fusb_sysconfig::max_block_size ()
 {
   return MAX_BLOCK_SIZE;
-- 
cgit 


From fff854782eb2fbfc2a49e07ed9941b3beccc3e83 Mon Sep 17 00:00:00 2001
From: Thomas Tsou
Date: Wed, 9 Sep 2009 18:52:34 -0400
Subject: Fixed swig and usrp apps to work with libusb-0.12 and libusb-1.0 plus
 minor cleanup

---
 usrp/host/lib/fusb_sysconfig_linux.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usrp/host/lib/fusb_sysconfig_linux.cc')

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index 8f56f61e2..d4bbfea76 100644
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -36,7 +36,7 @@ fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {
-  return new fusb_devhandle_linux (udh);
+  make_devhandle (udh); 
 }
 
 int fusb_sysconfig::max_block_size ()
-- 
cgit 


From 98b30a4fc683d91458ccaefeaafbc8f4b783d17e Mon Sep 17 00:00:00 2001
From: ttsou
Date: Thu, 10 Sep 2009 15:08:16 -0400
Subject: Use default arguments instead of overloaded virtual constructors for
 cleaner interface

---
 usrp/host/lib/fusb_sysconfig_linux.cc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'usrp/host/lib/fusb_sysconfig_linux.cc')

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index d4bbfea76..5b9bfb24a 100644
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -27,12 +27,6 @@ static const int MAX_BLOCK_SIZE     =  16 * 1024;	// hard limit
 static const int DEFAULT_BLOCK_SIZE =   4 * 1024;	// fewer kernel memory problems
 static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB
 
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
-{
-  return new fusb_devhandle_linux (udh);
-}
-
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {
-- 
cgit 


From 2c30dff7d519987a0f239f29f09e340d203c0148 Mon Sep 17 00:00:00 2001
From: ttsou
Date: Sun, 13 Sep 2009 18:44:04 -0400
Subject: Fix glitch from previous commit

---
 usrp/host/lib/fusb_sysconfig_linux.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usrp/host/lib/fusb_sysconfig_linux.cc')

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index 5b9bfb24a..c2e453881 100644
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -30,7 +30,7 @@ static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {
-  make_devhandle (udh); 
+  return new fusb_devhandle_linux (udh); 
 }
 
 int fusb_sysconfig::max_block_size ()
-- 
cgit 


From f4a86ccaa23e7e513dbbfa45456ea5783c106ec0 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Thu, 1 Oct 2009 13:51:03 -0700
Subject: Cleanup in preparation for merge

Fix trailing whitespace
Use standard include guards
Add more missing config.h includes
Fixup emacs mode strings
Update copyright notices
---
 usrp/host/lib/fusb_sysconfig_linux.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'usrp/host/lib/fusb_sysconfig_linux.cc')

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index c2e453881..e33b90ba4 100644
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
- * 
+ * Copyright 2003,2009 Free Software Foundation, Inc.
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio 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 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -30,7 +30,7 @@ static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {
-  return new fusb_devhandle_linux (udh); 
+  return new fusb_devhandle_linux (udh);
 }
 
 int fusb_sysconfig::max_block_size ()
-- 
cgit