Merge branch 'pr-861/pinaraf/fix-stlink-no-mass-storage' into develop

Fixed stlink support with no mass storage (#861).
stlink-org · Feb 21, 2020 · 8cd3069 · 8cd3069
2 parents 364f241 + 0f293fd
commit 8cd3069
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -9,6 +9,9 @@ file(GLOB STLINK_HEADERS
 install(FILES ${CMAKE_SOURCE_DIR}/include/stlink.h
     DESTINATION ${STLINK_INCLUDE_PATH}
 )
+install(FILES ${CMAKE_SOURCE_DIR}/include/stm32.h
+    DESTINATION ${STLINK_INCLUDE_PATH}
+)
 install(FILES ${STLINK_HEADERS}
     DESTINATION ${STLINK_INCLUDE_PATH}/stlink
 )
diff --git a/include/stlink/usb.h b/include/stlink/usb.h
@@ -23,6 +23,7 @@ extern "C" {
 #define STLINK_USB_PID_STLINK_32L       0x3748
 #define STLINK_USB_PID_STLINK_32L_AUDIO 0x374a
 #define STLINK_USB_PID_STLINK_NUCLEO    0x374b
+#define STLINK_USB_PID_STLINK_NO_UMS    0x3752
 
 #define STLINK_SG_SIZE 31
 #define STLINK_CMD_SIZE 16

diff --git a/src/usb.c b/src/usb.c
@@ -827,7 +827,10 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST
             }
         }
 
-        if ((desc.idProduct == STLINK_USB_PID_STLINK_32L) || (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO) || (desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO)) {
+        if ((desc.idProduct == STLINK_USB_PID_STLINK_32L) || 
+            (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO) || 
+            (desc.idProduct == STLINK_USB_PID_STLINK_NO_UMS) || 
+            (desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO)) {
             struct libusb_device_handle *handle;
 
             ret = libusb_open(list[cnt], &handle);
@@ -901,7 +904,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[ST
 
     // TODO - could use the scanning techniq from stm8 code here...
     slu->ep_rep = 1 /* ep rep */ | LIBUSB_ENDPOINT_IN;
-    if (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO || desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO) {
+    if (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO || desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO || desc.idProduct == STLINK_USB_PID_STLINK_NO_UMS) {
         slu->ep_req = 1 /* ep req */ | LIBUSB_ENDPOINT_OUT;
     } else {
         slu->ep_req = 2 /* ep req */ | LIBUSB_ENDPOINT_OUT;
@@ -974,6 +977,7 @@ static size_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[]) {
 
         if (desc.idProduct != STLINK_USB_PID_STLINK_32L &&
             desc.idProduct != STLINK_USB_PID_STLINK_32L_AUDIO && 
+            desc.idProduct != STLINK_USB_PID_STLINK_NO_UMS && 
             desc.idProduct != STLINK_USB_PID_STLINK_NUCLEO)
             continue;
 
@@ -999,6 +1003,7 @@ static size_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[]) {
 
         if (desc.idProduct != STLINK_USB_PID_STLINK_32L && 
             desc.idProduct != STLINK_USB_PID_STLINK_32L_AUDIO && 
+            desc.idProduct != STLINK_USB_PID_STLINK_NO_UMS && 
             desc.idProduct != STLINK_USB_PID_STLINK_NUCLEO)
             continue;