Use the same VID/PID for Hantek 6022BE and SainSmart DDS120.

(one of the official sigrok VID/PIDs, 1D50:608E)

Encode the fact that they're different versions/revisions/variants
of the same device (more or less rebadges with only little changes)
in the USB product version field.

diff --git a/hw/hantek-6022be/dscr.a51 b/hw/hantek-6022be/dscr.a51
index 360d0aeaf87ceca957cbebaff7cb2161f69127fd..0f32a010ddfddc6a4c64871c81abe2f60ad9e596 100644 (file)
--- a/hw/hantek-6022be/dscr.a51
+++ b/hw/hantek-6022be/dscr.a51
@@ -18,7 +18,8 @@
 ;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ;;
 
-VID = 0xb504   ; Manufacturer ID (0x04b5)
-PID = 0x2260   ; Product ID (0x6022)
+VID = 0x501d   ; Manufacturer ID (0x1d50)
+PID = 0x8e60   ; Product ID (0x608e)
+VER = 0x0100   ; Product "version". 0x0001 == Hantek 6022BE.
 
 .include "dscr_hantek_6022be.inc"

diff --git a/hw/sainsmart-dds120/dscr.a51 b/hw/sainsmart-dds120/dscr.a51
index 1a6952a2e9738a3cafe2a7c30a6987c6c04df056..3e089c55054b4130fc121a84281a1e3e9cc7d592 100644 (file)
--- a/hw/sainsmart-dds120/dscr.a51
+++ b/hw/sainsmart-dds120/dscr.a51
@@ -20,5 +20,6 @@
 
 VID = 0x501d   ; Manufacturer ID (0x1d50)
 PID = 0x8e60   ; Product ID (0x608e)
+VER = 0x0200   ; Product "version". 0x0002 == SainSmart DDS120.
 
 .include "dscr_hantek_6022be.inc"

diff --git a/include/dscr_hantek_6022be.inc b/include/dscr_hantek_6022be.inc
index 696aa94bc2bbf286b1711b865e7f50fbf35e1160..71cdc44d2b64e33241635f84c3a2a5ace263cf6d 100644 (file)
--- a/include/dscr_hantek_6022be.inc
+++ b/include/dscr_hantek_6022be.inc
@@ -56,7 +56,7 @@ _dev_dscr:
        .db     64                      ; Max. EP0 packet size
        .dw     VID                     ; Manufacturer ID
        .dw     PID                     ; Product ID
-       .dw     0x0000                  ; Product version (0.00)
+       .dw     VER                     ; Product version/type
        .db     1                       ; Manufacturer string index
        .db     2                       ; Product string index
        .db     0                       ; Serial number string index (none)