X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Fdscr_hantek_6022be.inc;h=c7dee45199cccf21c00b355bfdcf25bdd92ab119;hb=eb52aca4c6382ec0bb4f7236c494a16c9fd62b01;hp=0f8eb0084bb161287cd4629db944f61d45577047;hpb=b68bc8eaca5454a158a0472afe45aac8c7f20717;p=sigrok-firmware-fx2lafw.git

diff --git a/include/dscr_hantek_6022be.inc b/include/dscr_hantek_6022be.inc
index 0f8eb008..c7dee451 100644
--- a/include/dscr_hantek_6022be.inc
+++ b/include/dscr_hantek_6022be.inc
@@ -14,10 +14,11 @@
 ;; Lesser General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+;; License along with this library; if not, see <http://www.gnu.org/licenses/>.
 ;;
 
+.include "common.inc"
+
 .module DEV_DSCR
 
 ; Descriptor types
@@ -54,10 +55,10 @@ _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)
+	.db	3			; Serial number string index
 	.db	1			; Number of configurations
 dev_dscr_end:
 
@@ -347,24 +348,7 @@ fullspd_dscr_realend:
 _dev_strings:
 
 ; See http://www.usb.org/developers/docs/USB_LANGIDs.pdf for the full list.
-_string0:
-	.db	string0end - _string0
-	.db	DSCR_STRING_TYPE
-	.db	0x09, 0x04		; Language code 0x0409 (English, US)
-string0end:
-
-_string1:
-	.db	string1end - _string1
-	.db	DSCR_STRING_TYPE
-	.ascii	's\0i\0g\0r\0o\0k\0'
-string1end:
-
-_string2:
-	.db	string2end - _string2
-	.db	DSCR_STRING_TYPE
-	.ascii	'f\0x\0002\0l\0a\0f\0w\0'
-string2end:
-
-_dev_strings_end:
-	.dw	0x0000
+string_descriptor_lang 0 0x0409 ; Language code 0x0409 (English, US)
 
+string_descriptor_a 1,^"sigrok"
+string_descriptor_a 2,^"fx2lafw"