From: Uwe Hermann <redacted>
Date: Thu, 4 Aug 2016 15:24:00 +0000 (+0200)
Subject: hantek-6022be/sainsmart-dds120: Hook up correct per-device VID/PID.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.4~21
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bb9fd89f1c2668855475a441e1a5f2092a10fa3a;p=sigrok-firmware-fx2lafw.git

hantek-6022be/sainsmart-dds120: Hook up correct per-device VID/PID.
---

diff --git a/Makefile.am b/Makefile.am
index 1659723c..de51b1b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -301,8 +301,8 @@ hw/cypress-fx2/dscr.rel: hw/cypress-fx2/$(dirstamp) include/dscr.inc
 hw/saleae-logic/dscr.rel: hw/saleae-logic/$(dirstamp) include/dscr.inc
 hw/sigrok-fx2-8ch/dscr.rel: hw/sigrok-fx2-8ch/$(dirstamp) include/dscr.inc
 hw/sigrok-fx2-16ch/dscr.rel: hw/sigrok-fx2-16ch/$(dirstamp) include/dscr.inc
-hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr.inc
-hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp) include/dscr.inc
+hw/hantek-6022be/dscr.rel: hw/hantek-6022be/$(dirstamp) include/dscr_hantek_6022be.inc
+hw/sainsmart-dds120/dscr.rel: hw/sainsmart-dds120/$(dirstamp) include/dscr_hantek_6022be.inc
 
 
 # Create build subdirectories
diff --git a/hw/hantek-6022be/dscr.a51 b/hw/hantek-6022be/dscr.a51
new file mode 100644
index 00000000..360d0aea
--- /dev/null
+++ b/hw/hantek-6022be/dscr.a51
@@ -0,0 +1,24 @@
+;;
+;; This file is part of the sigrok-firmware-fx2lafw project.
+;;
+;; Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+;;
+
+VID = 0xb504	; Manufacturer ID (0x04b5)
+PID = 0x2260	; Product ID (0x6022)
+
+.include "dscr_hantek_6022be.inc"
diff --git a/hw/sainsmart-dds120/dscr.a51 b/hw/sainsmart-dds120/dscr.a51
new file mode 100644
index 00000000..1a6952a2
--- /dev/null
+++ b/hw/sainsmart-dds120/dscr.a51
@@ -0,0 +1,24 @@
+;;
+;; This file is part of the sigrok-firmware-fx2lafw project.
+;;
+;; Copyright (C) 2016 Uwe Hermann <uwe@hermann-uwe.de>
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+;;
+
+VID = 0x501d	; Manufacturer ID (0x1d50)
+PID = 0x8e60	; Product ID (0x608e)
+
+.include "dscr_hantek_6022be.inc"
diff --git a/include/dscr_hantek_6022be.inc b/include/dscr_hantek_6022be.inc
index 8e464ee9..03ffa54b 100644
--- a/include/dscr_hantek_6022be.inc
+++ b/include/dscr_hantek_6022be.inc
@@ -60,8 +60,8 @@ _dev_dscr:
 	.db	0xff					  ; subclass (vendor specific)
 	.db	0xff					  ; protocol (vendor specific)
 	.db	64						  ; packet size (ep0)
-	.dw	0xB504					  ; vendor id 
-	.dw	0x2260					  ; product id
+	.dw	VID					  ; vendor id 
+	.dw	PID					  ; product id
 	.dw	0x0000					  ; version id
 	.db	1		                  ; manufacturure str idx				
 	.db	2				          ; product str idx