Fixed upgrade tool to build against current libusb-win32.

upgrade/bindata.S

@@ -24,5 +24,5 @@ _bindata:
 	.incbin "../src/blackmagic.bin"
 
 _bindatalen:
-	.word . - _bindata
+	.long (. - _bindata)
 

upgrade/dfu.c

@@ -18,7 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <usb.h>
+#ifdef WIN32
+#   include <lusb0_usb.h>
+#else
+#   include <usb.h>
+#endif
 
 #include "dfu.h"
 

upgrade/main.c

@@ -18,8 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stdio.h>
-#include <usb.h>
 #include <string.h>
+#ifdef WIN32
+#   include <lusb0_usb.h>
+#else
+#   include <usb.h>
+#endif
 
 #include <assert.h>
 

upgrade/stm32mem.c

@@ -17,13 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <usb.h>
 #include <string.h>
 
 #ifdef WIN32
 #   include <windows.h>
+#   include <lusb0_usb.h>
 #else
 #   include <unistd.h>
+#   include <usb.h>
 #endif
 
 #include "dfu.h"

upgrade/stm32mem.h

@@ -20,7 +20,11 @@
 #ifndef __STM32MEM_H
 #define __STM32MEM_H
 
-#include <usb.h>
+#ifdef WIN32
+#   include <lusb0_usb.h>
+#else
+#   include <usb.h>
+#endif
 
 int stm32_mem_erase(usb_dev_handle *dev, uint16_t iface, uint32_t addr);
 int stm32_mem_write(usb_dev_handle *dev, uint16_t iface, void *data, int size);