From 2cbc9b29f30ea418b0adae94b385dc49dac473aa Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 5 May 2017 00:34:28 +0200 Subject: [PATCH] use same USB Product ID for DFU and runtime mode This was introduced for interoperability with operating systems that might prefer such setup (I heard that Windows prefers this about a decade ago, but I don't have any personal experience with it). However, using different VID/PID between DFU and RT breaks usability of dfu-util, and I really think this matters much more to our users and developers. --- .gitmodules | 3 --- firmware/libboard/common/include/board_common.h | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 487a2ae6..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "usb_application/pysim"] - path = usb_application/pysim - url = git://git.osmocom.org/pysim diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index aeb09079..cfcc49e5 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -103,12 +103,12 @@ #define BOARD_USB_ENDPOINTS_BANKS(i) (((i == 0) || (i == 3)) ? 1 : 2) #define USB_VENDOR_OPENMOKO 0x1d50 -#define USB_PRODUCT_OWHW_SAM3_DFU 0x4000 +#define USB_PRODUCT_OWHW_SAM3_DFU 0x4001 /* was 0x4000 */ #define USB_PRODUCT_OWHW_SAM3 0x4001 #define USB_PRODUCT_QMOD_HUB 0x4002 -#define USB_PRODUCT_QMOD_SAM3_DFU 0x4003 +#define USB_PRODUCT_QMOD_SAM3_DFU 0x4004 /* was 0x4003 */ #define USB_PRODUCT_QMOD_SAM3 0x4004 -#define USB_PRODUCT_SIMTRACE2_DFU 0x60e2 +#define USB_PRODUCT_SIMTRACE2_DFU 0x60e3 /* was 0x60e2 */ #define USB_PRODUCT_SIMTRACE2 0x60e3 #define BOARD_USB_DFU