Support for "STM32+Audio" v2-1 firmware (#790)

* Add pid for "STM32+Audio" v2-1 firmware * Add support for "STM32+Audio" v2-1 firmware,. * Add udev rules for "STM32+Audio" firmware
stlink-org · Apr 13, 2019 · feb8661 · feb8661
1 parent 224f6ee
commit feb8661
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/etc/udev/rules.d/49-stlinkv2-1.rules b/etc/udev/rules.d/49-stlinkv2-1.rules
@@ -2,6 +2,10 @@
 # ie, STM32F0, STM32F4.
 # STM32VL has st/linkv1, which is quite different
 
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374a", \
+    MODE:="0666", \
+    SYMLINK+="stlinkv2-1_%n"
+
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", \
     MODE:="0666", \
     SYMLINK+="stlinkv2-1_%n"

diff --git a/include/stlink/usb.h b/include/stlink/usb.h
@@ -18,10 +18,11 @@
 extern "C" {
 #endif
 
-#define STLINK_USB_VID_ST            0x0483
-#define STLINK_USB_PID_STLINK        0x3744
-#define STLINK_USB_PID_STLINK_32L    0x3748
-#define STLINK_USB_PID_STLINK_NUCLEO 0x374b
+#define STLINK_USB_VID_ST               0x0483
+#define STLINK_USB_PID_STLINK           0x3744
+#define STLINK_USB_PID_STLINK_32L       0x3748
+#define STLINK_USB_PID_STLINK_32L_AUDIO 0x374a
+#define STLINK_USB_PID_STLINK_NUCLEO    0x374b
 
 #define STLINK_SG_SIZE 31
 #define STLINK_CMD_SIZE 16

diff --git a/src/usb.c b/src/usb.c
@@ -827,7 +827,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16
             }
         }
 
-        if ((desc.idProduct == STLINK_USB_PID_STLINK_32L) || (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO)) {
+        if ((desc.idProduct == STLINK_USB_PID_STLINK_32L) || (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO) || (desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO)) {
             struct libusb_device_handle *handle;
 
             ret = libusb_open(list[cnt], &handle);
@@ -901,7 +901,7 @@ stlink_t *stlink_open_usb(enum ugly_loglevel verbose, bool reset, char serial[16
 
     // 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) {
+    if (desc.idProduct == STLINK_USB_PID_STLINK_NUCLEO || desc.idProduct == STLINK_USB_PID_STLINK_32L_AUDIO) {
         slu->ep_req = 1 /* ep req */ | LIBUSB_ENDPOINT_OUT;
     } else {
         slu->ep_req = 2 /* ep req */ | LIBUSB_ENDPOINT_OUT;
@@ -973,6 +973,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_NUCLEO)
             continue;
 
@@ -996,7 +997,8 @@ static size_t stlink_probe_usb_devs(libusb_device **devs, stlink_t **sldevs[]) {
             break;
         }
 
-        if (desc.idProduct != STLINK_USB_PID_STLINK_32L &&
+        if (desc.idProduct != STLINK_USB_PID_STLINK_32L && 
+            desc.idProduct != STLINK_USB_PID_STLINK_32L_AUDIO && 
             desc.idProduct != STLINK_USB_PID_STLINK_NUCLEO)
             continue;