Merge branch 'master' into 'master'

90-grdnt.rules

+# Guardant Stealth 2
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="0003",>MODE="0666"
 # Guardant ID
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0a89", ATTRS{idProduct}=="0002", MODE="0666"
 # Guardant Sign/Time

wine-grdwine/etc/grdnt.udev

@@ -12,4 +12,7 @@ SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0a89", SYSFS{idProduct
 # Guardant Code WinUsb
 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="00c3", MODE="0666"
 SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="00c3",	MODE="0666"
-
+# Guardant Stealth 2 USB
+# (for device created by udev in /dev/bus/usb)
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="0003", MODE="0666"
+SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="0a89", SYSFS{idProduct}=="0003",	MODE="0666"

wine-grdwine/etc/grdnt.usermap

 # module             match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
 grdnt                0x0003      0x0a89   0x0008    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 grdnt                0x0003      0x0a89   0x0009    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
-
+grdnt                0x0003      0x0a89   0x0003    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000

wine-grdwine/src/grdimpl_linux.c

@@ -46,6 +46,7 @@
 #define GRD_PRODID_S3C          0x09 /* Guardant Code USB */
 #define GRD_PRODID_S3C_HID      0x0D /* Guardant Code USB HID */
 #define GRD_PRODID_S3C_WINUSB   0xC3 /* Guardant Code USB (WINSUB) */
+#define GRD_PRODID_S2           0x03 /* Guardant Stealth 2 USB */
 #define USBFS_PATH_ENV          "USB_DEVFS_PATH"
 #define GRD_IPC_NAME_ENV        "GRD_IPC_NAME"
 #define USBFS_PATH_1            "/dev/bus/usb"
@@ -415,7 +416,7 @@ int grd_probe_device(const char* dev_path, unsigned int* prod_id)
         else
         {
             unsigned char p = 0;
-            unsigned char prod_ids[4] = {GRD_PRODID_S3S, GRD_PRODID_S3S_WINUSB, GRD_PRODID_S3C, GRD_PRODID_S3C_WINUSB};
+            unsigned char prod_ids[5] = {GRD_PRODID_S3S, GRD_PRODID_S3S_WINUSB, GRD_PRODID_S3C, GRD_PRODID_S3C_WINUSB, GRD_PRODID_S2};
             ret = -1;
             assert(sizeof(buf_tmpl) == 4);
             for (; p < sizeof(prod_ids); ++p)