X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Fdscr.inc;h=d4327ba9f496273ce688c20f005692057ec370f1;hb=e1c5ba21853765725d723efdef22bedef7cfecc6;hp=5384160a849f5b1dfa1655e6e0e62bcc7a3b2287;hpb=b68bc8eaca5454a158a0472afe45aac8c7f20717;p=sigrok-firmware-fx2lafw.git

diff --git a/include/dscr.inc b/include/dscr.inc
index 5384160a..d4327ba9 100644
--- a/include/dscr.inc
+++ b/include/dscr.inc
@@ -15,10 +15,11 @@
 ;; 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
+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 ;;
 
+.include "common.inc"
+
 .module DEV_DSCR
 
 ; Descriptor types
@@ -58,7 +59,7 @@ _dev_dscr:
 	.dw	0x0100			; Product version (0.01)
 	.db	1			; Manufacturer string index
 	.db	2			; Product string index
-	.db	0			; Serial number string index (none)
+	.db	3			; Serial number string index (none)
 	.db	1			; Number of configurations
 dev_dscr_end:
 
@@ -164,24 +165,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"