Use VID/PID from Makefile in descriptors.

mithro · Nov 21, 2015 · 6a99d35 · 6a99d35
1 parent 680b485
commit 6a99d35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/bulkloop/descriptors.c b/examples/bulkloop/descriptors.c
@@ -10,8 +10,8 @@ __code __at(DSCR_AREA) struct usb_descriptors code_descriptors = {
 		.bDeviceSubClass	= USB_SUBCLASS_VENDOR_SPEC,
 		.bDeviceProtocol	= 0xff,
 		.bMaxPacketSize0	= 64,
-		.idVendor		= 0x04B4,
-		.idProduct		= 0x1004,
+		.idVendor		= DSCR_VID,
+		.idProduct		= DSCR_PID,
 		.bcdDevice		= 0x0001,
 		.iManufacturer		= USB_STRING_INDEX(0),
 		.iProduct		= USB_STRING_INDEX(1),

diff --git a/lib/fx2-cdesc.mk b/lib/fx2-cdesc.mk
@@ -2,7 +2,7 @@
 
 BUILDDIR?=build
 
-DSCR_AREA=-DDSCR_AREA=0x3e00
+DSCR_AREA=-DDSCR_AREA=0x3e00 -DDSCR_VID=$(VID) -DDSCR_PID=$(PID)
 SDCCFLAGS += --std-c99
 SOURCES += descriptors.c