From c6f6e69024bd21e99f5f8673dce2399c4bfd8bb8 Mon Sep 17 00:00:00 2001
From: "U-CERVELO\\ttsou" <ttsou@CERVELO.(none)>
Date: Fri, 11 Sep 2009 15:35:28 -0400
Subject: [PATCH] changes to build on windows / cygwin

---
 usrp/host/lib/Makefile.am             | 5 ++++-
 usrp/host/lib/fusb.cc                 | 6 +++---
 usrp/host/lib/fusb.h                  | 2 +-
 usrp/host/lib/fusb_sysconfig_win32.cc | 2 +-
 usrp/host/lib/fusb_win32.cc           | 6 +++---
 usrp/host/lib/usrp_basic_common.cc    | 6 +++---
 usrp/host/lib/usrp_basic_libusb.cc    | 6 +++---
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 4dd47595..7c5dc25a 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -74,7 +74,10 @@ darwin_CODE =				\
 
 win32_CODE =				\
 	fusb_win32.cc			\
-	fusb_sysconfig_win32.cc 	
+	fusb_sysconfig_win32.cc 	\
+	usrp_prims_libusb.cc		\
+	usrp_basic_libusb.cc
+
 
 linux_CODE =				\
 	fusb_linux.cc			\
diff --git a/usrp/host/lib/fusb.cc b/usrp/host/lib/fusb.cc
index ce4bb7aa..0bd9ded5 100644
--- a/usrp/host/lib/fusb.cc
+++ b/usrp/host/lib/fusb.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+//#ifdef HAVE_CONFIG_H
+//#include "config.h"
+//#endif
 
 #include <fusb.h>
 
diff --git a/usrp/host/lib/fusb.h b/usrp/host/lib/fusb.h
index 00bdffcc..341e570a 100644
--- a/usrp/host/lib/fusb.h
+++ b/usrp/host/lib/fusb.h
@@ -65,7 +65,7 @@ public:
 					int block_size = 0, int nblocks = 0) = 0;
   
   // ACCESSORS
-  libusb_device_handle *get_libusb_device_handle () const { return d_udh; }
+  libusb_device_handle *get_usb_dev_handle () const { return d_udh; }
 };
 
 
diff --git a/usrp/host/lib/fusb_sysconfig_win32.cc b/usrp/host/lib/fusb_sysconfig_win32.cc
index 16eaaa64..a0d14054 100644
--- a/usrp/host/lib/fusb_sysconfig_win32.cc
+++ b/usrp/host/lib/fusb_sysconfig_win32.cc
@@ -27,7 +27,7 @@ static const int MAX_BLOCK_SIZE = 64 * 1024;		// Windows kernel hard limit
 static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);	// 2 MB
 	
 fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
+fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {
   return new fusb_devhandle_win32 (udh);
 }
diff --git a/usrp/host/lib/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc
index 8900576d..7b11bb91 100644
--- a/usrp/host/lib/fusb_win32.cc
+++ b/usrp/host/lib/fusb_win32.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+//#ifdef HAVE_CONFIG_H
+//#include "config.h"
+//#endif
 
 #include <fusb_win32.h>
 #include <usb.h>
diff --git a/usrp/host/lib/usrp_basic_common.cc b/usrp/host/lib/usrp_basic_common.cc
index 79e5b07e..ad1eca56 100644
--- a/usrp/host/lib/usrp_basic_common.cc
+++ b/usrp/host/lib/usrp_basic_common.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+//#ifdef HAVE_CONFIG_H
+//#include "config.h"
+//#endif
 
 #include "usrp/usrp_basic.h"
 #include "usrp/usrp_prims.h"
diff --git a/usrp/host/lib/usrp_basic_libusb.cc b/usrp/host/lib/usrp_basic_libusb.cc
index c788cc05..c4842cac 100644
--- a/usrp/host/lib/usrp_basic_libusb.cc
+++ b/usrp/host/lib/usrp_basic_libusb.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+//#ifdef HAVE_CONFIG_H
+//#include "config.h"
+//#endif
 
 #include <usrp/usrp_basic.h>
 #include "usrp/usrp_prims.h"
-- 
2.30.2