From baa63aa608383a2b08134e290aae520c6e9ea08f Mon Sep 17 00:00:00 2001 From: oharboe Date: Sun, 12 Jul 2009 19:31:13 +0000 Subject: [PATCH] Xiaofan Chen retire obsolete patch. OpenOCD only supports 0.14 and newer and the patch was for 0.14. git-svn-id: svn://svn.berlios.de/openocd/trunk@2511 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- contrib/libftdi/README | 7 ------- contrib/libftdi/libftdi-0.12_win32.patch | 20 -------------------- 2 files changed, 27 deletions(-) delete mode 100644 contrib/libftdi/README delete mode 100644 contrib/libftdi/libftdi-0.12_win32.patch diff --git a/contrib/libftdi/README b/contrib/libftdi/README deleted file mode 100644 index 475c4e559..000000000 --- a/contrib/libftdi/README +++ /dev/null @@ -1,7 +0,0 @@ -libftdi can be built to work under win32 (cygwin/mingw) after applying the patch in this directory. - -The issue is caused by windows requiring usb_set_configuration to be called before the usb_claim_interface. - -Spen -spen@spen-soft.co.uk - diff --git a/contrib/libftdi/libftdi-0.12_win32.patch b/contrib/libftdi/libftdi-0.12_win32.patch deleted file mode 100644 index 426523c7b..000000000 --- a/contrib/libftdi/libftdi-0.12_win32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/ftdi.c.orig Wed Apr 16 16:24:30 2008 -+++ src/ftdi.c Thu May 01 20:19:46 2008 -@@ -358,6 +358,17 @@ - if (usb_detach_kernel_driver_np(ftdi->usb_dev, ftdi->interface) != 0 && errno != ENODATA) - detach_errno = errno; - #endif -+ -+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+ if (usb_set_configuration(ftdi->usb_dev, 1) != 0) { -+ usb_close (ftdi->usb_dev); -+ if (detach_errno == EPERM) { -+ ftdi_error_return(-8, "inappropriate permissions on device!"); -+ } else { -+ ftdi_error_return(-5, "unable to set configuration"); -+ } -+ } -+#endif - - if (usb_claim_interface(ftdi->usb_dev, ftdi->interface) != 0) { - usb_close (ftdi->usb_dev);